 Matteo Pagliazzi
|
87f50ff2b9
|
use callback in place of catch
|
2015-11-08 19:01:48 +01:00 |
|
|
Matteo Pagliazzi
|
46505c8a0b
|
Merge pull request #6202 from crookedneighbor/nconf_setup
Nconf setup
|
2015-11-08 16:14:45 +01:00 |
|
|
Matteo Pagliazzi
|
5b3c460344
|
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
|
2015-11-08 16:14:10 +01:00 |
|
|
Matteo Pagliazzi
|
4b60698527
|
migrate user model to new code style and es6
|
2015-11-08 16:11:55 +01:00 |
|
|
Blade Barringer
|
832e837f6a
|
Simplify nconf test
|
2015-11-08 09:07:43 -06:00 |
|
|
Blade Barringer
|
9451e7239b
|
Add nconf setup to unit test helper
|
2015-11-08 09:01:25 -06:00 |
|
|
Blade Barringer
|
447d4c332d
|
Remove extraneous nconf setup.
|
2015-11-08 08:56:27 -06:00 |
|
|
Blade Barringer
|
1ef6839eea
|
Add IS_PROD to logger utility
|
2015-11-08 08:49:16 -06:00 |
|
|
Blade Barringer
|
0d7f984fce
|
Add setupNconf function
|
2015-11-08 08:47:46 -06:00 |
|
|
Blade Barringer
|
22f76e9479
|
Use npm 3 for travis
|
2015-11-07 21:06:59 -06:00 |
|
|
Blade Barringer
|
58cf34af9d
|
Merge branch 'develop' into api-v3
|
2015-11-07 21:06:37 -06:00 |
|
|
Blade Barringer
|
598d25dc48
|
Update browserify package
|
2015-11-07 20:56:56 -06:00 |
|
|
Blade Barringer
|
a6c7e3b885
|
Update protractor dependency
|
2015-11-07 20:31:28 -06:00 |
|
|
Blade Barringer
|
f137e0d41d
|
Add gulp to travis
|
2015-11-07 20:16:32 -06:00 |
|
|
Blade Barringer
|
b6a1414e1c
|
Update npm to v2
|
2015-11-07 20:09:36 -06:00 |
|
|
Blade Barringer
|
05ae419d7e
|
Update karma dependencies and remove unused packages.
|
2015-11-07 19:56:09 -06:00 |
|
|
Blade Barringer
|
88f8a2a375
|
Swap out gulp-clean for rimraf
|
2015-11-07 19:09:51 -06:00 |
|
|
Blade Barringer
|
320b7e4a93
|
Merge pull request #6196 from crookedneighbor/add_unit_test_helpers
Add unit test helpers
|
2015-11-07 09:50:15 -06:00 |
|
|
Blade Barringer
|
3559be0f83
|
Use toObject instead of _doc
|
2015-11-07 09:42:57 -06:00 |
|
|
Matteo Pagliazzi
|
f26737ab79
|
use q for mongoose promises and switch to promises from callbacks in queries
|
2015-11-07 16:28:52 +01:00 |
|
|
Blade Barringer
|
b323c3b5e9
|
Use res and req generators in error handler test
|
2015-11-07 09:26:13 -06:00 |
|
|
Blade Barringer
|
1eadceea3d
|
Add status to default res
|
2015-11-07 09:25:43 -06:00 |
|
|
Matteo Pagliazzi
|
0834f8eeea
|
disable api v2 and related tests to enable changes to models
|
2015-11-07 15:51:26 +01:00 |
|
|
Matteo Pagliazzi
|
b7fb9ec805
|
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
|
2015-11-07 15:41:05 +01:00 |
|
|
Matteo Pagliazzi
|
3a12490ad7
|
simplify code
|
2015-11-07 15:40:57 +01:00 |
|
|
Matteo Pagliazzi
|
ac7d3e642f
|
port middlewares to authenticate users with headers and sessions
|
2015-11-07 15:37:38 +01:00 |
|
|
Blade Barringer
|
e657a30320
|
Add next generator for easier controller testing.
|
2015-11-07 08:32:02 -06:00 |
|
|
Blade Barringer
|
94dbb25fa6
|
Add unit helper
|
2015-11-06 21:28:47 -06:00 |
|
|
Blade Barringer
|
6e344ce04b
|
Add sandbox as a global
|
2015-11-06 21:28:31 -06:00 |
|
|
Blade Barringer
|
303b88b6fa
|
Adjust api tests
|
2015-11-06 21:28:19 -06:00 |
|
|
Blade Barringer
|
18328c0c42
|
Add lodash.deepDefaults as a dependency
|
2015-11-06 21:27:38 -06:00 |
|
|
Blade Barringer
|
30ba9582b5
|
Merge branch 'develop' into api-v3
|
2015-11-06 19:07:28 -06:00 |
|
|
Sabe Jones
|
b6702c293e
|
Merge pull request #6172 from AminArria/Move-Overview-To-Website
Move overview to website
|
2015-11-06 11:04:44 -06:00 |
|
|
Amin Arria
|
4aba7afdce
|
Merge pull request #1 from HabitRPG/sabrecat/Move-Overview-To-Website
fix(overview): Wording and layout tweaks
|
2015-11-05 17:44:15 -04:30 |
|
|
Sabe Jones
|
56fbc33d1c
|
Merge branch 'develop' into Move-Overview-To-Website
Conflicts:
website/src/routes/pages.js
|
2015-11-05 14:31:00 -05:00 |
|
|
Matteo Pagliazzi
|
9cf3c72002
|
Merge pull request #6188 from crookedneighbor/fix_user
Correct code to not iterate over mongoose object
|
2015-11-05 20:20:25 +01:00 |
|
|
Sabe Jones
|
18c2279be4
|
fix(overview): Wording and layout tweaks
|
2015-11-05 14:18:51 -05:00 |
|
|
Blade Barringer
|
4cbda6818c
|
Correct code to not iterate over mongoose object
|
2015-11-05 13:08:37 -06:00 |
|
|
Sabe Jones
|
bb55a74f48
|
chore(news): iOS update Bailey
Also fixes the color of the iOS app icon and codes it more intelligently.
|
2015-11-05 11:48:51 -05:00 |
|
|
Blade Barringer
|
0cf964728e
|
Merge pull request #6176 from crookedneighbor/api-v3_add-babel
Api v3 add babel
|
2015-11-05 08:47:44 -06:00 |
|
|
Blade Barringer
|
8967e6ee90
|
Give function more meaningful name.
|
2015-11-05 08:46:20 -06:00 |
|
|
Blade Barringer
|
1e4570ff88
|
Move all delete user tests to new structure
|
2015-11-05 08:17:06 -06:00 |
|
|
Alys
|
a49fecb063
|
minor fix to migration script
|
2015-11-05 18:15:25 +10:00 |
|
|
Alys
|
67a291f03d
|
migration script for setting flags.tutorial.ios
|
2015-11-05 18:13:55 +10:00 |
|
|
Blade Barringer
|
78cfbd2c6a
|
Revert btn-buy style change
|
2015-11-04 22:02:50 -06:00 |
|
|
Blade Barringer
|
3726f48ff2
|
chore(i18n): update locales
|
2015-11-04 21:57:16 -06:00 |
|
|
Sabe Jones
|
3a1862ecef
|
fix(static): Non-widgety App Store links
|
2015-11-04 22:42:10 -05:00 |
|
|
Blade Barringer
|
07df642f15
|
Add gulp tasks for v3 testing
|
2015-11-04 21:27:19 -06:00 |
|
|
Blade Barringer
|
5cd3f0dd6e
|
Fix eslint styling errors.
|
2015-11-04 21:19:58 -06:00 |
|
|
Blade Barringer
|
292177e51f
|
Update eslintrc
|
2015-11-04 21:19:29 -06:00 |
|