Commit Graph

10468 Commits

Author SHA1 Message Date
Blade Barringer b402df329d Remove unneeded content variable 2015-08-05 09:01:27 -05:00
Blade Barringer c8d957255b Add placeholders for more buy tests to transfer over 2015-08-05 09:00:26 -05:00
Blade Barringer 7f3bfa0dc7 Extract enchanted armoire tests into separate file 2015-08-05 08:57:25 -05:00
Blade Barringer e22e853f21 Fix some formatting 2015-08-05 08:18:03 -05:00
Blade Barringer ba2753edc2 Refactor armoire test no longer need to be updated when items are added to the armoire
Fixes #5739
2015-08-05 08:16:38 -05:00
Blade Barringer 2d59bcab61 Add common watch task 2015-08-05 08:15:53 -05:00
Blade Barringer d1b9739c58 Merge pull request #5742 from crookedneighbor/vIiRuS-armoireResponse
Add response to armoire purchases for display in API
2015-08-04 22:10:06 -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 3e5a3a00cb Merge pull request #5741 from HabitRPG/use_base_url_for_redirect
Adjust Force Habitica Code
2015-08-04 19:22:50 -05:00
Blade Barringer 82d2d6507f Add missing space 2015-08-04 18:55:55 -05:00
Blade Barringer e6c1b69cb0 Swap out isHabitrpg for ignoreRedirect 2015-08-04 18:55:26 -05:00
Blade Barringer e7705a7d77 chore(i18n): update locales 2015-08-04 18:42:39 -05:00
Blade Barringer 93a2d3d660 Use constants for is_prod and base_url 2015-08-04 18:30:27 -05:00
Blade Barringer 675808e54e Catch habitrpg.com specifically 2015-08-04 18:16:36 -05:00
Sabe Jones 68cc0fd56a fix(avatar): Delist Splashy Skins
Also removes a style that was causing hair colors to be the only 40x40 buttons on a page full of 60x60 buttons.
2015-08-04 15:17:38 -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
Blade Barringer 5731f00736 Add baseUrl variable 2015-08-04 12:09:54 -05:00
Blade Barringer a8d98e5f57 Add esnext parameter to jshint 2015-08-04 08:56:47 -05:00
Blade Barringer 0c92c4a048 Switch redirect to baseUrl 2015-08-04 08:42:53 -05:00
Blade Barringer c402ec61b2 Remove checkmark from focused task, increase opacity of background
Fixes #5682
2015-08-04 08:16:31 -05:00
Blade Barringer 5156d9b604 Merge pull request #5731 from teh-maxh/patch-1
HabitRPG -> Habitica
2015-08-03 22:02:08 -05:00
Max Harmony 64a3009e7a HabitRPG -> Habitica 2015-08-03 19:24:24 +00:00
Matteo Pagliazzi 4f333c4f8a fix(amazon-payments): swap colors between paypal and amazon 2015-08-03 18:41:34 +02:00
Blade Barringer 5ed5ca8126 Merge branch 'adjustments-to-challenge-participant-pr' into develop 2015-08-03 08:47:30 -05:00
Blade Barringer 01237df213 Add buttons to challenge participant modal 2015-08-03 08:40:33 -05:00
Blade Barringer 1b19cc1c4d Merge branch 'teh-maxh-patch-1' into develop 2015-08-03 07:54:15 -05:00
Blade Barringer 71f7578aa0 Merge pull request #5723 from sgabler/add-code-climate-yml
Add .codeclimate.yml
2015-08-03 07:43:08 -05:00
Blade Barringer f0283278b9 Correct spelling mistake 2015-08-02 21:55:16 -05:00
Blade Barringer 475b868e67 Pin to specific bower versions 2015-08-02 21:43:27 -05:00
Sabe Jones af4bb5e23f chore(news): End Summer Splash 2015-08-02 14:09:26 -05:00
Simon Gabler cfa2d937b2 Only list javascript in .codeclimate.yml 2015-08-02 17:54:05 +02: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
Simon Gabler c9db579763 Add .codeclimate.yml 2015-08-02 11:44:52 +02:00
Max Harmony 7c4331080c add'l link changes 2015-08-02 01:03:34 +00: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
Simon Gabler c9e7b4d73d Make challenge participant's name clickable in progress modal. Fixes #5558 2015-08-01 16:12:58 +02: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
Max Harmony 7b5822be4d new Habitica urls 2015-07-31 16:09:44 +00: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