215ca0371c
fix(signup): correct email checks
2015-10-15 19:52:21 +02:00
69fdff615a
use lowercase only emails - register phase
2015-10-15 18:26:23 +02:00
20415da586
Merge pull request #6018 from dcecile/develop
...
Issue #2606 - Verify/fix indices during sortTask
2015-10-09 21:30:14 +10:00
2cc4d65d78
Allow disabling logger in non-prod for testing
2015-10-08 22:42:09 -05:00
36d471ddff
Correct module exports
2015-10-08 08:42:42 -05:00
5e10b8f4c9
Correct assinging of tavernQuest object when boss damage is calculated
2015-10-08 08:32:40 -05:00
9e88d17a78
Adjust tavern export to send over only quest object
2015-10-08 07:45:25 -05:00
22284bbc24
Issue #2606 - Verify/fix indices during sortTask
...
Because the 'sortTask' operation uses a 'from' index and a 'to'
index as parameters, the server needs to check if these indices
are valid before performing the client's request. If the task ID
doesn't match the task at the 'from' index, then it's clear that
the client was looking at a preened list of todos (everything except
more-than-3-days-old-non-quest completed tasks). In that case, try
to recalculate the indices before continuing.
2015-10-06 21:24:34 -04:00
d27fb9dba2
WIP(world-boss): Rage and rewards
...
Also finishes out written story content.
2015-10-06 15:59:16 -04:00
f6abcc0ddf
WIP(world-boss): Initial stats outlay
...
Also quest reward sprites, groundwork for world damage, and partial content build.
2015-10-05 16:59:19 -04:00
2683b2b0a0
Use var to declare mongoose
2015-10-03 20:55:28 -05:00
be3decf859
Merge branch 'develop' into refactor-content
2015-10-01 21:20:04 -05:00
233211adc9
Merge pull request #5962 from HabitRPG/sabrecat/magic-potions
...
Magic Potions!
2015-10-01 14:04:14 -05:00
6c9fab254d
Add coffeescript dependency back in
2015-09-30 22:49:19 -05:00
08e6759da2
Fix path to content
2015-09-30 22:38:23 -05:00
6ad7b6ba4c
Correct content in analytics
2015-09-30 20:56:40 -05:00
a0f84bcf48
fix a few eslint rules
2015-09-25 15:58:39 +02:00
e96410aa57
feat(pets): Spooky pets/mounts
2015-09-22 14:23:52 -04:00
4525ee5358
Revert "Revert "Removed user's party invites when last user leaves party""
2015-09-17 23:27:21 -04:00
c26cd1fe5b
Revert "Removed user's party invites when last user leaves party"
2015-09-17 04:00:07 -04:00
347d028af7
fix(API): Fix inaccessible route
...
Mystic Hourglass routes aren't yet used by live code.
2015-09-17 01:57:28 -04:00
c8cc01fc44
feat(hourglass): Buy pets/mounts
...
Functionally complete as of this commit. Further commits will provide more polish and refactoring.
2015-09-16 14:35:43 -04:00
25b133c562
Merge branch 'develop' into sabrecat/timetravel-stable
2015-09-16 12:48:12 -04:00
c9c169a0fb
Merge pull request #5912 from TheHollidayInn/group-remove-party-invites-when-last-member-leaves
...
Removed user's party invites when last user leaves party
2015-09-16 07:59:32 -05:00
4c84728873
Removes quest from group if quest leader is booted
2015-09-15 18:10:31 -05:00
a655242c49
Correct test assertion
2015-09-15 17:38:22 -05:00
9abe67b0ad
Prevent quest leaders from leaving party
...
(cherry picked from commit dc43aa5902
2015-09-15 16:41:50 -05:00
f8850755d0
Correct leave call to prevent leaving if quest is in progress
...
(cherry picked from commit eddea562f4
2015-09-15 16:41:25 -05:00
6e4cc4b35b
fix(API): Missing colons
2015-09-15 15:47:19 -04:00
ce764ca28e
WIP(hourglass): Mystery sets API route
2015-09-15 15:41:57 -04:00
66a8be526b
WIP(hourglass): Error catches
2015-09-15 12:40:01 -05:00
d573f3c53d
Merge branch 'melarish-Mystery_items_already_owned' into develop
2015-09-13 18:28:18 -05:00
e554309822
Add route to add a hourglass
2015-09-13 15:09:41 -05:00
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
26e6126a25
Removed redundant code when removing group invitations
2015-09-11 12:14:01 -05:00
5c8c5a9ed3
Removed user's party invites when last user leaves party
2015-09-10 23:29:32 -05:00
e86809dc07
fix leaving group
2015-09-09 22:41:41 +02:00
c292d7b438
Merge pull request #5888 from TheHollidayInn/groups-delete-when-last-member-leaves
...
Groups delete when last member leaves
2015-09-09 11:26:04 +02:00
ca37f4161c
Removed firebase deleteGroup to post remove
2015-09-08 21:17:28 -05:00
cf2548693f
Changed cb2 to cb and removed extra query when removing group
2015-09-08 20:12:58 -05:00
c7d09acd74
Moved inivtation removal functions to group pre remove middleware
2015-09-08 15:58:53 -05:00
205bbeee75
Add marked to jade rendering
2015-09-06 19:45:35 -05:00
6a1d4adcda
Merge branch 'develop' into HabitRPG-sabrecat/faq
2015-09-06 17:10:45 -05:00
82a3ca8a4d
Merged changes to firebase branch
2015-09-06 16:58:44 -05:00
d02f2d34e3
Merge pull request #5893 from crookedneighbor/content-faq
...
Content FAQ for iOS
2015-09-06 16:38:18 -05:00
b839c0cd0c
Change condition scope to fix updating for public guilds with a member count of 1
2015-09-06 15:31:41 -05:00
700a6ddd9e
Remove users inviations when guild is deleted
2015-09-06 15:31:40 -05:00
e68e29db8f
Delete private guilds or parties when last member leaves.
2015-09-06 15:31:40 -05:00
b9bbc3f1ea
Move content to own directory
2015-09-06 15:31:08 -05:00
bfd6d055b0
merge into develop
2015-09-06 21:21:39 +02:00
Matteo Pagliazzi