16425 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Sabe Jones	6e7f4a231d	chore(sprites): compile	2018-01-02 21:41:37 +00:00
Sabe Jones	822a0e56af	feat(notifications): recanvas sprites for notifs	2018-01-02 21:38:34 +00:00
Sabe Jones	da73c5c418	Merge branch 'release' into develop	2017-12-31 02:45:04 +00:00
Sabe Jones	2cf8439bd1	4.17.0	2017-12-31 02:44:43 +00:00
Sabe Jones	0e404ad6ba	chore(i18n): update locales	2017-12-31 02:43:40 +00:00
SabreCat	b9f709ab30	chore(sprites): compile	2017-12-31 02:35:50 +00:00
SabreCat	d57c525fab	feat(event): New Year's 2017-18	2017-12-31 02:34:52 +00:00
Alys	9a3a104ba4	fix typo in apidocs comment block	2017-12-30 08:43:11 +10:00
Keith Holliday	63bba13b5f	Changed paypal redirect to subscription page (#9742)	2017-12-26 17:31:23 -06:00
Keith Holliday	d90d781740	Added mobile style fixes (#9741)	2017-12-26 17:31:00 -06:00
Alys	a3bf329c44	make reset password apidocs comment more accurate	2017-12-24 09:23:32 +00:00
Sabe Jones	22a12e37fa	4.16.2	2017-12-22 21:58:16 +00:00
SabreCat	446e0422c7	Merge branch 'release' into develop	2017-12-22 21:57:43 +00:00
SabreCat	5220cc1bf3	fix(market): add broken Armoire items	2017-12-22 21:56:39 +00:00
Sabe Jones	e8976b40f4	Merge branch 'release' into develop	2017-12-22 21:42:02 +00:00
Sabe Jones	3b4b459e68	4.16.1	2017-12-22 21:41:37 +00:00
Sabe Jones	bbbdd89ade	chore(i18n): update locales	2017-12-22 21:41:18 +00:00
Sabe Jones	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
Alys	d725b5be19	fix typo in loading screen tip 8	2017-12-22 20:45:35 +00:00
Keith Holliday	545b052c10	Added fix for quantity confirmation (#9735)	2017-12-22 10:23:55 -06:00
SabreCat	028b9d569d	Merge branch 'release' into develop	2017-12-21 23:20:51 +00:00
Sabe Jones	85b861c4a9	4.16.0	2017-12-21 23:20:00 +00:00
Sabe Jones	762e87a82a	chore(i18n): update locales	2017-12-21 23:19:35 +00:00
SabreCat	b68e69e1a1	chore(sprites): compile	2017-12-21 23:12:06 +00:00
SabreCat	4764f115b1	feat(content): Subscriber Items Dec 2017	2017-12-21 23:10:54 +00:00
Keith Holliday	95c99295c1	Removed gold locally when user buys a card (#9736)	2017-12-21 10:27:09 -06:00
Keith Holliday	a7617fa947	Added broken megaphone icon (#9737)	2017-12-21 10:25:54 -06:00
Sabe Jones	2da2a47f32	4.15.3	2017-12-20 19:28:52 +00:00
Sabe Jones	8f744565e2	chore(i18n): update locales	2017-12-20 19:28:22 +00:00
SabreCat	714512b0a3	fix(promo): send payment method with promo	2017-12-20 18:41:19 +00:00
SabreCat	9538c86d02	fix(seasonal): include current season gear in Shop	2017-12-20 18:31:10 +00:00
Keith Holliday	afc1ffd90b	Refactored duplicate card section (#9730) ... * Refactored duplicate card section * Updated to new computed methods	2017-12-20 12:27:21 -06:00
Matteo Pagliazzi	6988875e8a	fix promo gifting	2017-12-20 19:09:15 +01:00
Keith Holliday	6e0b6171c6	Many ie style fixes (#9728)	2017-12-20 10:33:21 -06:00
Sabe Jones	53bbd93d80	4.15.2	2017-12-20 04:44:07 +00:00
Sabe Jones	75092336c4	fix(news): Holly, not Peppermint, potions	2017-12-20 04:43:43 +00:00
Sabe Jones	310bdf8cb5	4.15.1	2017-12-20 02:43:46 +00:00
Sabe Jones	9435a3089a	chore(i18n): update locales	2017-12-20 02:43:00 +00:00
SabreCat	bb6dac2e84	4.15.0	2017-12-20 02:27:56 +00:00
SabreCat	acf34e2344	chore(sprites): compile	2017-12-20 02:27:43 +00:00
SabreCat	1aac4c713d	feat(event): Winter Wonderland sprites (2/2)	2017-12-20 02:27:13 +00:00
SabreCat	bb527caa06	feat(content): Winter Wonderland sprites (1/2)	2017-12-20 02:26:21 +00:00
SabreCat	98bb6fd7ce	feat(content): Winter Wonderland 2017-18 ... and Starry Night Hatching Potions	2017-12-20 02:23:11 +00:00
Keith Holliday	b8c716ff82	Fixed pending damage display and nav size (#9723)	2017-12-18 12:31:16 -06:00
Sabe Jones	9830fce760	4.14.2	2017-12-15 19:26:15 +00:00
Sabe Jones	7fccf59f50	Merge branch 'release' into develop	2017-12-15 15:54:09 +00:00
Sabe Jones	dd79f2be60	4.14.1	2017-12-15 15:02:22 +00:00
Sabe Jones	fbdcd4b0a3	chore(i18n): update locales	2017-12-15 15:01:52 +00:00
SabreCat	e229bc5042	Merge branch 'release' into develop	2017-12-15 05:37:04 +00:00
SabreCat	44c7e8c9dc	4.14.0	2017-12-15 05:36:01 +00:00