Alice Harris
6cf815ba22
Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03
...
Conflicts:
common/dist/scripts/habitrpg-shared.js
2015-03-13 20:23:28 +10:00
Matteo Pagliazzi
8bc5ed83cb
chore(i18n): update locales
2015-03-12 16:26:45 +01:00
Alice Harris
9ac0ef0202
explain when survey participants will get their badge
2015-03-12 07:34:01 +10:00
kholliday
8a121a5dc3
Added hide and error message when a user tries to create a challenge for HabitRPG group and they have no gems
2015-03-10 22:15:24 -05:00
Tyler Renelle
de67f44e1f
Merge pull request #4713 from HabitRPG/lefnire/interactive-tour
...
Interactive Tour
2015-03-10 19:23:01 -06:00
Sabe Jones
9cfa27f089
feat(surveys): Survey achievement
...
Updates the "Helped Habit Grow" achievement to be stackable. Also includes miscellaneous Bailey announcements for 3/10.
2015-03-10 18:39:00 -05:00
Alice Harris
3bd0b57efa
add semi-colon at end of line; remove apostrophe from comment
2015-03-11 09:29:44 +10:00
Alys
63c57cce5d
Merge pull request #4785 from AAorris/develop
...
Allow for client notifications to user settings
2015-03-11 08:20:51 +10:00
Tyler Renelle
16e996c971
fix(interactive-tour): "Buy the Training Sword"
2015-03-10 15:40:19 -06:00
Tyler Renelle
63a6af6e0a
fix(interactive-tour): small updates per
...
https://github.com/HabitRPG/habitrpg/issues/4726#issuecomment-77643235
2015-03-10 15:40:19 -06:00
Tyler Renelle
812493fec5
feat(tour): Refactor the Justin Guide to be much more streamlined and interactive. Backdrop focuses user on present task. Chapterized guides
2015-03-10 15:40:18 -06:00
Blade Barringer
9c43a7da22
chore(grunt compile:sprites)
2015-03-09 16:34:55 -05:00
Blade Barringer
60a62a282e
fix(sprite) Added correctly sized image for iron knight. Closes #4824
2015-03-09 16:33:31 -05:00
Blade Barringer
9e6c268a97
chore(grunt compile:sprites)
2015-03-09 13:42:35 -05:00
Blade Barringer
e918aa158d
feat(mystery items) March subscriber sprites added
2015-03-09 13:42:21 -05:00
kholliday
fc3e1c6c9b
Added ability to remove pet, mount, and background. Also, changed text for all dequip buttons.
2015-03-08 15:35:37 -05:00
Blade Barringer
c23730fdbf
Merge branch 'develop' of github.com:HabitRPG/habitrpg into rebalancing
2015-03-06 07:47:10 -06:00
kholliday
f28bc31a2c
Added dequip ability per ticket: 3730
2015-03-04 21:43:17 -06:00
Sabe Jones
27446da338
chore(grunt): compile sprites
2015-03-03 21:49:07 -06:00
Sabe Jones
21fd8061cf
feat(backgrounds): March BGs
2015-03-03 21:42:15 -06:00
Aaron Morris
f3bd5330a9
Updating to more awesome translation.
2015-03-02 21:52:50 -05:00
Aaron Morris
5f739fb078
Updating example translation
...
No harm done doing this before pushing it officially through transifex, right?
2015-03-02 21:15:44 -05:00
Aaron Morris
d9b10a4373
making strings translatable
...
not translating the body keys though...
2015-03-02 21:13:18 -05:00
Aaron Morris
ec15f239c6
removing extraneous lines
...
Not sure about translations yet...
2015-03-02 21:00:50 -05:00
Aaron Morris
b484dd3208
Allow for client notifications to user settings
...
Added functionality on successful user changes (see userNotifications
object in userServices.js)
On this commit, it will tell the user "Party order updated" when the
sorting settings change.
2015-03-02 09:00:37 -05:00
Matteo Pagliazzi
85b547196e
chore(i18n): update locales
2015-02-28 18:23:17 +01:00
Sabe Jones
3d3438e074
chore(grunt): Compile sprites
2015-02-24 20:45:50 -06:00
Sabe Jones
7d943d9007
fix(mystery): Last missing sprite
2015-02-24 20:40:32 -06:00
Sabe Jones
f5f21718ae
fix(mystery): Missing sprites
2015-02-24 20:33:02 -06:00
Sabe Jones
d4f8acd0ef
feat(mystery): February 2015
2015-02-24 20:15:31 -06:00
Blade Barringer
016e359690
Fixes #4749
2015-02-24 16:58:48 -06:00
Blade Barringer
6eeff5a0af
Changed matt back to brown hair version
2015-02-24 13:37:14 -06:00
Matteo Pagliazzi
14d6a59e96
chore(i18n): update locales
2015-02-23 21:53:50 +01:00
Matteo Pagliazzi
4151b0733f
add ability to unsubscribe from a single event using a dedicated link
2015-02-23 21:25:01 +01:00
Blade Barringer
a2eda6c91a
Merge pull request #4733 from remmz0r/gemDisplay
...
Gem Display Text in Modals (new) - Fixes #4645
2015-02-22 13:17:47 -05:00
Blade Barringer
5aa4015249
Refactored pet display name changes
2015-02-22 12:12:38 -05:00
Blade Barringer
f355672b3b
Merge pull request #4703 from scribblypanda/issue2825
...
added pet colour to feed/evolve notif
2015-02-22 12:12:23 -05:00
Bryce Wojtowicz
0931d52d56
Edit: fixed tabs instead of spaces issue
2015-02-22 13:39:19 +08:00
Bryce Wojtowicz
44478d3792
Fixes #4645
...
Fixes Gem Display in modals to say [Gem] You have [n] Gems
Modified code to use a translatable string!
Thanks for the tip :)
2015-02-22 13:35:50 +08:00
Matteo Pagliazzi
397a293ca8
change text for recapture emails settings
2015-02-20 18:15:47 +01:00
Matteo Pagliazzi
ba11d827bb
chore(i18n): update locales
2015-02-20 18:04:01 +01:00
Blade Barringer
c215b90869
Merge pull request #4699 from chimericdream/bulk-add-tasks
...
Bulk add tasks (first version; seeking review & feedback)
2015-02-18 16:41:31 -06:00
Blade Barringer
0bd912be30
Merge pull request #4690 from chimericdream/task-difficulty-context-classes
...
Add difficulty context class to task list items
2015-02-18 16:37:53 -06:00
Matteo Pagliazzi
37433ee1aa
chore(i18n): update locales
2015-02-18 17:41:31 +01:00
Bill Parrott
3599eaefaf
Merge branch 'develop' into bulk-add-tasks
2015-02-17 22:32:28 -06:00
Bill Parrott
789575d6fb
Merge branch 'develop' into task-difficulty-context-classes
2015-02-17 22:31:27 -06:00
Sabe Jones
87b13d5fc8
chore(grunt): compile sprites
2015-02-17 20:46:40 -06:00
Sabe Jones
47f3122c2d
chore(news): Pet rocks Bailey
...
Also fixes incorrectly named golden rocks.
2015-02-17 20:39:04 -06:00
Sabe Jones
0608ac5caa
feat(quest): Pet Rocks
2015-02-17 20:02:06 -06:00
Blade Barringer
78430b1910
Collapsed 3 strings into single string
2015-02-17 15:26:42 -06:00
