 Blade Barringer
|
43ef4e51b5
|
fix(model): Remove pre validation from user model
|
2015-11-21 14:56:20 -06:00 |
|
|
Matteo Pagliazzi
|
afbfbdd01c
|
fix mongoose promise, some user validation, tests urls
|
2015-11-21 14:27:24 +01:00 |
|
|
Matteo Pagliazzi
|
3608742e20
|
fix bugs on user controller
|
2015-11-21 12:26:48 +01:00 |
|
|
Matteo Pagliazzi
|
972cbbdaa6
|
try moving all the logic to the model
|
2015-11-19 21:09:39 +01:00 |
|
|
Blade Barringer
|
05eb0ec782
|
Add missing comma.
|
2015-11-17 17:26:18 -06:00 |
|
|
Blade Barringer
|
e6a5d08150
|
Merge branch 'develop' into api-v3
|
2015-11-16 17:34:30 -06:00 |
|
|
Sabe Jones
|
e73c7be47a
|
fix(achievement): Make Costume Contest repeatable
|
2015-11-16 16:07:16 -05:00 |
|
|
Blade Barringer
|
6e8e1648d9
|
Merge branch 'develop' into api-v3
|
2015-11-13 07:38:24 -06:00 |
|
|
Blade Barringer
|
ada97c1f91
|
Add invite party to ios tutorial
|
2015-11-13 07:19:51 -06:00 |
|
|
Blade Barringer
|
40fab075e2
|
Clean up linting for user model.
|
2015-11-11 19:53:22 -06:00 |
|
|
Blade Barringer
|
c5445dc426
|
Merge branch 'develop' into api-v3
|
2015-11-11 19:42:39 -06:00 |
|
|
Sabe Jones
|
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 |
|
|
Blade Barringer
|
88a80162ee
|
Merge branch 'api-v3' into v3_make_linter_happy
|
2015-11-09 07:46:39 -06:00 |
|
|
Blade Barringer
|
78bdbfc96f
|
Add todo to use catch syntax
|
2015-11-09 07:43:48 -06:00 |
|
|
Matteo Pagliazzi
|
87f50ff2b9
|
use callback in place of catch
|
2015-11-08 19:01:48 +01:00 |
|
|
Blade Barringer
|
6aaef14300
|
Convert catch to second callback
|
2015-11-08 10:06:40 -06:00 |
|
|
Blade Barringer
|
a0094f4f48
|
Add exception for camelcase rule
|
2015-11-08 09:49:54 -06:00 |
|
|
Blade Barringer
|
7251a3a104
|
Extract profile name logic to private function
|
2015-11-08 09:36:10 -06:00 |
|
|
Blade Barringer
|
366cbd9bff
|
Remove unneeded variable
|
2015-11-08 09:30:31 -06:00 |
|
|
Blade Barringer
|
3d86cefe78
|
Convert switch statement to if-else
|
2015-11-08 09:28:40 -06:00 |
|
|
Blade Barringer
|
7b58873866
|
Add names to functions
|
2015-11-08 09:25:45 -06:00 |
|
|
Matteo Pagliazzi
|
4b60698527
|
migrate user model to new code style and es6
|
2015-11-08 16:11:55 +01:00 |
|
|
Blade Barringer
|
4cbda6818c
|
Correct code to not iterate over mongoose object
|
2015-11-05 13:08:37 -06:00 |
|
|
Blade Barringer
|
905e7b17ea
|
Refactor user model
|
2015-11-04 18:00:40 -06: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 |
|
|
Sabe Jones
|
5d3f41637f
|
Merge branch 'develop' into sabrecat/more-modals
|
2015-10-30 16:33:17 -04:00 |
|
|
Blade Barringer
|
dd09633d31
|
Merge branch 'locks-auto-equip' into develop
|
2015-10-29 12:25:18 -05:00 |
|
|
Sabe Jones
|
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 |
|
|
kylestratis
|
0283408d1e
|
Removed FIXME comment above invitations object - the object is still being used.
|
2015-10-27 21:12:19 -04:00 |
|
|
Matteo Pagliazzi
|
c7f8426bce
|
preparation for code for lowercase emails and lowercase version of username to check for duplicates
|
2015-10-21 11:01:06 +02:00 |
|
|
Phillip Thelen
|
2fde3c771f
|
remove empty line
|
2015-10-19 12:50:30 +02:00 |
|
|
Ricardo Mendes
|
e79863e134
|
Adds auto-equip boolean to user preferences
|
2015-10-19 05:20:10 +00:00 |
|
|
Phillip Thelen
|
7a7d038602
|
Split up tutorial parts
|
2015-10-18 17:29:06 +02:00 |
|
|
Phillip Thelen
|
caa7d4a220
|
store iOS tutorial steps
|
2015-10-12 16:34:07 +02:00 |
|
|
Sabe Jones
|
e96410aa57
|
feat(pets): Spooky pets/mounts
|
2015-09-22 14:23:52 -04:00 |
|
|
Alys
|
fbaa5d4321
|
add new audi theme from LuneFox, moved themes to alphabetical order, adjusted file permissions for Watts Theme
|
2015-09-12 11:05:31 +10:00 |
|
|
Sabe Jones
|
12b0361d45
|
WIP(warning-modal): Low health warning
|
2015-08-18 16:05:48 -04:00 |
|
|
Matteo Pagliazzi
|
b31966b1ee
|
use assign in place of merge, make sure references to tavern and mods are not lost
|
2015-08-14 22:02:19 +02:00 |
|
|
Matteo Pagliazzi
|
34dd4494ec
|
in locals middleware require tavern and mods only once
|
2015-08-14 13:10:53 +02:00 |
|
|
Sabe Jones
|
b2100c2c54
|
WIP(greeting-cards): Abandon spell refactor
|
2015-08-13 14:31:34 -05:00 |
|
|
Sabe Jones
|
ceb9cf7817
|
WIP(event): Habitica Day
|
2015-07-28 16:20:08 -05:00 |
|
|
Sabe Jones
|
13ab60cafe
|
feat(drops): Enable pets at Level 3
|
2015-07-28 13:28:45 -05:00 |
|
|
Blade Barringer
|
f40cfd2b66
|
Move all pet counting to shared count scripts
|
2015-07-22 17:32:12 -05:00 |
|
|
Blade Barringer
|
65c14b1e3f
|
Refactor inventory ctrl variables
|
2015-07-20 12:51:10 -05:00 |
|
|
Blade Barringer
|
3d40da4004
|
Remove countPets and countMounts from codebase
|
2015-07-20 08:11:00 -05:00 |
|
|
Will
|
9bcb3b5cbe
|
update model maxHealth
|
2015-07-03 22:22:28 -07:00 |
|
|
Sabe Jones
|
d4b5620ada
|
Merge branch 'sabrecat/summer-splash' into develop
|
2015-07-01 13:13:23 -05:00 |
|
|
Sabe Jones
|
25dd82ffa0
|
feat(event): Summer Splash cont'd
Summer backgrounds, the Seafoam transformation item, and announcements for same.
|
2015-07-01 13:11:53 -05:00 |
|
|
Matteo Pagliazzi
|
4e7afcbe94
|
feat(amazon-payments): add a lastBillingDate attribute
|
2015-07-01 18:59:51 +02:00 |
|