7e241bb76f
Merge branch 'release' into develop
2018-01-03 00:07:42 +00:00
0069aee5b0
chore(i18n): update locales
2018-01-03 00:00:07 +00:00
240dd1b965
chore(sprites): compile
2018-01-02 23:52:35 +00:00
88e6b2da7c
feat(content): Armoire and BGs 2018-01
...
Also ends New Year's hat fanciness
2018-01-02 23:49:50 +00:00
6e7f4a231d
chore(sprites): compile
2018-01-02 21:41:37 +00:00
822a0e56af
feat(notifications): recanvas sprites for notifs
2018-01-02 21:38:34 +00:00
da73c5c418
Merge branch 'release' into develop
2017-12-31 02:45:04 +00:00
0e404ad6ba
chore(i18n): update locales
2017-12-31 02:43:40 +00:00
b9f709ab30
chore(sprites): compile
2017-12-31 02:35:50 +00:00
d57c525fab
feat(event): New Year's 2017-18
2017-12-31 02:34:52 +00:00
9a3a104ba4
fix typo in apidocs comment block
2017-12-30 08:43:11 +10:00
63bba13b5f
Changed paypal redirect to subscription page ( #9742 )
2017-12-26 17:31:23 -06:00
d90d781740
Added mobile style fixes ( #9741 )
2017-12-26 17:31:00 -06:00
a3bf329c44
make reset password apidocs comment more accurate
2017-12-24 09:23:32 +00:00
446e0422c7
Merge branch 'release' into develop
2017-12-22 21:57:43 +00:00
5220cc1bf3
fix(market): add broken Armoire items
2017-12-22 21:56:39 +00:00
e8976b40f4
Merge branch 'release' into develop
2017-12-22 21:42:02 +00:00
bbbdd89ade
chore(i18n): update locales
2017-12-22 21:41:18 +00:00
a20c1ba751
Include seasonal gear in Market class lists ( #9739 )
...
* fix(shops): include seasonal gear in Market class lists
* fix(market): display non-seasonal broken special items
Also fixes a bug where if a current seasonal item was broken, it would show up twice.
2017-12-22 15:29:51 -06:00
d725b5be19
fix typo in loading screen tip 8
2017-12-22 20:45:35 +00:00
545b052c10
Added fix for quantity confirmation ( #9735 )
2017-12-22 10:23:55 -06:00
028b9d569d
Merge branch 'release' into develop
2017-12-21 23:20:51 +00:00
762e87a82a
chore(i18n): update locales
2017-12-21 23:19:35 +00:00
b68e69e1a1
chore(sprites): compile
2017-12-21 23:12:06 +00:00
4764f115b1
feat(content): Subscriber Items Dec 2017
2017-12-21 23:10:54 +00:00
95c99295c1
Removed gold locally when user buys a card ( #9736 )
2017-12-21 10:27:09 -06:00
a7617fa947
Added broken megaphone icon ( #9737 )
2017-12-21 10:25:54 -06:00
8f744565e2
chore(i18n): update locales
2017-12-20 19:28:22 +00:00
714512b0a3
fix(promo): send payment method with promo
2017-12-20 18:41:19 +00:00
9538c86d02
fix(seasonal): include current season gear in Shop
2017-12-20 18:31:10 +00:00
afc1ffd90b
Refactored duplicate card section ( #9730 )
...
* Refactored duplicate card section
* Updated to new computed methods
2017-12-20 12:27:21 -06:00
6988875e8a
fix promo gifting
2017-12-20 19:09:15 +01:00
6e0b6171c6
Many ie style fixes ( #9728 )
2017-12-20 10:33:21 -06:00
75092336c4
fix(news): Holly, not Peppermint, potions
2017-12-20 04:43:43 +00:00
9435a3089a
chore(i18n): update locales
2017-12-20 02:43:00 +00:00
acf34e2344
chore(sprites): compile
2017-12-20 02:27:43 +00:00
1aac4c713d
feat(event): Winter Wonderland sprites (2/2)
2017-12-20 02:27:13 +00:00
bb527caa06
feat(content): Winter Wonderland sprites (1/2)
2017-12-20 02:26:21 +00:00
98bb6fd7ce
feat(content): Winter Wonderland 2017-18
...
and Starry Night Hatching Potions
2017-12-20 02:23:11 +00:00
b8c716ff82
Fixed pending damage display and nav size ( #9723 )
2017-12-18 12:31:16 -06:00
7fccf59f50
Merge branch 'release' into develop
2017-12-15 15:54:09 +00:00
fbdcd4b0a3
chore(i18n): update locales
2017-12-15 15:01:52 +00:00
e229bc5042
Merge branch 'release' into develop
2017-12-15 05:37:04 +00:00
c4ffe39ec9
chore(news): Bailey
2017-12-15 05:34:30 +00:00
dc3d694d0e
WIP: Buy-1-Get-1 Gift Subs ( #9719 )
...
* feat(promo): Buy-1-Get-1 Gift Subs
* feat(promo): add explanatory text to subscription screens
Also adds some add'l test coverage and creates a test context for this event
2017-12-14 23:09:02 -06:00
4f0ce77205
Winter Quest Bundle ( #9718 )
...
* feat(content): Winter Quest Bundle
* fix(sprites): revert spritesheet changes
2017-12-14 22:40:42 -06:00
c28ec24c33
Added notification for when leader is updated ( #9674 )
...
* Added notification for when leader is updated
* Abstracted challenge member search component
* Added challenge member search modal to challenge detail
* Added group search
2017-12-14 12:12:43 -06:00
e7fd2b4c79
[WIP] Added initial inapp loading screen with tips ( #9710 )
...
* Added initial inapp loading screen with tips
* Added new tips and styles
* Removed unrelated readme
2017-12-14 09:35:10 -06:00
05640f513e
Added test to recreate early cron issue ( #9668 )
...
* Added test to recreate early cron issue
* Gave user extra time based on reverse timezone change
2017-12-14 09:09:11 -06:00
b0ebdfeb65
Merge branch 'release' into develop
2017-12-13 22:16:30 +00:00
Sabe Jones