Commit Graph

50 Commits

Author SHA1 Message Date
Matteo Pagliazzi fb343f8feb port push notifications in api v3 2016-02-19 20:34:55 +01:00
Matteo Pagliazzi 914b2eb008 Merge branch 'develop' into api-v3 2016-01-13 18:39:44 +01:00
Alys fc01104a0d change habitrpg to habitica for PayPal subscription config 2016-01-14 03:08:16 +10:00
Blade Barringer b3050e5a67 chore(dependency): Upgrade lodash from v2 to v3 2015-12-29 07:45:03 -06:00
Matteo Pagliazzi 582aeafb4b Merge branch 'develop' into api-v3 2015-12-06 17:17:20 +01:00
Negue b337efb01a raise android gem purchase: 21 instead 20 2015-12-02 20:13:33 +01:00
Matteo Pagliazzi b315d10c79 migrate utils to v3, uprade nodemailer 2015-11-14 17:43:56 +01:00
Blade Barringer 6e8e1648d9 Merge branch 'develop' into api-v3 2015-11-13 07:38:24 -06:00
Blade Barringer 858bf99930 Move old logging lib v2 directory 2015-11-12 08:18:23 -06:00
Blade Barringer 9408effb4e Remove coffeescript dependency from website 2015-11-11 20:32:16 -06:00
Matteo Pagliazzi 3795b1d151 wip: starts upgrading lodash to v3 2015-11-11 10:32:49 +01:00
Matteo Pagliazzi ed0e4c6d20 Reorganize files under /src, separate express app in two apps, one for api v1 and v2 and the other \
for the upcoming api v3

Reorganize files under /src, separate express app in two apps, one for api v1 and v2 and the other for the upcoming api v3

move api v2 routes in a separate folder, rename apiv1 file for better readability, remove auth routes for api v1

move api-v2 controllers in subdirectory

move unorganized files to /libs

fix gulp requires and separate server in old (api v1 and v2) and new (api v3) app

fix require paths

fix require paths

fix require paths

put api v1 back

Reorganize files under /src and separate express app in one for api v1 and v2 and the other for v3
2015-11-02 17:43:32 +01:00
Phillip Thelen 3a42711427 nicer style for default gem value 2015-10-19 12:48:50 +02:00
Phillip Thelen 4835de55a8 Adjust iap test 2015-10-15 00:09:24 +02:00
Phillip Thelen 319c294354 Fix global variable leak 2015-10-15 00:08:25 +02:00
Phillip Thelen b0922f04b8 Handle new possible iOS in-app-purchases 2015-10-14 23:21:19 +02:00
Matteo Pagliazzi a0f84bcf48 fix a few eslint rules 2015-09-25 15:58:39 +02:00
Blade Barringer 054d884154 Merge branch 'develop' into analytics-service-server-side 2015-07-19 10:13:34 -05:00
Matteo Pagliazzi ecc98411c7 refactor amazon payments and add one time purchases once again 2015-07-15 20:07:17 +02:00
Matteo Pagliazzi bade139b4b wip amazon payments donation 2015-07-15 20:07:17 +02:00
Matteo Pagliazzi de32461787 feat(amazon-payments): WIP add donations 2015-07-15 20:07:17 +02:00
Blade Barringer 7bc74f2c11 Track unsubscription 2015-07-08 21:47:57 -05:00
Blade Barringer c92cf58acb Track purchases with analytics service 2015-07-08 08:11:27 -05:00
Matteo Pagliazzi 2fb25207bb fix(amazon-payments): use lastBillingDate 2015-07-05 11:17:40 +02:00
Matteo Pagliazzi fb912313b9 fix(amazon-payments): handle declined payments 2015-07-03 16:54:57 +02:00
Matteo Pagliazzi 313ac91020 improve(amazon-payments): do not redirect after cancellation with ?noRedirect=true 2015-07-03 14:56:19 +02:00
Matteo Pagliazzi 4e7afcbe94 feat(amazon-payments): add a lastBillingDate attribute 2015-07-01 18:59:51 +02:00
Matteo Pagliazzi 65f4aac23c feat(amazon-payments): working subscriptions, put donations and gifts on hold 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi 271245f1e6 feat(amazon-payments): finalize one time purchases 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi e38f8bf4ef amazon payments: wip 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi a377501f64 feat(amazon-payments): wip on donations 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi 6faef6f737 wip amazon payments 2015-06-30 17:59:30 +02:00
Phillip Thelen 39adff0e2c improve error reporting for iOS IAP 2015-06-15 13:09:22 +02:00
Blade Barringer bb2f97e802 Added android tests for iap 2015-06-14 18:35:19 -05:00
Blade Barringer 5b6afde475 Remove console.logs 2015-06-14 18:08:00 -05:00
Blade Barringer cd45fc06c6 Collapse return and res.json statements 2015-06-14 18:07:23 -05:00
Phillip Thelen 6997783037 Check that iOS IAP is of correct type 2015-06-14 15:59:43 +02:00
Sabe Jones 726a8f1acb feat(analytics): Mixpanel implementation WIP 2015-05-29 16:22:35 -05:00
Blade Barringer 023458b6e5 Add test for getting push notification when gifted a subscription 2015-05-13 19:31:26 -05:00
Blade Barringer 8a4abc632f Refactor push notifications test; Prevent push notification from being sent when buying gems for yourself as a gift 2015-05-12 20:18:06 -05:00
Negue b23e901780 Merge branch 'develop' into pushNotifications2 2015-04-27 17:20:25 +02:00
Tyler Renelle fee002b289 feat(analytics): better events organization via category>label>action>value 2015-04-08 17:29:55 -06:00
Negue 7105bc195f add all Changes of #4565 2015-03-27 18:35:32 +01:00
Blade Barringer 17032a4f13 Reverted changes back into website/src 2015-02-10 16:06:32 -06:00
Blade Barringer bf4f2299e2 Moved src to website/src (again) 2015-02-10 16:04:17 -06:00
Blade Barringer e243887563 Deleted website/src 2015-02-10 16:03:11 -06:00
Blade Barringer 75c9b5a978 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
	src/controllers/groups.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/models/user.js
2015-02-09 22:21:27 -06:00
Blade Barringer cc767efa20 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
	src/controllers/auth.js
	src/controllers/challenges.js
	src/controllers/groups.js
	src/controllers/members.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/middleware.js
	src/models/user.js
2015-02-03 21:13:55 -06:00
Blade Barringer 220942fb9d Corrected path to common files 2015-02-03 14:17:21 -06:00
Blade Barringer 8a8ce8d80d Moved folders to website directory 2015-02-03 14:10:55 -06:00