0834f8eeea
disable api v2 and related tests to enable changes to models
2015-11-07 15:51:26 +01:00
b7fb9ec805
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2015-11-07 15:41:05 +01:00
3a12490ad7
simplify code
2015-11-07 15:40:57 +01:00
ac7d3e642f
port middlewares to authenticate users with headers and sessions
2015-11-07 15:37:38 +01:00
30ba9582b5
Merge branch 'develop' into api-v3
2015-11-06 19:07:28 -06:00
56fbc33d1c
Merge branch 'develop' into Move-Overview-To-Website
...
Conflicts:
website/src/routes/pages.js
2015-11-05 14:31:00 -05:00
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
18c2279be4
fix(overview): Wording and layout tweaks
2015-11-05 14:18:51 -05:00
4cbda6818c
Correct code to not iterate over mongoose object
2015-11-05 13:08:37 -06:00
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
8967e6ee90
Give function more meaningful name.
2015-11-05 08:46:20 -06:00
78cfbd2c6a
Revert btn-buy style change
2015-11-04 22:02:50 -06:00
3a1862ecef
fix(static): Non-widgety App Store links
2015-11-04 22:42:10 -05:00
5cd3f0dd6e
Fix eslint styling errors.
2015-11-04 21:19:58 -06:00
87eb63ba9b
Add case where errorhandlerr does not receive an error
2015-11-04 20:48:39 -06:00
d5736e1178
Convert classes to use Babel syntax
2015-11-04 20:47:32 -06:00
2f6f0eb933
Add Babel require hook
2015-11-04 20:46:37 -06:00
a4f12f06f4
Remove extraneous white space
2015-11-04 20:46:23 -06:00
eae9adfaec
Merge branch 'develop' into api-v3
2015-11-04 20:25:05 -06:00
cde66d6167
Merge pull request #6183 from crookedneighbor/clientIdentifier
...
Client identifier
2015-11-04 20:03:31 -06:00
5a36d8e3f5
Switch to single quotes to conform to code style.
2015-11-04 18:03:50 -06:00
905e7b17ea
Refactor user model
2015-11-04 18:00:40 -06:00
df7e0236c2
fix(static): Improved /apps layout
2015-11-04 15:30:42 -05:00
8c4ecb8f6c
feat(static): Apps page
2015-11-04 13:35:31 -05:00
3135613be3
tweaks eslint rules, fixes gulp-eslint, adds some comments
2015-11-04 18:50:08 +01:00
54d89a59e3
add some eslint rules
2015-11-04 18:26:38 +01:00
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
182e4bff6f
wip api-v3: adds some comments and more eslint rules
2015-11-04 18:26:38 +01:00
5e73bc9f1c
adds logger and starts logging errors
2015-11-04 18:26:38 +01:00
5f3e798016
add basic .eslintrc and correct some style issues
2015-11-04 18:26:38 +01:00
4322b8c3dc
wip api-v3: add error handler middleware and custom error classes
2015-11-04 18:26:38 +01:00
b21df9edb3
use node 4, npm 3, mongoose 4 and express 4
2015-11-04 18:26:38 +01:00
f1dbe1b51d
deprecate api v1
2015-11-04 18:26:38 +01:00
7f189bebba
disable tutorial/tour depending on client
2015-11-04 16:54:47 +01:00
921ee881a5
Only create sample habits+dailies when registered through website
2015-11-04 16:41:13 +01:00
e13c008076
send "habitica-web" as x-client header
2015-11-04 16:26:50 +01:00
799190a898
Merge branch 'develop' into flag_messages_in_api
2015-11-04 07:56:34 -06:00
6d93356967
Changed overview link
2015-11-03 22:56:47 -04:30
5278a08c93
Added horizontal line
2015-11-03 22:32:23 -04:30
7342735b1b
Fix error missing web in webStep
2015-11-03 22:18:41 -04:30
f79110d6d2
Changed to be more like the FAQ
2015-11-03 22:03:24 -04:30
167af1afd4
New static page: overview
2015-11-03 13:35:14 -04:30
fa9b331f03
Created route for overview
2015-11-03 13:15:55 -04:30
1a68b5e9ee
Refactor and add tests to flagged messages.
2015-11-03 08:00:14 -06:00
24480e5f04
Merge branch 'develop' into srrvnn-develop
2015-11-03 07:31:48 -06:00
e74c83be2e
feat(content): November backgrounds and Armoire
2015-11-02 17:28:20 -05:00
2cb4e80019
chore(event): End Fall Festival
2015-11-02 12:55:48 -05:00
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
0894a3ea2d
Merge branch 'develop' into srrvnn-develop
2015-11-02 06:45:45 -06:00
2e7006a0f7
chore(news): Burnout win Bailey
2015-10-31 16:03:34 -04:00
Matteo Pagliazzi