 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
|
4b60698527
|
migrate user model to new code style and es6
|
2015-11-08 16:11:55 +01: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 |
|
|
Matteo Pagliazzi
|
f26737ab79
|
use q for mongoose promises and switch to promises from callbacks in queries
|
2015-11-07 16:28:52 +01: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
|
30ba9582b5
|
Merge branch 'develop' into api-v3
|
2015-11-06 19:07:28 -06:00 |
|
|
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
|
8967e6ee90
|
Give function more meaningful name.
|
2015-11-05 08:46:20 -06:00 |
|
|
Blade Barringer
|
78cfbd2c6a
|
Revert btn-buy style change
|
2015-11-04 22:02:50 -06:00 |
|
|
Sabe Jones
|
3a1862ecef
|
fix(static): Non-widgety App Store links
|
2015-11-04 22:42:10 -05:00 |
|
|
Blade Barringer
|
5cd3f0dd6e
|
Fix eslint styling errors.
|
2015-11-04 21:19:58 -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
|
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 |
|
|
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
|
3135613be3
|
tweaks eslint rules, fixes gulp-eslint, adds some comments
|
2015-11-04 18:50:08 +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
|
4322b8c3dc
|
wip api-v3: add error handler middleware and custom error classes
|
2015-11-04 18:26:38 +01:00 |
|
|
Matteo Pagliazzi
|
b21df9edb3
|
use node 4, npm 3, mongoose 4 and express 4
|
2015-11-04 18:26:38 +01:00 |
|
|
Matteo Pagliazzi
|
f1dbe1b51d
|
deprecate api v1
|
2015-11-04 18:26:38 +01:00 |
|
|
Phillip Thelen
|
7f189bebba
|
disable tutorial/tour depending on client
|
2015-11-04 16:54:47 +01:00 |
|
|
Phillip Thelen
|
921ee881a5
|
Only create sample habits+dailies when registered through website
|
2015-11-04 16:41:13 +01:00 |
|
|
Phillip Thelen
|
e13c008076
|
send "habitica-web" as x-client header
|
2015-11-04 16:26:50 +01:00 |
|
|
Blade Barringer
|
799190a898
|
Merge branch 'develop' into flag_messages_in_api
|
2015-11-04 07:56:34 -06:00 |
|
|
Amin Arria
|
6d93356967
|
Changed overview link
|
2015-11-03 22:56:47 -04:30 |
|
|
Amin Arria
|
5278a08c93
|
Added horizontal line
|
2015-11-03 22:32:23 -04:30 |
|
|
Amin Arria
|
7342735b1b
|
Fix error missing web in webStep
|
2015-11-03 22:18:41 -04:30 |
|
|
Amin Arria
|
f79110d6d2
|
Changed to be more like the FAQ
|
2015-11-03 22:03:24 -04:30 |
|
|
Amin Arria
|
167af1afd4
|
New static page: overview
|
2015-11-03 13:35:14 -04:30 |
|
|
Amin Arria
|
fa9b331f03
|
Created route for overview
|
2015-11-03 13:15:55 -04:30 |
|