4f333c4f8a
fix(amazon-payments): swap colors between paypal and amazon
2015-08-03 18:41:34 +02:00
5ed5ca8126
Merge branch 'adjustments-to-challenge-participant-pr' into develop
2015-08-03 08:47:30 -05:00
01237df213
Add buttons to challenge participant modal
2015-08-03 08:40:33 -05:00
1b19cc1c4d
Merge branch 'teh-maxh-patch-1' into develop
2015-08-03 07:54:15 -05:00
71f7578aa0
Merge pull request #5723 from sgabler/add-code-climate-yml
...
Add .codeclimate.yml
2015-08-03 07:43:08 -05:00
f0283278b9
Correct spelling mistake
2015-08-02 21:55:16 -05:00
475b868e67
Pin to specific bower versions
2015-08-02 21:43:27 -05:00
af4bb5e23f
chore(news): End Summer Splash
2015-08-02 14:09:26 -05:00
cfa2d937b2
Only list javascript in .codeclimate.yml
2015-08-02 17:54:05 +02:00
919c072b5d
chore(i18n): update locales
2015-08-02 10:30:43 -05:00
68f5a162fd
Merge branch 'Lokeh_webhooks-more-details' into develop
2015-08-02 09:28:49 -05:00
c9db579763
Add .codeclimate.yml
2015-08-02 11:44:52 +02:00
7c4331080c
add'l link changes
2015-08-02 01:03:34 +00:00
a960f5ef72
Revert back to toJSON()
2015-08-01 16:08:54 -05:00
c7e751d662
Adjsut formatting
2015-08-01 14:04:33 -05:00
b567a0d9a6
Refactor webhook and add tests
2015-08-01 14:03:45 -05:00
c9e7b4d73d
Make challenge participant's name clickable in progress modal. Fixes #5558
2015-08-01 16:12:58 +02:00
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
cba9752111
Add mod Cantras to community guidelines page. Fixes #5676
2015-07-31 23:05:17 +02:00
7b5822be4d
new Habitica urls
2015-07-31 16:09:44 +00:00
4598d3d445
chore(i18n): update locales
2015-07-31 09:05:58 -05:00
09070a71b5
chore(i18n): update locales
2015-07-31 09:00:26 -05:00
b565b04a69
chore(i18n): update locales
2015-07-31 08:48:30 -05:00
a7de79a496
chore(i18n): update locales
2015-07-31 08:28:21 -05:00
f10657af2a
chore(i18n): update locales
2015-07-31 07:43:21 -05:00
07bdc89738
habitrpg.wikia.com -> habitica.wikia.com. Also a trello URL change.
2015-07-31 18:53:32 +10:00
c211af8e8f
HabitRPG -> Habitica
2015-07-31 18:38:51 +10:00
c4c21a58c6
HabitRPG -> Habitica in header on static pages
2015-07-31 18:10:40 +10:00
798b2890d0
HabitRPG -> Habitica text changes
2015-07-31 18:05:10 +10:00
5ac3edc1d2
Merge pull request #5709 from lacrimae/patch-5
...
HabitRPG -> Habitica where missed
2015-07-31 17:54:04 +10:00
4c5ae5391b
Merge pull request #5708 from lacrimae/patch-4
...
HabitRPG -> Habitica where missed
2015-07-31 17:53:05 +10:00
46550f629d
Merge pull request #5707 from lacrimae/patch-3
...
HabitRPG -> Habitica where missed
2015-07-31 17:49:56 +10:00
7ba91ea0c6
HabitRPG -> Habitica where missed
2015-07-31 09:47:02 +02:00
8869e1b32a
HabitRPG -> Habitica where missed
2015-07-31 09:45:09 +02:00
4c88ddc7d1
HabitRPG -> Habitica where missed
2015-07-31 09:37:17 +02:00
d494d99283
Merge pull request #5706 from lacrimae/patch-2
...
HabitRPG -> Habitica where missed
2015-07-31 17:34:18 +10:00
30c8355922
Merge pull request #5705 from lacrimae/patch-1
...
HabitRPG -> Habitica where missed
2015-07-31 17:32:30 +10:00
2daff46991
HabitRPG -> Habitica where missed
2015-07-31 09:27:30 +02:00
49891d311f
HabitRPG -> Habitica where missed
2015-07-31 09:20:20 +02:00
a888a120d9
chore(i18n): update locales
2015-07-30 23:25:04 -05:00
25fc92d59e
chore(i18n): update locales
2015-07-30 22:49:22 -05:00
e28bd5bc57
Update English strings
2015-07-30 21:36:09 -05:00
183755cf74
fix(test): Correct e2e expectation
2015-07-30 20:59:55 -05:00
3dc78a86f6
fix(naming-day): Improved Habitica logo
2015-07-30 20:51:57 -05:00
65f21619ae
feat(naming-day): Bailey etc.
2015-07-30 19:46:04 -05:00
85584eaa60
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-07-30 19:32:37 -04:00
efcf0a57d4
Change host check to proxy check
2015-07-30 19:27:00 -04:00
339dec3ac0
Emergency fix
2015-07-30 19:10:14 -04:00
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
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
Matteo Pagliazzi