Commit Graph

10279 Commits

Author SHA1 Message Date
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 68f5a162fd Merge branch 'Lokeh_webhooks-more-details' into develop 2015-08-02 09:28:49 -05:00
Blade Barringer a960f5ef72 Revert back to toJSON() 2015-08-01 16:08:54 -05:00
Blade Barringer c7e751d662 Adjsut formatting 2015-08-01 14:04:33 -05:00
Blade Barringer b567a0d9a6 Refactor webhook and add tests 2015-08-01 14:03:45 -05:00
Alys 2780cd0317 Merge pull request #5714 from sgabler/cantras-mod-avatar
Add mod Cantras to community guidelines page. Fixes #5676
2015-08-01 07:56:02 +10:00
Simon Gabler cba9752111 Add mod Cantras to community guidelines page. Fixes #5676 2015-07-31 23:05:17 +02: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 07bdc89738 habitrpg.wikia.com -> habitica.wikia.com. Also a trello URL change. 2015-07-31 18:53:32 +10:00
Alys c211af8e8f HabitRPG -> Habitica 2015-07-31 18:38:51 +10:00
Alys c4c21a58c6 HabitRPG -> Habitica in header on static pages 2015-07-31 18:10:40 +10:00
Alys 798b2890d0 HabitRPG -> Habitica text changes 2015-07-31 18:05:10 +10:00
Alys 5ac3edc1d2 Merge pull request #5709 from lacrimae/patch-5
HabitRPG -> Habitica where missed
2015-07-31 17:54:04 +10:00
Alys 4c5ae5391b Merge pull request #5708 from lacrimae/patch-4
HabitRPG -> Habitica where missed
2015-07-31 17:53:05 +10:00
Alys 46550f629d Merge pull request #5707 from lacrimae/patch-3
HabitRPG -> Habitica where missed
2015-07-31 17:49:56 +10:00
lacrimae 7ba91ea0c6 HabitRPG -> Habitica where missed 2015-07-31 09:47:02 +02: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
Alys 30c8355922 Merge pull request #5705 from lacrimae/patch-1
HabitRPG -> Habitica where missed
2015-07-31 17:32:30 +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 183755cf74 fix(test): Correct e2e expectation 2015-07-30 20:59:55 -05:00
Sabe Jones 3dc78a86f6 fix(naming-day): Improved Habitica logo 2015-07-30 20:51:57 -05:00
Sabe Jones 65f21619ae feat(naming-day): Bailey etc. 2015-07-30 19:46:04 -05:00
Kevin Gisi 85584eaa60 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-07-30 19:32:37 -04:00
Kevin Gisi efcf0a57d4 Change host check to proxy check 2015-07-30 19:27:00 -04:00
Kevin Gisi 339dec3ac0 Emergency fix 2015-07-30 19:10:14 -04: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
Kevin Gisi 8465e8adbf Merge pull request #5699 from gisikw/habitica-redirect
Added redirects to habitica for non-API urls
2015-07-30 15:42:04 -04:00
Kevin Gisi cfdcadb2bc Added redirects to habitica for non-API urls 2015-07-30 13:20:24 -04:00
Blade Barringer 1001cc8889 Refactor webhook section to be cleaner
Added note to put webhook into own module
2015-07-30 08:19:22 -05:00
Will 7245ffa94a refactor user.toJSON() 2015-07-30 00:21:41 -07:00
Will 4e5d630a87 remove profile object from webhooks 2015-07-29 21:43:13 -07:00
Will b3ae6eef17 maxHEalth uses new shared.maxHealth 2015-07-29 21:43:13 -07:00
Will f3829c8ce4 code cleanup and commenting 2015-07-29 21:43:13 -07:00
Will a27f8d6705 add profile info and computed stats 2015-07-29 21:43:12 -07:00
Sabe Jones a398fe0af2 Merge pull request #5692 from HabitRPG/sabrecat/habitica-day
Habitica Day
2015-07-29 12:28:09 -07:00
Sabe Jones b4e3efeab7 fix(news): Break before list
For readability
2015-07-29 14:17:32 -05:00
Sabe Jones bbbae27631 chore(naming-day): Bailey and sprites 2015-07-29 14:12:04 -05:00
Sabe Jones 788fba08c2 Merge branch 'develop' into sabrecat/habitica-day 2015-07-29 14:00:58 -05:00
Blade Barringer 661e79d668 Use party variable 2015-07-28 21:27:15 -05:00