Alys
07b41d16b6
Revert "Revert "new GSalvadi audio theme, created by NomindTR""
...
This reverts commit 30a091e14e
2015-06-18 22:19:35 +10:00
Blade Barringer
bcc99791dd
Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop
2015-06-17 19:13:13 -05:00
Blade Barringer
4042c1ce7a
Merge branch 'GitHubSphinx-Sphinx-entry1' into develop
2015-06-17 19:06:56 -05:00
Blade Barringer
03c1476840
Change location of sellFor strings
2015-06-17 19:06:28 -05:00
Sabe Jones
ad7e5a6dc9
feat(pets): Cuttlefishies
2015-06-17 17:26:36 -05:00
Alys
30a091e14e
Revert "new GSalvadi audio theme, created by NomindTR"
2015-06-18 07:39:38 +10:00
Alys
910fc2f213
Merge pull request #5407 from Alys/GSalvadi-audio-NOMINDTR-2015-06-15
...
new GSalvadi audio theme, created by NomindTR
2015-06-17 21:39:39 +10:00
hairlessbear
205f700c7e
Fix links
2015-06-16 18:04:12 -04:00
hairlessbear
73f87213e9
Added _README_FIRST.md files to directories that were missing them
2015-06-16 17:51:54 -04:00
hairlessbear
0b40237b91
Updated README.md link in all _README_FIRST.md files
2015-06-16 17:46:21 -04:00
GihHubSphinx
0cd1ffb794
Fixing button caption for selling Eggs and Potions in the Market
2015-06-16 19:06:53 +05:00
Alys
14983cb996
replace minus Habit and To-Do sounds, rename NomindTR's theme, rename keys for theme since they aren't live yet
2015-06-16 13:10:49 +10:00
GihHubSphinx
071f2796db
Adjusting challenges view translation
...
- Make "Back to all challenges" button translatable
- Allow some flexibility for the line "#_of_gems gem_icon Prize" - this
is made following the practices with linkstart/linkend implementation
- prize "string" is left as is because used as a placeholder
- code comment "prize" had to be moved 1 line up - before the p (as no
room for it is left inside the p) which however seems OK to me, because
the comments above and below has been made the same way before
2015-06-16 02:37:18 +05:00
Blade Barringer
ecb2544cdc
Merge pull request #5396 from hairlessbear/remove_freeRebirth
...
Removed 'freeRebirth' from user model and everywhere else in codebase
2015-06-15 08:00:18 -05:00
Matteo Pagliazzi
d3353aa751
chore(i18n): update locales
2015-06-15 13:20:09 +02:00
Alys
b6b2873faf
add new GSalvadi audio theme, created by NomindTR 70d88957-673a-4edd-b97e-f1ecb018dd89 https://trello.com/c/tljx8gKC/18-music-sound-effects-v3 13 June 2015
2015-06-15 20:33:14 +10:00
Blade Barringer
090ac94eec
Merge pull request #5406 from GitHubSphinx/Sphinx-entry1
...
Rewording translation string error message
2015-06-14 17:01:32 -05:00
GihHubSphinx
232888212a
Rewording translation string error message
...
Making error message about inaccurate translation match the UI link to
Report a Bug.
Addressing https://github.com/HabitRPG/habitrpg/issues/5405 to m
2015-06-15 01:42:47 +05:00
Blade Barringer
a6e0d5f2de
Merge branch 'develop' into hairlessbear-pending_quest_display
2015-06-14 08:44:25 -05:00
Blade Barringer
831f5b89bd
Merge branch 'develop' into nthomsn-develop
2015-06-14 01:27:35 -05:00
Blade Barringer
703a2511da
Merge branch 'TheHollidayInn-challenges-owner-filter' into develop
2015-06-13 19:42:54 -05:00
Blade Barringer
ddb28c0305
Merge branch 'develop' into TheHollidayInn-challenges-owner-filter
2015-06-13 18:23:51 -05:00
Blade Barringer
9d4713bdf3
Merge pull request #5392 from GitHubSphinx/Sphinx-entry1
...
Still addressing #5202 - making Click for help button translatable
2015-06-13 18:01:57 -05:00
Blade Barringer
c490f9338d
Merge pull request #5394 from hairlessbear/ultimateGear_orb_logic_fix
...
Removed user.achievements.ultimateGear checks from orb of rebirth logic
2015-06-13 18:01:15 -05:00
hairlessbear
31e7b052a1
Removed 'freeRebirth' modal and its associated strings
2015-06-13 14:18:03 -04:00
hairlessbear
4bf1b94c1d
Removed 'freeRebirth' from user model and all uses in codebase
2015-06-13 14:18:03 -04:00
Blade Barringer
5d56bd02ef
Merge branch 'develop' into blade-feature/search
2015-06-13 00:10:44 -05:00
hairlessbear
2504b06026
Removed user.achievements.ultimateGear checks from orb of rebirth logic ( fixes #5352 )
2015-06-12 17:17:50 -04:00
GihHubSphinx
fc5cb5d228
Still addressing #5202
...
The last thing left as it seems is Click for help toolbar
2015-06-12 17:42:40 +05:00
Blade Barringer
3f8066eee5
Compile sprites
2015-06-11 20:24:52 -05:00
Blade Barringer
8d450aefb8
Replace head sprites with dark outline versions
...
Closes #5171
2015-06-11 20:24:19 -05:00
Blade Barringer
54681e36b5
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-11 19:47:46 -05:00
Nicholas Thomson
867308975f
Merge https://github.com/HabitRPG/habitrpg into develop
2015-06-11 08:40:36 -07:00
Jiri Chara
df7d36923c
Enable filtering for tasks and custom rewards
...
Add search input box next to the tags. When user changes the value of
the input box then it's propagated to the user service as filterQuery
string. filterQuery string is then used in the tasks template to filter
tasks by text.
2015-06-11 09:10:31 +02:00
Blade Barringer
1bf38578bf
Merge branch 'develop' into hairlessbear-show_group_leader
2015-06-10 17:51:45 -05:00
Blade Barringer
f72ed18a77
Merge pull request #5350 from hairlessbear/task_links_fix
...
Added links to multiple task help phrases (fixes #5349 )
2015-06-10 17:46:15 -05:00
Blade Barringer
ed43bec8cd
Allow default tasks to not have notes
2015-06-10 08:49:26 -05:00
Blade Barringer
d187125c46
Merge branch 'agentx999-text-issues' into develop
2015-06-10 08:13:45 -05:00
Blade Barringer
1d18f53a67
Merge branch 'develop' into blade-Finish_weeklies_pr
...
Added Sabe's novalidate change to adding a new task
2015-06-10 07:53:37 -05:00
Blade Barringer
75fdf84533
move display blurb next to blurb
2015-06-09 17:53:11 -05:00
Blade Barringer
885820c753
Merge branch 'develop' into GitHubSphinx-Sphinx-entry1
2015-06-09 17:49:50 -05:00
Blade Barringer
42d49a9236
Merge pull request #4734 from ghswa/thuldir/donateText3
...
Fix a grammatical error in donateText3
2015-06-09 17:44:13 -05:00
Blade Barringer
2a4bbe37c5
Merge pull request #5318 from GitHubSphinx/Sphinx-entry2
...
Additional translatable line for blurb placeholder (take 2)
2015-06-09 17:39:02 -05:00
agentx999
738b78393c
added a space to defaultHabit1Notes
2015-06-09 10:59:09 -07:00
agentx999
87462043b6
changed comma to semicolon
2015-06-09 10:57:22 -07:00
agentx999
ef6fa13943
removed mention of "options" menu
2015-06-09 10:55:30 -07:00
agentx999
0990594622
removed unused text (untilNoFace)
2015-06-09 10:53:54 -07:00
Blade Barringer
ca72b9a9e1
Merge branch 'chimericdream-issues/4838' into develop
2015-06-09 12:45:22 -05:00
Sabe Jones
fe9666d5ee
fix(achievements): Never strip Ultimate Gear
...
Fixes #5369 .
2015-06-09 10:47:59 -05:00
Bill Parrott
05286d1e8f
use correct http status code
2015-06-09 08:55:06 -05:00
