Commit Graph

47 Commits

Author SHA1 Message Date
Blade Barringer 231cfc176a Merge branch 'develop' into api-v3 2016-04-09 09:12:53 -05:00
Blade Barringer db62d1add0 fix: correct coupon generation code 2016-04-09 08:03:32 -05:00
Blade Barringer b3050e5a67 chore(dependency): Upgrade lodash from v2 to v3 2015-12-29 07:45:03 -06:00
Matteo Pagliazzi 18c49493e0 fixes tests 2015-12-17 16:27:17 +01:00
Matteo Pagliazzi 582aeafb4b Merge branch 'develop' into api-v3 2015-12-06 17:17:20 +01:00
Alys e907e2e4ee adjust test for IAP GooglePlay to specify 21 gems 2015-12-03 07:23:31 +10:00
Blade Barringer 4ab2fafc5e Remove coffee files 2015-11-15 15:45:56 -06:00
Blade Barringer 6ba9027252 Switch out babel for babel-core 2015-11-15 15:15:52 -06:00
Blade Barringer 00055ad055 Merge branch 'develop' into api-v3 2015-11-15 14:57:41 -06:00
Blade Barringer 037337d54f Remove extraneous anonymous function. 2015-11-15 08:24:42 -06:00
Blade Barringer da881153b9 Convert coffee tests to js 2015-11-15 08:19:41 -06:00
Blade Barringer 6e8e1648d9 Merge branch 'develop' into api-v3 2015-11-13 07:38:24 -06:00
Blade Barringer 3a13a5ee2c Remove unneeded coffeescript requires in tests. 2015-11-11 20:32:17 -06:00
Blade Barringer c5445dc426 Merge branch 'develop' into api-v3 2015-11-11 19:42:39 -06:00
Matteo Pagliazzi 3795b1d151 wip: starts upgrading lodash to v3 2015-11-11 10:32:49 +01:00
Sabe Jones eed4207c6d Merge branch 'develop' into sabrecat/more-modals
Conflicts:
	common/dist/sprites/spritesmith-largeSprites-0.png
	common/locales/en/front.json
2015-11-09 16:24:17 -05:00
Blade Barringer 851631e465 Fix build errors 2015-11-09 08:19:24 -06:00
Blade Barringer 1e4570ff88 Move all delete user tests to new structure 2015-11-05 08:17:06 -06:00
Sabe Jones 502e7f0af2 Merge branch 'develop' into sabrecat/more-modals 2015-11-03 14:29:23 -05: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
Sabe Jones 5d3f41637f Merge branch 'develop' into sabrecat/more-modals 2015-10-30 16:33:17 -04:00
Blade Barringer ad6fbef85c Move chat tests to new infrastructure 2015-10-30 14:47:14 -05:00
Matteo Pagliazzi 37d83fdade mongoo 4 and new travis ci infrastructure 2015-10-29 16:35:02 +01:00
Blade Barringer 5cc790093e Move join party tests to new structure. 2015-10-29 07:41:49 -05:00
Blade Barringer 55fcf678c3 Move push notification to new infrastructure. 2015-10-28 21:36:04 -05:00
Blade Barringer ab1ac1f543 Remove unneeded test 2015-10-28 21:09:55 -05:00
Blade Barringer 265bb56db2 Move get user tests 2015-10-28 21:06:28 -05:00
Blade Barringer e98484d0ec Move anonymous route test to new structure. 2015-10-28 21:00:28 -05:00
Blade Barringer fd4fb836f0 Move task tests 2015-10-28 17:18:27 -05:00
Sabe Jones 27e3797307 Merge branch 'develop' into sabrecat/more-modals
Conflicts:
	common/locales/en/challenge.json
2015-10-28 14:54:55 -04:00
Blade Barringer 27d9e60d0f Update api legacy test readme 2015-10-22 20:05:31 -05:00
Blade Barringer 73b2208106 Port final groups test to new structure 2015-10-22 20:02:08 -05:00
Blade Barringer 3c8c4343ee Move group tests to new test structure 2015-10-22 18:04:16 -05:00
Blade Barringer c4402b2634 Port removeMember tests to new test format 2015-10-22 12:48:45 -05:00
Blade Barringer d28450d52a Port groups /leave tests to new integration tests. 2015-10-22 12:28:26 -05:00
Blade Barringer c3aa70ecc3 Moved guild update tests from legacy file to new file 2015-10-21 18:02:02 -05:00
Blade Barringer b52f901f41 Convert legacy api helper to js 2015-10-20 21:53:52 -05:00
Blade Barringer 3036c6db9e Merge branch 'develop' into new_api_test_infrastructure 2015-10-20 21:18:49 -05:00
Blade Barringer a0e7eef956 Fix legacy tests 2015-10-20 20:17:10 -05:00
Blade Barringer b2350f10f1 Create get groups test 2015-10-18 10:01:55 -05:00
Blade Barringer bab093b7ab Write get group tests 2015-10-18 07:15:35 -05:00
Blade Barringer 82b133e8fc Add tests for creating groups 2015-10-18 06:38:22 -05:00
Blade Barringer 1d22382c16 Remove get user test from legacy script 2015-10-17 20:15:34 -05:00
Blade Barringer 4a69dcbdf1 Remove status test from legacy infrastructure 2015-10-17 12:40:00 -05:00
Blade Barringer 5b729bf776 Merge branch 'develop' into new_api_test_infrastructure 2015-10-17 12:39:24 -05:00
Blade Barringer 0992f560e0 Merge branch 'develop' into new_api_test_infrastructure 2015-10-16 14:54:03 -05:00
Blade Barringer 3c1fd385fa Rename existing api tests to api-legacy 2015-09-16 08:12:47 -05:00