Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,261 Commits 64 Branches 1,256 Tags
d9f48dcbb00efa774959fb3cfc8685d2c5bbffe6
Commit Graph

15261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matteo Pagliazzi fd9f3a32c4 fix linting 2017-03-25 17:48:51 +01:00
Matteo Pagliazzi 6e0341a4ff add more logging 2017-03-25 17:33:35 +01:00
Matteo Pagliazzi 625077fc1a add tests and fix bugs 2017-03-25 17:22:28 +01:00
Matteo Pagliazzi 9d456e934c remove un-necessary JSON.parse 2017-03-25 11:46:40 +01:00
Matteo Pagliazzi 771d8f492a update stripe webhooks url 2017-03-25 11:46:40 +01:00
Matteo Pagliazzi f3fab88f0b add console.log statements for debugging 2017-03-25 11:46:40 +01:00
Matteo Pagliazzi 207e3476e6 add stripe webhook to handle cancelled subscriptions 2017-03-25 11:46:40 +01:00
Clint Ryan 6956f5345e Removes test focus 2017-03-24 23:45:56 +11:00
Sabe Jones 0ec293bd15 chore(news): Bailey 2017-03-23 21:00:48 +00:00
Sabe Jones cb00ecc0be chore(i18n): update locales 2017-03-23 19:53:14 +00:00
SabreCat 94ef4f80cc chore(sprites): compile 2017-03-23 19:45:05 +00:00
Sabe Jones 814b163e1a March 2017 Content (#8594) 
* feat(content): Mystery 032017, Shimmer Potions

* fix(date): end 4/19 not 30

* fix(dates): Floral after Shimmer
 2017-03-23 14:41:41 -05:00
Sabe Jones 421bdce38b fix(sprites): don't get blocked (#8576) 2017-03-23 12:23:29 -05:00
Keith Holliday 624566ecec Added end date option to group plan migration (#8588) 2017-03-23 10:40:15 -06:00
Sabe Jones 77ff91868e Redirection fixes (#8592) 
* fix(redirects): logic update

* test(middlewares): redirects tests

* fix(nconf): IS_PROD is boolean

* fix(test): treat IS_PROD as Boolean here too

* fix(test): apiUrl test copypasta
 2017-03-23 10:25:58 -05:00
Clint Ryan cc68abb67e Mock ENV function 2017-03-24 00:36:05 +11:00
Clint Ryan b48be4e619 Remoed logging 2017-03-23 00:43:59 +11:00
Clint Ryan 7a543d07a4 Fixes tests 2017-03-23 00:41:28 +11:00
SabreCat 59f490d178 fix(sprites): accidental project_file deletion 2017-03-21 19:42:02 +00:00
SabreCat ae64ef94ae fix(event): update Justin sprite 2017-03-21 19:06:43 +00:00
Sabe Jones 2335e22a0c chore(i18n): update locales 2017-03-21 18:58:46 +00:00
SabreCat 910154b3ed chore(news): Bailey 2017-03-21 18:46:17 +00:00
SabreCat 31e36339c4 fix(event): update Daniel sprite 2017-03-20 19:12:43 +00:00
SabreCat 07fe1df024 chore(sprites): compile 2017-03-20 18:36:37 +00:00
Matteo Pagliazzi 258742f6b7 Optional HTTP Basic Auth (#8586) 
* add ability to add http basic auth to the website

* debug

* remove console.log
 2017-03-20 15:02:48 +01:00
Clint Ryan 9115be68b2 Fixes achievements injection. Now trying with Guide 2017-03-19 10:11:11 +11:00
Matteo Pagliazzi d9d7c69432 Client: async resources, make store reusable, move plugins and add getTaskFor getter (#8575) 
Add library to manage async resource
Make Store reusable for easier testing
Move plugin to libs
Add getTaskFor getter with tests
 2017-03-18 18:33:08 +01:00
Sabe Jones 03d6c459bf chore(i18n): update locales 2017-03-18 17:09:34 +00:00
Sabe Jones 12cefe4e9f Spring Fling 2017 (#8579) 
* feat(event): Spring Fling 2017

* fix(sprites): adjustments
Also enables pastel hair/skin purchases
 2017-03-18 12:01:41 -05:00
Keith Holliday 21ad808cc1 Aded challenge migration sync (#8492) 
* Aded challenge migration sync

* Fixed async grouping

* Mapped promises and added error catching

* Added placholders for syncing specific challenges

* Prvented overriding of attribute and createdAt
 2017-03-17 16:58:55 -05:00
SabreCat db9befde17 Merge branch 'release' into develop 2017-03-16 19:45:11 +00:00
SabreCat 01af658c2d 3.80.1 v3.80.1 2017-03-16 19:43:18 +00:00
SabreCat 52738575fa chore(news): Bailey 2017-03-16 19:43:08 +00:00
Lulock cc9bca5f63 invalid class change throws error (#8496) (#8531) 
* invalid class-change throws error

minor fixes

indentation fixes

indentation fixes

indentation fixes

* minor fixes
 2017-03-16 13:38:24 -05:00
Matteo Pagliazzi 05d75a4d5c chore(i18n): update locales 2017-03-16 15:56:01 +01:00
Blade Barringer 164177f010 Enable shouldDo tests 2017-03-14 20:59:27 -05:00
SabreCat fc69a3a960 3.80.0 v3.80.0 2017-03-15 00:49:36 +00:00
SabreCat 797adbb1dc chore(news): Bailey 2017-03-15 00:17:10 +00:00
Keith Holliday 3dc20a9832 Ensured upgraded groups are charge correctly (#8567) 
* Ensured upgraded groups are charge correctly

* Added names to magic numbers

* Limited group fields query
 2017-03-14 18:09:12 -05:00
Sabe Jones cfa433aa75 chore(i18n): update locales 2017-03-14 21:03:46 +00:00
SabreCat 9bc2d22d30 chore(sprites): compile 2017-03-14 20:54:27 +00:00
Sabe Jones 4909f67ded feat(content): Pet Quest and Future Mystery Sets (#8569) 2017-03-14 14:31:10 -05:00
Matteo Pagliazzi 8bc6534ff5 Merge pull request #8558 from HabitRPG/fix-achievements 
Attempt to fix achievements awarding
 2017-03-14 13:11:04 +01:00
Clint Ryan 83bd4dcf60 Add failing test, seeking help/advice 2017-03-14 12:35:48 +11:00
Matteo Pagliazzi a8ebd04ac8 fix typo in if condition and write test 2017-03-13 21:43:40 +01:00
Matteo Pagliazzi e0d499abab expand explanation 2017-03-13 21:18:22 +01:00
Matteo Pagliazzi f67e065de2 attempt to fix achievements awarding 2017-03-13 21:18:22 +01:00
Matteo Pagliazzi 283403d6c8 Merge pull request #8563 from Alys/20170312-canceled-group-plan 
use correct wording and date format for cancelled Group Plan in Payment Details screen
 2017-03-13 21:16:13 +01:00
Matteo Pagliazzi 55c7d6a191 Merge pull request #8542 from HabitRPG/client/guilds-infinite-loading 
Client: Guilds: infinite loading
 2017-03-13 21:15:06 +01:00
Alys a5011f000e add new feature descriptions to Social > Group Plans page (#8564) 
* add new features to Social > Group Plans page and remove windows line breaks

* add price to Social > Group Plans page and remove windows line breaks
 2017-03-13 21:14:14 +01:00