 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
|
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 |
|
|
Blade Barringer
|
77d60cd616
|
Add tests for error handling
|
2015-11-04 20:49:08 -06:00 |
|
|
Blade Barringer
|
87eb63ba9b
|
Add case where errorhandlerr does not receive an error
|
2015-11-04 20:48:39 -06:00 |
|
|
Blade Barringer
|
d5736e1178
|
Convert classes to use Babel syntax
|
2015-11-04 20:47:32 -06:00 |
|
|
Blade Barringer
|
2f6f0eb933
|
Add Babel require hook
|
2015-11-04 20:46:37 -06:00 |
|
|
Blade Barringer
|
a4f12f06f4
|
Remove extraneous white space
|
2015-11-04 20:46:23 -06:00 |
|
|
Blade Barringer
|
aaa4a7da12
|
Add sinon to helpers
|
2015-11-04 20:45:51 -06:00 |
|
|
Blade Barringer
|
0e8ad62607
|
Update nvmrc
|
2015-11-04 20:44:21 -06:00 |
|
|
Blade Barringer
|
eae9adfaec
|
Merge branch 'develop' into api-v3
|
2015-11-04 20:25:05 -06:00 |
|
|
Blade Barringer
|
cde66d6167
|
Merge pull request #6183 from crookedneighbor/clientIdentifier
Client identifier
|
2015-11-04 20:03:31 -06:00 |
|
|
Blade Barringer
|
5a36d8e3f5
|
Switch to single quotes to conform to code style.
|
2015-11-04 18:03:50 -06:00 |
|
|
Blade Barringer
|
905e7b17ea
|
Refactor user model
|
2015-11-04 18:00:40 -06:00 |
|
|
Blade Barringer
|
797287a75c
|
Add and adjust tests for new register behavior.
|
2015-11-04 17:40:49 -06:00 |
|
|
Blade Barringer
|
8618716ca4
|
Update requester to take in additional set parameters.
|
2015-11-04 17:40:10 -06:00 |
|
|
Sabe Jones
|
de5d2df94c
|
fix(i18n): Add missing string
|
2015-11-04 16:04:51 -05:00 |
|
|
Sabe Jones
|
c61e49f5a7
|
Merge pull request #6182 from HabitRPG/sabrecat/apps-page
Apps page
|
2015-11-04 14:46:49 -06:00 |
|
|
Sabe Jones
|
df7e0236c2
|
fix(static): Improved /apps layout
|
2015-11-04 15:30:42 -05:00 |
|
|
Sabe Jones
|
8c4ecb8f6c
|
feat(static): Apps page
|
2015-11-04 13:35:31 -05:00 |
|
|
Matteo Pagliazzi
|
bea5fd6e59
|
add eslint task to tests
|
2015-11-04 18:58:50 +01:00 |
|
|
Matteo Pagliazzi
|
3135613be3
|
tweaks eslint rules, fixes gulp-eslint, adds some comments
|
2015-11-04 18:50:08 +01:00 |
|
|
Matteo Pagliazzi
|
235f1977ba
|
finish .eslintrc file and update gulp task
|
2015-11-04 18:26:38 +01:00 |
|
|
Matteo Pagliazzi
|
f02ef9b6be
|
add some eslint rules
|
2015-11-04 18:26:38 +01:00 |
|
|
Matteo Pagliazzi
|
54d89a59e3
|
add some eslint rules
|
2015-11-04 18:26:38 +01:00 |
|
|
Matteo Pagliazzi
|
cbca250b99
|
remove winston-mail and winston-newrelic from deps as they may not be compatible with v2
|
2015-11-04 18:26:38 +01:00 |
|
|
Matteo Pagliazzi
|
182e4bff6f
|
wip api-v3: adds some comments and more eslint rules
|
2015-11-04 18:26:38 +01:00 |
|
|
Matteo Pagliazzi
|
5e73bc9f1c
|
adds logger and starts logging errors
|
2015-11-04 18:26:38 +01:00 |
|
|
Matteo Pagliazzi
|
5f3e798016
|
add basic .eslintrc and correct some style issues
|
2015-11-04 18:26:38 +01:00 |
|
|
Matteo Pagliazzi
|
7b4d082ab8
|
use node v4 in travis
|
2015-11-04 18:26:38 +01:00 |
|