Commit Graph

15022 Commits

Author SHA1 Message Date
Alys af047d3c82 revert commits accidentally added from "Added support for grouping tasks by challenge"
So sorry, but I accidentally pushed some commits I'd been testing. :( This reverts them.

Reverts c496f94c79 ad6073220d d669db0f9a c244fe488d
2017-02-12 12:17:23 +10:00
Alys 20e8f47def adjust links to wiki's page for Extensions, Add-Ons, and Customizations
- remove redundant link from footer's Company column (still exists in Community)
- change link to point directly to wiki page instead of to a wiki redirect for:
   - static/features page ("3rd Party Tools" section)
   - static/extensions redirection
2017-02-11 23:14:47 +10:00
Keith Holliday c496f94c79 Updated setting string 2017-02-11 17:39:53 +10:00
Keith Holliday ad6073220d Fixed broken member test 2017-02-11 17:39:53 +10:00
Keith Holliday d669db0f9a Fixed tests and updated default challenge model name 2017-02-11 17:39:53 +10:00
Keith Holliday c244fe488d Added support for grouping tasks by chllenge 2017-02-11 17:39:53 +10:00
Monica Williams aef71db0f5 removes changes to all local files except for en file (#8463) 2017-02-11 17:06:57 +10:00
Sabe Jones ac566882fe 3.75.2 v3.75.2 2017-02-08 22:02:59 +00:00
Sabe Jones 1ad662a090 chore(news): blog Bailey 2017-02-08 20:38:40 +00:00
Rachel Williams 1db52de45d Reordered Magic Hatching Potions, fixes issue 8465 (#8467)
* Moved Royal Purple to top of list, ordered other mounts from Spring to Winter

* Issue 8465, moved Royal Purple to top and arranged other pets/mounts from Spring-Winter

* Fixed whitespacing mistake from previous commit

* Magic Hatching Potions reordered by season
2017-02-08 13:14:30 -06:00
Travis f8cfdfa37d Updating attribute calculation to look at all equipment #8188 (#8202)
* Taking all equipped items into account when calculating attributes instead of just head, weapon, sheild, and armor. closes #8185

* Refactored the stat calculations a bit so that all stat calculations are handled in the same location in the same way to try and reduce duplicate logic.
This commit also adds a number of tests to test this new behavior.

* spelling fixes
2017-02-07 12:04:12 -07:00
Sabe Jones ffd36465c9 chore(packages): update passport 2017-02-07 00:25:41 +00:00
Myles Louis Dakan dbb1e3aa18 Mods blocking (#8364)
* updated logic for blocking/unblocking

* updated 1 test and added 2
2017-02-05 22:32:10 -07:00
Matteo Pagliazzi 07ce68c596 remove newrelic 2017-02-05 18:43:00 +01:00
Keith Holliday 4c5d72c96f Fixed group plan checkout with stripe (#8475) 2017-02-04 09:01:53 -07:00
Matteo Pagliazzi 7121653515 3.75.1 v3.75.1 2017-02-03 11:38:55 +01:00
Matteo Pagliazzi ce2b66a2be update deps 2017-02-03 11:15:30 +01:00
Matteo Pagliazzi 43e381cfc1 Revert "Fix Gem purchase validation" (#8471) 2017-02-03 11:08:06 +01:00
Phillip Thelen ca5161b48a fix gem purchase validation (#8470) 2017-02-03 10:58:48 +01:00
Sabe Jones 44dec6dc4b fix(news): Android URL 2017-02-02 22:13:31 +00:00
Sabe Jones fb8f0bed43 3.75.0 v3.75.0 2017-02-02 22:08:17 +00:00
Sabe Jones c391de9e86 chore(news): Bailey
and tweak today's migrations for new format
2017-02-02 21:04:36 +00:00
Sabe Jones 7a534ab81d fix(payments): customerId query 2017-02-02 19:51:52 +00:00
Sabe Jones 32c7f40c4b chore(sprites): compile 2017-02-02 17:31:43 +00:00
Sabe Jones 569fbff244 feat(content): backgrounds and Armoire Feb 2017 2017-02-02 17:30:46 +00:00
Sabe Jones 3fe847f329 feat(content): Cupid Hatching Potions 2017-02-02 17:29:33 +00:00
Sabe Jones d52d759733 3.74.1 v3.74.1 2017-02-02 15:45:23 +00:00
Sabe Jones 5e5a755022 chore(sprites): compile 2017-02-02 15:18:12 +00:00
Sabe Jones 8d148b4d69 End Winter Wonderland (#8466)
* chore(event): end Winter Wonderland

* fix(test): update constant
2017-02-02 09:08:51 -06:00
Sabe Jones 248b64a43f 3.74.0 v3.74.0 2017-02-02 00:59:44 +00:00
Sabe Jones 57ed0f0a10 chore(i18n): update locales 2017-02-02 00:55:58 +00:00
Sabe Jones 3455adaef5 chore(news): Bailey 2017-02-02 00:48:24 +00:00
Phillip Thelen 4d0295a60d Support subscription payment through Google Play Store (#8437)
* Support subscription payment through Google Play Store

* minor fixes to iap subscriptions

* Support subscription payment through Google Play Store

* minor fixes to iap subscriptions

* revert change to test

* add unit tests for google payments

* add integration tests for google payments

* change config formatting for play api

* fix typo in file name

* fix typo in example config

* Improve google payment tests

* fix linter errors
2017-02-01 18:39:37 -06:00
Sabe Jones a002bc5e20 fix(migration): curly typo 2017-02-01 21:00:48 +00:00
Sabe Jones b9d1086e24 chore(migration): update Take This format 2017-02-01 20:52:26 +00:00
madpink 412a0ecc8c Updating Tasks and Tags API Doc (#8447)
* Updating Tasks and Tags API Doc

* Update Tasks and Tag API Doc

added back  * @apiUse ChallengeNotFound

* Update Tasks and Tag API Doc #8447

Corrected NotAuthorized errors to 401
2017-02-01 19:37:27 +01:00
Sabe Jones d44c9ea853 3.73.1 v3.73.1 2017-01-31 21:11:21 +00:00
Sabe Jones c44c581265 fix(shops): correct event boolean 2017-01-31 21:10:51 +00:00
Sabe Jones f666f3cd04 3.73.0 v3.73.0 2017-01-31 19:22:22 +00:00
Sabe Jones 236bd6cec4 fix(test): linting and constant 2017-01-31 19:21:13 +00:00
Keith Holliday e124c36274 Added double columns to edit modal (#8456)
* Added double columns to edit modal

* Fixed task notes z index and border styles

* Moved tags to right column and updated min width
2017-01-31 12:05:49 -07:00
Sabe Jones d5511a0047 chore(i18n): update locales 2017-01-31 18:38:23 +00:00
Sabe Jones 87f003f392 chore(sprites): compile 2017-01-31 18:32:03 +00:00
Sabe Jones 930a869365 feat(event): Habit Birthday 2017 2017-01-31 18:30:39 +00:00
Alys 809da8add0 update landing page's number of user accounts to 2 million
YES! TWO MILLION!
2017-01-31 20:54:33 +10:00
Sabe Jones 1dad176320 3.72.1 v3.72.1 2017-01-26 18:52:39 +00:00
Sabe Jones 1596c6218f chore(news): Bailey 2017-01-26 2017-01-26 18:10:13 +00:00
Sabe Jones 0d3aba950a fix(config): remove deprecated env var 2017-01-25 23:27:34 +00:00
Sabe Jones f1110e0f89 chore(i18n): update locales 2017-01-25 22:31:54 +00:00
Sabe Jones 7273f8f6d9 feat(content): strings for upcoming items 2017-01-25 22:25:32 +00:00