krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 22:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,680 Commits 62 Branches 1,225 Tags
c44c2a35bad2fd4e7d1e9646e9a084d85a42c30c
Commit Graph

13680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matteo Pagliazzi
c7fb69b530 revert changes to mongoose config 2016-05-12 21:44:57 +02:00
Matteo Pagliazzi
f1f18859de v3: fix todo scoring and try to fix production testing problem 2016-05-12 21:29:53 +02:00
Keith Holliday
ca6dca5fd0 Fixed test broken by part sync change (#7195) 2016-05-12 19:55:34 +02:00
Matteo Pagliazzi
bb1cb3397e v3 client: saving after syncing is complete 2016-05-12 18:18:24 +02:00
Keith Holliday
781f0bf1ab Api v3 task fixes (#7193) 
* Update task view to use _id

* Added try catch to user service ops calls
 2016-05-12 18:07:17 +02:00
Matteo Pagliazzi
93336f3894 v3: misc fixes 2016-05-12 18:06:26 +02:00
Keith Holliday
c9b7aa8342 Api v3 party tavern fixes (#7191) 
* Added check if user is in party before query

* Cached party query. Prevented party request when user is not in party. Updated Party create with no invites

* Update tavern ctrl to use new promise
 2016-05-12 16:45:53 +02:00
Matteo Pagliazzi
7fea1d3a98 disable redirects 2016-05-12 14:07:05 +02:00
Matteo Pagliazzi
3f555b012d fix trailing spaces 2016-05-12 09:53:32 +02:00
Matteo Pagliazzi
8c351b6c56 return user.id and send analytics event before changing page 2016-05-12 09:40:21 +02:00
Matteo Pagliazzi
1dbd866ca1 Merge pull request #7189 from TheHollidayInn/api-v3-fixes 
Api v3 fixes
 2016-05-12 09:37:22 +02:00
Keith Holliday
01a8fde124 Fixed cron test 2016-05-11 23:40:20 -05:00
Keith Holliday
5d7ebd82a4 Updated party and group tests 2016-05-11 17:06:16 -05:00
Keith Holliday
eff2f04b45 Add challenges to groups. Fixed isMemberOfGuild check 2016-05-11 14:34:36 -05:00
Keith Holliday
12eba7bbe9 Ensured login callback happens after user sync 2016-05-11 14:18:32 -05:00
Keith Holliday
ee948f2447 Updated party query and create 2016-05-11 14:17:11 -05:00
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