Simon Gabler
1997338751
Show popover for daily and weekly dailies
2015-08-05 22:23:41 +02:00
Sabe Jones
c275db6b4b
Merge branch 'develop' into sabrecat/party-page
2015-08-05 12:43:56 -05:00
Simon Gabler
99bdf4c541
Add hint for "Repeat every" option title. Fixes #5603
2015-08-05 17:02:02 +02:00
Blade Barringer
e22e853f21
Fix some formatting
2015-08-05 08:18:03 -05:00
Blade Barringer
008a5f1209
Merge branch 'develop' of github.com:HabitRPG/habitrpg into vIiRuS-armoireResponse
2015-08-04 19:52:11 -05:00
Blade Barringer
e7705a7d77
chore(i18n): update locales
2015-08-04 18:42:39 -05:00
Sabe Jones
bc11e03bef
fix(sharing): Localize Tweet text
2015-08-04 14:55:15 -05:00
Sabe Jones
a03fa32a3a
fix(NPCs): De-Splashify sprites
2015-08-04 14:39:29 -05:00
Sabe Jones
6b37b0ced6
fix(armoire): Add sprites, pass tests
2015-08-04 13:00:34 -05:00
Sabe Jones
60e65a8bea
feat(armoire): August additions
...
Also includes the August backgrounds and upgrades the "restock Armoire" migration to use @Alys's progressive output script.
2015-08-04 12:45:01 -05:00
Sabe Jones
4d576acb57
WIP(party-page): Naming and LFG
2015-08-04 11:58:57 -05:00
Sabe Jones
cafdb4d57e
Merge branch 'develop' into sabrecat/party-page
...
Conflicts:
common/locales/en/groups.json
2015-08-03 12:45:32 -05:00
Sabe Jones
af4bb5e23f
chore(news): End Summer Splash
2015-08-02 14:09:26 -05:00
Blade Barringer
919c072b5d
chore(i18n): update locales
2015-08-02 10:30:43 -05:00
Blade Barringer
4598d3d445
chore(i18n): update locales
2015-07-31 09:05:58 -05:00
Blade Barringer
09070a71b5
chore(i18n): update locales
2015-07-31 09:00:26 -05:00
Blade Barringer
b565b04a69
chore(i18n): update locales
2015-07-31 08:48:30 -05:00
Blade Barringer
a7de79a496
chore(i18n): update locales
2015-07-31 08:28:21 -05:00
Blade Barringer
f10657af2a
chore(i18n): update locales
2015-07-31 07:43:21 -05:00
Alys
c211af8e8f
HabitRPG -> Habitica
2015-07-31 18:38:51 +10:00
Alys
798b2890d0
HabitRPG -> Habitica text changes
2015-07-31 18:05:10 +10:00
Alys
4c5ae5391b
Merge pull request #5708 from lacrimae/patch-4
...
HabitRPG -> Habitica where missed
2015-07-31 17:53:05 +10:00
lacrimae
8869e1b32a
HabitRPG -> Habitica where missed
2015-07-31 09:45:09 +02:00
lacrimae
4c88ddc7d1
HabitRPG -> Habitica where missed
2015-07-31 09:37:17 +02:00
Alys
d494d99283
Merge pull request #5706 from lacrimae/patch-2
...
HabitRPG -> Habitica where missed
2015-07-31 17:34:18 +10:00
lacrimae
2daff46991
HabitRPG -> Habitica where missed
2015-07-31 09:27:30 +02:00
lacrimae
49891d311f
HabitRPG -> Habitica where missed
2015-07-31 09:20:20 +02:00
Blade Barringer
a888a120d9
chore(i18n): update locales
2015-07-30 23:25:04 -05:00
Blade Barringer
25fc92d59e
chore(i18n): update locales
2015-07-30 22:49:22 -05:00
Blade Barringer
e28bd5bc57
Update English strings
2015-07-30 21:36:09 -05:00
Sabe Jones
65f21619ae
feat(naming-day): Bailey etc.
2015-07-30 19:46:04 -05:00
Sabe Jones
2a0a26e5ce
feat(naming-day): New logo
...
Updates the static front page to use the purple gryphon icon, changes same to refer to "Habitica" instead of "HabitRPG", and updates the site favicon to the new logo.
2015-07-30 18:01:47 -05:00
Sabe Jones
1de80a3ed8
WIP(party-page): Revised invite modals
2015-07-30 16:48:08 -05:00
Sabe Jones
f8d7547923
WIP(party): Incomplete no-party page
2015-07-29 16:28:23 -05:00
Sabe Jones
bbbae27631
chore(naming-day): Bailey and sprites
2015-07-29 14:12:04 -05:00
Sabe Jones
ceb9cf7817
WIP(event): Habitica Day
2015-07-28 16:20:08 -05:00
Sabe Jones
60d6a479de
Merge pull request #5683 from HabitRPG/sabrecat/enable-drops-sooner
...
Enable pets at Level 3
2015-07-28 13:12:40 -07:00
Sabe Jones
8492541636
fix(visuals): Armoire and Seasonal Shop
...
Cleans up the Enchanted Armoire sprite and fixes bad alignment of Gem prices on the Seasonal Shop page.
2015-07-28 13:35:17 -05:00
Sabe Jones
13ab60cafe
feat(drops): Enable pets at Level 3
2015-07-28 13:28:45 -05:00
Blade Barringer
a23b7d23a9
chore(i18n): update locales
2015-07-28 08:00:08 -05:00
Blade Barringer
d3bcf57246
chore(i18n): update locales
2015-07-28 07:43:40 -05:00
Blade Barringer
08a4e30b8e
chore(i18n): update locales
2015-07-27 23:15:48 -05:00
Sabe Jones
4f36ecb8d1
fix(legal): TOS and privacy tweaks
...
Also updates the front page daily users brag to account for the 25% growth since the introduction of the joinOthers string.
2015-07-27 15:26:31 -05:00
Alys
f5c66e51d1
refactor cron process for todos and dailys to give them separate code
2015-07-26 11:27:00 +10:00
Blade Barringer
bcb128f4b6
Adjust wording for tavern challenge popover
2015-07-24 17:30:38 -05:00
Blade Barringer
791e2f0c16
Add method to get user balance in gems
2015-07-24 17:30:38 -05:00
TheHollidayInn
fce622ddc7
Added hide and error message when a user tries to create a challenge for HabitRPG group and they have no gems
2015-07-24 17:30:36 -05:00
Sabe Jones
3adb315184
feat(death): Release candidate
...
Version to push live for end user feedback. (Pardon the merge conflict garbage included in prior commit; rerunning spritesmith sorted it out!)
2015-07-24 16:24:14 -05:00
Sabe Jones
d022a0eb67
Merge branch 'develop' into sabrecat/death-modal
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.png
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
2015-07-24 16:11:51 -05:00
Blade Barringer
fca6f91f13
Merge branch 'develop' into analytics-service-server-side
2015-07-24 15:19:31 -05:00
