sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 01:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
13664 commits 3 branches 0 tags 1.6 GiB
Commit graph

13664 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sabe Jones
0eb7bc537d fix(contact): add clear subscription trouble email 2016-05-11 18:43:59 +00:00
Matteo Pagliazzi
679d56bc5c Merge pull request #7186 from TheHollidayInn/api-v3-registration-fix 
Changed id param for registration response
 2016-05-11 20:35:32 +02:00
Keith Holliday
5b490116db Changed id param for registration response 2016-05-11 10:40:40 -05:00
Matteo Pagliazzi
bf2c69aaca v3: q -> bluebird 2016-05-11 16:57:43 +02:00
Matteo Pagliazzi
a8f4731a0a Merge pull request #7091 from HabitRPG/api-v3-client 
[API v3] Client
 2016-05-11 16:36:22 +02:00
Matteo Pagliazzi
969459252b v3: do not await a non promise 2016-05-11 16:22:56 +02:00
Matteo Pagliazzi
8276ffcfe2 v3: fix tests 2016-05-11 16:21:22 +02:00
Matteo Pagliazzi
998c679e96 Merge branch 'api-v3' into api-v3-client 2016-05-11 16:01:54 +02:00
Matteo Pagliazzi
95aff08de3 v3 fix tests and use coroutines instead of regenerator 2016-05-11 15:59:18 +02:00
Matteo Pagliazzi
bcb2877f61 Merge pull request #7145 from TheHollidayInn/api-v3-client-user-service 
[WIP] Ported User Serivce to client side and to api v3
 2016-05-11 15:50:09 +02:00
Keith Holliday
2e2aa55fc5 Removed extra consoles.log. Changed data.data to res.data 2016-05-11 08:27:35 -05:00
Matteo Pagliazzi
84b198f17f v3 fix tests with deferred 2016-05-11 14:55:51 +02:00
Matteo Pagliazzi
a947afa5c6 Merge branch 'develop' into api-v3 2016-05-11 14:36:58 +02:00
Matteo Pagliazzi
cee7700a50 switch from Q to Bluebird 2016-05-11 14:34:01 +02:00
Matteo Pagliazzi
299ed624f5 v3: upgrade some deps 2016-05-11 13:48:39 +02:00
Matteo Pagliazzi
0d4870b1e6 v3: remove newrelic config file in favour of env variables 2016-05-11 11:43:50 +02:00
Keith Holliday
f807bc2a49 Fixed auth tests. Updated Authctrl response 2016-05-10 22:09:04 -05:00
Matteo Pagliazzi
f46b336a1f v3: fix package.json 2016-05-11 01:33:49 +02:00
Matteo Pagliazzi
17e763db37 v3: fix package.json 2016-05-11 01:32:55 +02:00
Keith Holliday
04d8e7dd28 Added api-v3 auth urls 2016-05-10 16:54:50 -05:00
Keith Holliday
1315e5914c Added tags into user service 2016-05-10 16:35:23 -05:00
Sabe Jones
7f11e766c3 Sabrecat/glasses chairs (#7182) 
* feat(customization): new chairs, eyeglass sprites

* feat(avatar): finish glasses implementation

* fix(test): include glasses in base equipment
 2016-05-10 16:07:46 -05:00
Keith Holliday
4e41028ddd Fixed more tests 2016-05-10 15:15:55 -05:00
Keith Holliday
632a1ebbf3 Fixed linting and some tests 2016-05-10 15:15:55 -05:00
Keith Holliday
a0939155c9 Updated login headers save. Added task service to user service. Sync user tasks 2016-05-10 15:15:55 -05:00
Keith Holliday
a92359e119 Moved markPMSRead to common.ops. Added tests 2016-05-10 15:15:55 -05:00
Keith Holliday
c88cae4ddb Added mark pms read route. Fixed error checking and extra code. 2016-05-10 15:15:55 -05:00
Keith Holliday
b037ddd14c Ported User Serivce to client side and to api v3 2016-05-10 15:15:55 -05:00
Matteo Pagliazzi
02a01a64ec Merge pull request #7030 from HabitRPG/sabrecat/v3-payments 
[API v3] Payments refactor
 2016-05-10 18:33:00 +02:00
Matteo Pagliazzi
b3a78fba97 v3 payments: fix tests 2016-05-10 18:14:28 +02:00
Matteo Pagliazzi
d33564e5d4 v3 payments: port paypal 2016-05-10 17:57:55 +02:00
Matteo Pagliazzi
1c887b18e1 v3 payments: fix urls in tests 2016-05-10 17:00:47 +02:00
Matteo Pagliazzi
cd84ebd4c5 v3 payments: fix client errors for Stripe 2016-05-10 16:57:12 +02:00
Matteo Pagliazzi
1a43ab35c0 v3 payments: port amazon payments 2016-05-10 16:56:01 +02:00
Keith Holliday
9146e4601e Added tags service (#7176) 2016-05-10 16:27:36 +02:00
Matteo Pagliazzi
03008c0d40 Merge branch 'api-v3' into sabrecat/v3-payments 2016-05-09 23:29:38 +02:00
Matteo Pagliazzi
0cb0780c14 v3: do not log entire promise on error and add ability to enable console logging of errors in prod 2016-05-09 23:29:20 +02:00
Keith Holliday
20f9bbf449 Corrected reset checklist logic (#7154) 
* Corrected reset checklist logic

* Change cron logic to reset rather than set

* Remove extra paranthesis
 2016-05-09 23:06:27 +02:00
Matteo Pagliazzi
0114e310eb v3 payments: working IAP and Stripe, move paypalBillingSetup to its own file, closeChal is now a challenge instance method 2016-05-09 22:58:15 +02:00
Matteo Pagliazzi
e980b3ce0a Merge branch 'api-v3' into sabrecat/v3-payments 2016-05-08 19:19:20 +02:00
Keith Holliday
e747bba669 Updated add and remove tests for challenges (#7155) 2016-05-08 18:35:38 +02:00
Matteo Pagliazzi
94220c5483 Merge branch 'TheHollidayInn-api-v3-client-tests2' into api-v3-client 2016-05-08 16:59:30 +02:00
Matteo Pagliazzi
34251ca7fc Merge branch 'api-v3-client-tests' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-client-tests2 2016-05-08 16:59:15 +02:00
Keith Holliday
4c37417bd4 Updated task service to use api v3 (#7136) 
* Updated task service to use api v3

* Add user.ops functions back

* Removed extra parameter
 2016-05-08 16:52:43 +02:00
Keith Holliday
a7c6457d79 Removed dateCreated 2016-05-08 09:40:08 -05:00
Matteo Pagliazzi
e19130bd8c fix typo custsomerId -> customerId 2016-05-08 15:50:38 +02:00
Matteo Pagliazzi
77d2d943ae v3: fix crashes when group or leader cannot be populated and fixes challenges migration for tavern challenges 2016-05-07 17:35:13 +02:00
Matteo Pagliazzi
4e3d4c8831 v3: more verbose logging in production and fix migration bugs 2016-05-07 15:01:40 +02:00
Matteo Pagliazzi
afb7d1d627 v3: start cleaning up TODO comemnts 2016-05-06 20:24:53 +02:00
Matteo Pagliazzi
b687a6bf9d fix typo in v3 groups migration 2016-05-06 19:40:36 +02:00