5fa514b6fa
Merge branch 'develop' into api-v3
2015-11-27 17:05:29 +01:00
d67836ee1f
allow for additional transform functions for toJSON and sanitize
2015-11-25 15:42:29 +01:00
77d25ddc32
correctly add _id default
2015-11-25 13:43:34 +01:00
3f1faf113e
add baseModel plugin with some tests
2015-11-24 18:51:48 +01:00
743e7cbebd
store inviteParty coachmark for iOS app
2015-11-23 16:24:46 +01:00
d1839b816e
chore(lint): Clean up user model and controller
2015-11-21 16:17:42 -06:00
75cea0c810
refactor(model): Remove password and passwordConfirmation from user model
2015-11-21 14:56:44 -06:00
43ef4e51b5
fix(model): Remove pre validation from user model
2015-11-21 14:56:20 -06:00
afbfbdd01c
fix mongoose promise, some user validation, tests urls
2015-11-21 14:27:24 +01:00
3608742e20
fix bugs on user controller
2015-11-21 12:26:48 +01:00
972cbbdaa6
try moving all the logic to the model
2015-11-19 21:09:39 +01:00
6451264572
start porting register local user handler, several bug fixes
2015-11-19 12:13:54 +01:00
05eb0ec782
Add missing comma.
2015-11-17 17:26:18 -06:00
e6a5d08150
Merge branch 'develop' into api-v3
2015-11-16 17:34:30 -06:00
e73c7be47a
fix(achievement): Make Costume Contest repeatable
2015-11-16 16:07:16 -05:00
d89b1cb60d
port firebase lib to api v3
2015-11-14 02:50:58 +01:00
6e8e1648d9
Merge branch 'develop' into api-v3
2015-11-13 07:38:24 -06:00
ada97c1f91
Add invite party to ios tutorial
2015-11-13 07:19:51 -06:00
858bf99930
Move old logging lib v2 directory
2015-11-12 08:18:23 -06:00
40fab075e2
Clean up linting for user model.
2015-11-11 19:53:22 -06:00
c5445dc426
Merge branch 'develop' into api-v3
2015-11-11 19:42:39 -06:00
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
88a80162ee
Merge branch 'api-v3' into v3_make_linter_happy
2015-11-09 07:46:39 -06:00
78bdbfc96f
Add todo to use catch syntax
2015-11-09 07:43:48 -06:00
87f50ff2b9
use callback in place of catch
2015-11-08 19:01:48 +01:00
6aaef14300
Convert catch to second callback
2015-11-08 10:06:40 -06:00
a0094f4f48
Add exception for camelcase rule
2015-11-08 09:49:54 -06:00
7251a3a104
Extract profile name logic to private function
2015-11-08 09:36:10 -06:00
366cbd9bff
Remove unneeded variable
2015-11-08 09:30:31 -06:00
3d86cefe78
Convert switch statement to if-else
2015-11-08 09:28:40 -06:00
7b58873866
Add names to functions
2015-11-08 09:25:45 -06:00
4b60698527
migrate user model to new code style and es6
2015-11-08 16:11:55 +01:00
4cbda6818c
Correct code to not iterate over mongoose object
2015-11-05 13:08:37 -06:00
cde66d6167
Merge pull request #6183 from crookedneighbor/clientIdentifier
...
Client identifier
2015-11-04 20:03:31 -06:00
905e7b17ea
Refactor user model
2015-11-04 18:00:40 -06: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
502e7f0af2
Merge branch 'develop' into sabrecat/more-modals
2015-11-03 14:29:23 -05:00
1a68b5e9ee
Refactor and add tests to flagged messages.
2015-11-03 08:00:14 -06: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
559a2cea50
revert my stupid tavern quest hack because a server restart was all that was needed
2015-10-31 19:11:07 +09:00
fbb1f9aec5
create a nasty hack to get rid of the persistent Tavern quest exhaust sprites
2015-10-31 19:01:21 +09:00
5d3f41637f
Merge branch 'develop' into sabrecat/more-modals
2015-10-30 16:33:17 -04:00
dd09633d31
Merge branch 'locks-auto-equip' into develop
2015-10-29 12:25:18 -05:00
f4ea6c1d5d
feat(sharing): Opt Out WIP
...
First draft of support for opting out of future modal display on specific events, and adds the second barebones target page for sharing.
2015-10-28 16:36:47 -04:00
0283408d1e
Removed FIXME comment above invitations object - the object is still being used.
2015-10-27 21:12:19 -04:00
c7f8426bce
preparation for code for lowercase emails and lowercase version of username to check for duplicates
2015-10-21 11:01:06 +02:00
2fde3c771f
remove empty line
2015-10-19 12:50:30 +02:00
e79863e134
Adds auto-equip boolean to user preferences
2015-10-19 05:20:10 +00:00
7a7d038602
Split up tutorial parts
2015-10-18 17:29:06 +02:00
Matteo Pagliazzi