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
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
Bill Parrott
9cbc21d798
check for duplicate task ID when adding a new task
2015-06-09 08:55:06 -05:00
Matteo Pagliazzi
4ee3e711d1
chore(i18n): update locales
2015-06-08 18:57:38 +02:00
Alys
e5b8c5c4e0
use a different random seed for starting Armoire randomness than for sub-choices within it to prevent bug that gives only some foods
2015-06-08 21:15:51 +10:00
hairlessbear
b1b8dc18af
Made links translatable
2015-06-07 13:17:57 -04:00
Blade Barringer
c8ed73f685
Added help text for startDate
2015-06-07 00:06:31 -05:00
Blade Barringer
164a26616e
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-05 17:35:16 -05:00
Sabe Jones
804cced3ff
chore(various): News and sprites
...
Also tweaks the drop probability of equipment from 70% to 60%.
2015-06-05 10:22:22 -05:00
hairlessbear
d415e9b014
Slightly modified habitHelp3
2015-06-05 09:35:01 -04:00
hairlessbear
d26e4780fd
Added links to multiple task help phrases
2015-06-05 09:26:33 -04:00
hairlessbear
60ecdb2dca
Removed colons from JSON and 'formatting-help' class to 'slight-vertical-padding'
2015-06-04 17:48:31 -04:00
Sabe Jones
95bb5be22a
Merge branch 'develop' into armoire
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.css
common/dist/sprites/spritesmith0.png
common/dist/sprites/spritesmith1.css
common/dist/sprites/spritesmith1.png
common/dist/sprites/spritesmith2.css
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
common/dist/sprites/spritesmith5.css
common/dist/sprites/spritesmith5.png
common/dist/sprites/spritesmith6.css
common/dist/sprites/spritesmith6.png
2015-06-04 15:49:06 -05:00
Sabe Jones
20859b83ef
feat(Armoire): Improved counter
...
The popover counter of remaining Equipment in the Armoire now counts down immediately instead of requiring a browser refresh. A modal announces when the last item has been found. Also includes several fixes to the Ultimate Gear migration.
2015-06-04 15:45:55 -05:00
Blade Barringer
db38663f94
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-04 12:45:23 -05:00
Sabe Jones
6074774e14
feat(backgrounds): June BGs
2015-06-04 11:30:25 -05:00
