Commit graph

322 commits

Author SHA1 Message Date
Blade Barringer
71c65c7a73 change coupon route in angular router to promo 2015-05-08 21:24:57 -05:00
Blade Barringer
1bfc82c636 Merge branch 'develop' into NotGonnaGitUs-develop 2015-05-08 21:02:09 -05:00
NotGonnaGitUs
ef0b96e5e4 Changed promo code text. 2015-05-08 10:33:26 +05:30
negue
e628dba5e8 Merge pull request #5087 from negue/copyMessageTodo
copy chat messages as todo
2015-05-07 22:21:42 +02:00
Sabe Jones
040e6e0a41 chore(grunt):compile sprites 2015-05-06 19:53:08 -05:00
Sabe Jones
00db42b6c0 feat(backgrounds): May BGs 2015-05-06 19:41:54 -05:00
Matteo Pagliazzi
a91b544830 typo 2015-05-06 16:18:14 +02:00
Matteo Pagliazzi
a1fb1468ba chore(i18n): update locales 2015-05-05 19:52:20 +02:00
Tyler Renelle
a090fed10b feat(analytics): "motivate yourself" 3 variants @lemoness 2015-05-04 15:31:00 -04:00
Blade Barringer
41a6818ea8 Revert inn text 2015-05-03 20:21:53 -05:00
Matteo Pagliazzi
0454938303 chore(i18n): update locales 2015-05-03 21:24:53 +02:00
NotGonnaGitUs
a45390321e Patched translation fixes and added a few phrases to locales. 2015-05-03 23:41:42 +05:30
Blade Barringer
b408f016fd Merge pull request #5119 from NotGonnaGitUs/develop
Made front page translatable
2015-05-03 09:43:43 -05:00
Blade Barringer
e09d4f3a91 Commented out new dailies behavior 2015-05-03 08:21:29 -05:00
NotGonnaGitUs
4d5ec83234 Removed objects not used anywhere by env.t function. 2015-05-03 14:33:46 +05:30
Blade Barringer
68aedda3bb Merge branch 'develop' into hairlessbear-cron_dailies_fix 2015-05-02 22:10:58 -05:00
Blade Barringer
c81d321366 Checklists should reset even when resting in the inn 2015-05-02 22:10:26 -05:00
NotGonnaGitUs
0fc068ea93 Removed objects not used by front.jade, footer.jade or login-modale.jade 2015-05-02 20:02:20 +05:30
Blade Barringer
cad47dc2c0 Fixes #5123 2015-05-02 09:28:55 -05:00
Blade Barringer
ace1d2a9e2 Update sprites with shading - @lemoness 2015-05-02 09:26:11 -05:00
NotGonnaGitUs
21f470cd5a Removed objects not used front.jade or shared/footer.jade 2015-05-02 17:42:38 +05:30
NotGonnaGitUs
9e88a55d54 Removed objects not used by front.jade. 2015-05-02 17:12:46 +05:30
Matteo Pagliazzi
72f8c60ccf chore(i18n): update locales 2015-05-02 11:43:38 +02:00
Sabe Jones
74877f0653 chore(grunt): compile sprites 2015-05-01 19:22:09 -05:00
Sabe Jones
d50d4ad8bb feat(Spring): Flung 2015-05-01 19:09:28 -05:00
NotGonnaGitUs
124df58644 Made front page translatable. 2015-05-01 21:18:25 +05:30
NotGonnaGitUs
02e7b52fbf Adding environment variables to the static front page for translation. - Halfway done. 2015-05-01 20:14:19 +05:30
Blade Barringer
9b22ac68da Merge pull request #5116 from HabitRPG/rebalancing-2015-03
Skills rebalancing
2015-04-30 21:10:31 -05:00
Blade Barringer
e4b21ac325 Merge branch 'develop' of github.com:HabitRPG/habitrpg into negue-copyMessageTodo 2015-04-29 17:19:24 -05:00
Matteo Pagliazzi
8dcbf75300 chore(i18n): update locales 2015-04-27 21:05:45 +02:00
Negue
75579a7c36 add previewMarkdown / click as popover-trigger / misc changes 2015-04-27 19:23:56 +02:00
Alys
ffcb765b7f change skill descriptions to new ones provided by Lemoness at https://github.com/HabitRPG/habitrpg/issues/3029#issuecomment-96103553 2015-04-26 16:58:09 +10:00
Alys
983d2eb2be Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03 2015-04-26 16:38:17 +10:00
hairlessbear
f5f5753ea5 removed added EOF newlines 2015-04-25 14:53:44 -04:00
hairlessbear
d892314603 Update npc.json 2015-04-25 14:47:47 -04:00
hairlessbear
5a8b5be115 Update npc.json 2015-04-25 14:47:24 -04:00
hairlessbear
441d9b2a33 Reverting erroneous language changes 2015-04-25 14:46:35 -04:00
hairlessbear
9fe6b21523 Reverting erroneous language changes 2015-04-25 14:44:46 -04:00
hairlessbear
3f5d5929c5 Reverting erroneous language changes 2015-04-25 14:42:01 -04:00
hairlessbear
3c366e9ad3 Changed tavern text to Lemoness's specifications 2015-04-25 13:09:16 -04:00
Negue
78dd949f20 copy chat messages as todo 2015-04-25 18:30:11 +02:00
hairlessbear
ba1f2b692c Merge branch 'cron_dailies_fix' of https://github.com/hairlessbear/habitrpg into cron_dailies_fix 2015-04-25 12:19:46 -04:00
hairlessbear
b87950d948 Updated tavern text to reflect modified dailies functionality 2015-04-25 12:15:15 -04:00
Sabe Jones
f9cf860ae8 Merge pull request #5058 from SabreCat/busy-bee
April 2015 Subscriber Items
2015-04-24 11:05:03 -05:00
hairlessbear
e9e0ff52e4 Update index.coffee 2015-04-24 04:32:47 -04:00
hairlessbear
de8facd58e Dailies reset without causing damage when resting at Inn 2015-04-24 04:07:51 -04:00
Alys
77a07c1e53 add official name of each skill as a comment 2015-04-24 16:29:16 +10:00
Matteo Pagliazzi
ca3ac96d6d chore(i18n): update locales 2015-04-23 20:49:53 +02:00
Matteo Pagliazzi
37f7db3c4e feat(emails): add support for weekly recap emails 2015-04-22 16:30:53 +02:00
Matteo Pagliazzi
c699fcde49 chore(i18n): update locales 2015-04-22 16:22:11 +02:00