Commit graph

10332 commits

Author SHA1 Message Date
Blade Barringer
4bdb2a8b84 chore(i18n): update locales 2015-08-06 08:50:06 -05:00
Blade Barringer
46156601ff Add death files for other languages 2015-08-06 08:10:46 -05:00
Blade Barringer
0ca2339d87 chore(i18n): update locales 2015-08-06 08:03:11 -05:00
Blade Barringer
cf507df375 chore(i18n): update locales 2015-08-06 07:38:20 -05:00
Blade Barringer
ac7ee80c27 Merge branch 'sgabler-add-hints-to-repeat-every-x-days-functionality' into develop 2015-08-05 18:28:09 -05:00
Blade Barringer
787cb6cabb Final adjustments to PR
- Rename strings to make them easier to expand upon in the future
- adjust line break formatting
- remove terniary operator
2015-08-05 18:27:24 -05:00
Blade Barringer
383ae3be55 Merge pull request #5746 from crookedneighbor/enchanted_armoire_test_improvements
Enchanted armoire test improvements
2015-08-05 18:13:12 -05:00
Blade Barringer
e34c30a37f Improve formatting of gulp task 2015-08-05 18:12:28 -05:00
Simon Gabler
2343e4720c Add tooltips for day buttons to show "due" or "not due" 2015-08-05 22:25:03 +02:00
Simon Gabler
1997338751 Show popover for daily and weekly dailies 2015-08-05 22:23:41 +02:00
Blade Barringer
47681e90bd Reorganize and set stub behavior 2015-08-05 13:02:36 -05:00
Blade Barringer
2598fa1ecb Move ulitmate gear 2015-08-05 12:00:57 -05:00
Blade Barringer
1bcc241c04 Rename common test 2015-08-05 12:00:00 -05:00
Simon Gabler
99bdf4c541 Add hint for "Repeat every" option title. Fixes #5603 2015-08-05 17:02:02 +02:00
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