a947afa5c6
Merge branch 'develop' into api-v3
2016-05-11 14:36:58 +02:00
cee7700a50
switch from Q to Bluebird
2016-05-11 14:34:01 +02:00
0d4870b1e6
v3: remove newrelic config file in favour of env variables
2016-05-11 11:43:50 +02:00
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
d33564e5d4
v3 payments: port paypal
2016-05-10 17:57:55 +02:00
cd84ebd4c5
v3 payments: fix client errors for Stripe
2016-05-10 16:57:12 +02:00
1a43ab35c0
v3 payments: port amazon payments
2016-05-10 16:56:01 +02:00
03008c0d40
Merge branch 'api-v3' into sabrecat/v3-payments
2016-05-09 23:29:38 +02:00
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
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
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
e980b3ce0a
Merge branch 'api-v3' into sabrecat/v3-payments
2016-05-08 19:19:20 +02:00
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
4e3d4c8831
v3: more verbose logging in production and fix migration bugs
2016-05-07 15:01:40 +02:00
afb7d1d627
v3: start cleaning up TODO comemnts
2016-05-06 20:24:53 +02:00
bb2dd8ca08
v3: remove trimming and lowercase from fields that must be unique
2016-05-04 23:43:04 +02:00
d5b3bbfaad
Sabrecat/armoire 201605 ( #7142 )
...
* feat(content): May BGs and Armoire
* chore(news): Bailey 20160503
2016-05-03 15:20:00 -05:00
c218a2cbdf
v3 fix apidoc broken layout
2016-05-03 15:54:02 +02:00
21d798bca7
v3: GET /groups accept a guilds type which returns all the guilds the user is a member of
2016-05-03 15:49:47 +02:00
166a37d53f
chore(event): end Spring Fling 2016
2016-05-02 01:36:03 +00:00
72f4bd0aab
Merge branch 'api-v3' into sabrecat/v3-payments
2016-05-02 00:26:02 +02:00
fbce7e65ab
v3 migration: fixes
2016-05-01 23:54:58 +02:00
60eefde15f
fix linting
2016-05-01 16:36:21 +02:00
e8024f98e1
v3 migration: first finished version that contains all models
2016-05-01 16:27:04 +02:00
4457b1c18c
v3: fix tags and challenges migration
2016-05-01 14:46:22 +02:00
8391494b89
v3: fix tags tests
2016-05-01 14:15:26 +02:00
a8fbafb801
v3: fix tags tests
2016-05-01 13:48:55 +02:00
f5144fddaa
v3 adapt v2: fix tags _id, stickyHeader and unlocking
2016-05-01 12:51:32 +02:00
79c8449e1e
Merge branch 'api-v3' into sabrecat/v3-payments
2016-04-30 19:28:45 +02:00
6380161321
Api v3 Migration (WIP) ( #7131 )
...
* v3 migration: remove old code and polish user migration
* v3 migration: start to work on challenges
* wip v3 migration
* wip v3 migration: fix _id -> id for reminders, tags and checklists
2016-04-30 18:34:16 +02:00
0c38caa2f9
Merge branch 'api-v3' into sabrecat/v3-payments
2016-04-30 16:51:51 +02:00
f69a566178
Merge branch 'develop' into api-v3
2016-04-30 16:49:44 +02:00
a567476bb7
V3 payments 7 stripe ( #7124 )
...
* payments api: cancelSubscription
* some more tests for amazon payments
* promisifying amazon payments
* somehow payment stub is not working
* cleaning up tests
* renaming tests in api/v3/integration/payments
* improvements
* cleanup, lint
* fixes as per comments
* moment.zone() is back in.
* basic controller for stripe payments
* authWithUrl is in
* stripe cleanup
* making tests pass
* stripe bug fixes
* 400 error is right
* cleanup of sinon spy for fakeSend
* paypal payments
* lint of paypal
* require -> import
2016-04-30 16:42:10 +02:00
1787342951
chore(news): Last Chance Bailey 201604
2016-04-29 22:16:36 +00:00
3364019fcc
v3 and adapted v2: bugs fixes for groups, challenges and tasks
2016-04-29 11:49:12 +02:00
2aa3a3175f
Merge branch 'develop' into kelsin-develop
2016-04-27 19:11:56 -05:00
fa21577c46
V3 payments 6 ( #7104 )
...
* payments api: cancelSubscription
* some more tests for amazon payments
* promisifying amazon payments
* somehow payment stub is not working
* cleaning up tests
* renaming tests in api/v3/integration/payments
* improvements
* cleanup, lint
* fixes as per comments
* moment.zone() is back in.
2016-04-27 21:26:32 +02:00
bf7ce46ea4
chore(news): Be-Wilder conclusion
2016-04-27 04:16:35 +00:00
a326873935
chore: Add emoji lib back in
...
The 3rd party chat extension was breaking because this library was
missing. Remove this after the chat extension is updated
https://github.com/Horacious/HabitRPG-Chat-Extension/pull/40
2016-04-26 23:07:15 -05:00
f415810a0f
Merge branch 'markdown_rework' into develop
2016-04-26 12:53:47 -05:00
4f1a4393e1
fix: Adjust spacing of emoji in tags
2016-04-26 12:50:37 -05:00
e7315253dd
feat: Switch out js-emoji for habtiica-markdown
2016-04-26 08:19:47 -05:00
d96b13ed43
chore(news): Floral Potions Bailey
2016-04-25 21:20:21 +00:00
974896ce7b
feat(events): April Mystery and Floral Potions ( #7107 )
...
* feat(events): April Mystery and Floral Potions
Also reorganizes the spritesmith folders for mounts so that head, body, and icon sprites are in separate folders.
2016-04-25 14:17:31 -05:00
ad57dedecb
refactor: Swap out remarkable for habitica flavored markdown-it
2016-04-25 07:36:02 -05:00
5b217ec3db
v3: fix setting challenge.official
2016-04-25 14:21:00 +02:00
12b05b9492
v3: define migration spec and misc fixes
2016-04-25 13:51:08 +02:00
b6f79aff0b
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-04-24 15:08:54 +02:00
6197fcea3b
Merge branch 'develop' into api-v3
2016-04-24 15:08:13 +02:00
050539d8f3
Added tests for cron ( #7081 )
...
* Added inital cron tests
* Added more subscribe tests and updated various tests for syntax and expectations
2016-04-24 00:54:50 +02:00
Matteo Pagliazzi