Commit graph

13403 commits

Author SHA1 Message Date
Matteo Pagliazzi
e980b3ce0a Merge branch 'api-v3' into sabrecat/v3-payments 2016-05-08 19:19:20 +02: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
Blade Barringer
7d41b76b2e Merge pull request #7148 from crookedneighbor/require-again
feat: Add require-again to help with unit testing
2016-05-06 12:20:19 -05:00
Blade Barringer
192488cb02 feat: Add require-again to help with unit testing 2016-05-06 12:05:06 -05:00
Matteo Pagliazzi
c94f4ef0e9 v3 migration: delete old completed todos 2016-05-05 12:15:28 +02:00
Matteo Pagliazzi
ebf3a0979f fix challenges members migration 2016-05-05 09:28:07 +02:00
Matteo Pagliazzi
bb2dd8ca08 v3: remove trimming and lowercase from fields that must be unique 2016-05-04 23:43:04 +02:00
Matteo Pagliazzi
e5e4bb5823 v3 migration: correctly migrate challenges tasks 2016-05-03 23:27:24 +02:00
Matteo Pagliazzi
c218a2cbdf v3 fix apidoc broken layout 2016-05-03 15:54:02 +02:00
Matteo Pagliazzi
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
Matteo Pagliazzi
72f4bd0aab Merge branch 'api-v3' into sabrecat/v3-payments 2016-05-02 00:26:02 +02:00
Matteo Pagliazzi
f0e696b0ec Merge branch 'develop' into api-v3 2016-05-02 00:24:50 +02:00
Matteo Pagliazzi
fbce7e65ab v3 migration: fixes 2016-05-01 23:54:58 +02:00
Matteo Pagliazzi
60eefde15f fix linting 2016-05-01 16:36:21 +02:00
Matteo Pagliazzi
e8024f98e1 v3 migration: first finished version that contains all models 2016-05-01 16:27:04 +02:00
Matteo Pagliazzi
a0e63c0eb2 use uuid module for uuids 2016-05-01 15:01:00 +02:00
Matteo Pagliazzi
4457b1c18c v3: fix tags and challenges migration 2016-05-01 14:46:22 +02:00
Matteo Pagliazzi
8391494b89 v3: fix tags tests 2016-05-01 14:15:26 +02:00
Matteo Pagliazzi
a8fbafb801 v3: fix tags tests 2016-05-01 13:48:55 +02:00
Matteo Pagliazzi
a63d5ae97f v3: fix tags tests 2016-05-01 13:25:19 +02:00
Matteo Pagliazzi
f5144fddaa v3 adapt v2: fix tags _id, stickyHeader and unlocking 2016-05-01 12:51:32 +02:00
Matteo Pagliazzi
79c8449e1e Merge branch 'api-v3' into sabrecat/v3-payments 2016-04-30 19:28:45 +02:00
Matteo Pagliazzi
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
Matteo Pagliazzi
0c38caa2f9 Merge branch 'api-v3' into sabrecat/v3-payments 2016-04-30 16:51:51 +02:00
Matteo Pagliazzi
f69a566178 Merge branch 'develop' into api-v3 2016-04-30 16:49:44 +02:00
Victor Pudeyev
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
Alys
590e185ecd fix spelling mistake: reseting to resetting 2016-04-29 18:44:49 -04:00
Sabe Jones
1787342951 chore(news): Last Chance Bailey 201604 2016-04-29 22:16:36 +00:00
Matteo Pagliazzi
3364019fcc v3 and adapted v2: bugs fixes for groups, challenges and tasks 2016-04-29 11:49:12 +02:00
Blade Barringer
2aa3a3175f Merge branch 'develop' into kelsin-develop 2016-04-27 19:11:56 -05:00
Victor Pudeyev
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
Matteo Pagliazzi
f78bc2e6a8 v3 migration: barebone migration 2016-04-27 19:35:07 +02:00
Sabe Jones
7bc89aa55c fix(sprites): updateabee 2016-04-27 17:14:49 +00:00
Sabe Jones
bf7ce46ea4 chore(news): Be-Wilder conclusion 2016-04-27 04:16:35 +00:00
Blade Barringer
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
Blade Barringer
ebe3eefcc5 chore: reorganize quest sprites 2016-04-26 21:13:06 -05:00
Sabe Jones
0d4532c12e fix(elastic-beanstalk): extend connection timeout for ELB 2016-04-26 19:09:36 +00:00
Blade Barringer
ee3aa056f9 feat: Add eb extension to increase deploy timeout to 30 minutes (#7049) 2016-04-26 14:07:28 -05:00
Blade Barringer
f415810a0f Merge branch 'markdown_rework' into develop 2016-04-26 12:53:47 -05:00
Blade Barringer
b5de787c4d refactor: Remove uneeded emoji images 2016-04-26 12:53:18 -05:00
Blade Barringer
e88d0ff450 feat: switch to version number for habitica-markdown 2016-04-26 12:52:59 -05:00
Blade Barringer
4f1a4393e1 fix: Adjust spacing of emoji in tags 2016-04-26 12:50:37 -05:00
Blade Barringer
e7315253dd feat: Switch out js-emoji for habtiica-markdown 2016-04-26 08:19:47 -05:00
Sabe Jones
d96b13ed43 chore(news): Floral Potions Bailey 2016-04-25 21:20:21 +00:00
Sabe Jones
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
Blade Barringer
b86348dd0e refactor: Remove MOBILE_APP logic 2016-04-25 07:44:05 -05:00