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
590e185ecd
fix spelling mistake: reseting to resetting
2016-04-29 18:44:49 -04: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
f78bc2e6a8
v3 migration: barebone migration
2016-04-27 19:35:07 +02:00
7bc89aa55c
fix(sprites): updateabee
2016-04-27 17:14:49 +00: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
ebe3eefcc5
chore: reorganize quest sprites
2016-04-26 21:13:06 -05:00
0d4532c12e
fix(elastic-beanstalk): extend connection timeout for ELB
2016-04-26 19:09:36 +00:00
ee3aa056f9
feat: Add eb extension to increase deploy timeout to 30 minutes ( #7049 )
2016-04-26 14:07:28 -05:00
f415810a0f
Merge branch 'markdown_rework' into develop
2016-04-26 12:53:47 -05:00
b5de787c4d
refactor: Remove uneeded emoji images
2016-04-26 12:53:18 -05:00
e88d0ff450
feat: switch to version number for habitica-markdown
2016-04-26 12:52:59 -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
b86348dd0e
refactor: Remove MOBILE_APP logic
2016-04-25 07:44:05 -05:00
ad57dedecb
refactor: Swap out remarkable for habitica flavored markdown-it
2016-04-25 07:36:02 -05:00
d6ea0a3b40
v3: fix setting challenge.official
2016-04-25 14:34:59 +02:00
5b217ec3db
v3: fix setting challenge.official
2016-04-25 14:21:00 +02:00
6cad3616f3
v3: define migration spec (add files)
2016-04-25 13:53:42 +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
c78c3b9fd8
v3: first iteration of users migration
2016-04-24 15:07:45 +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
c608d03e35
v3: start writing migrations
2016-04-23 15:00:55 +02:00
8355dbe63f
chore(news): Bewildered Bailey
2016-04-23 04:00:30 +00:00
7dab7939cc
v3: fix tavern during tests
2016-04-23 03:33:00 +02:00
c5aa15cf47
v3: fix ability to join public guild you were already a member of
2016-04-23 03:08:03 +02:00
2d87cb0d87
Merge branch 'develop' into api-v3
2016-04-22 17:43:48 +02:00
91314a497c
Merge branch 'api-v3-unlock-fix' into api-v3
2016-04-22 12:33:55 +02:00
6ba1afe479
Merge branch 'api-v3' into api-v3-unlock-fix
2016-04-22 12:33:39 +02:00
1fe2220aa1
v3: improve docs and fix bugs
2016-04-22 12:15:24 +02:00
2cdb30bd5b
fix(NR): remove metric check that crashed
2016-04-21 22:47:04 +00:00
73e4c719b2
Merge pull request #7096 from piousbox/v3-payments-5
...
V3 payments 5
2016-04-21 14:45:41 -05:00
578e28b6b6
Merge pull request #7095 from piousbox/v3-payments-4
...
V3 payments 4
2016-04-21 14:42:58 -05:00
867146dc19
fix(xss): Update site to use remarkable instead of marked
...
https://snyk.io/vuln/npm%3Amarked%3A20150520
https://github.com/chjj/marked/pull/592
2016-04-21 13:23:53 -05:00
43f8e943f6
Merge pull request #7097 from vIiRuS/patch-7
...
Fix timezone issue with iOS app
2016-04-21 12:54:44 -05:00
a5fbc08016
Set timezoneOffset to 0 as default
...
Fixes an issue with the iOS app not setting the offset, when no initial value exists.
2016-04-21 19:41:39 +02:00
5c1d86c513
Merge branch 'develop' into MathWhiz-mount-images
2016-04-21 07:52:21 -05:00
cbf1a4c8d3
breaking changes promisifying amazon payments
2016-04-21 04:37:25 +00:00
Matteo Pagliazzi