Blade Barringer
93f02363e5
Add feature to join new party if user is in a party of one
2015-08-22 12:19:37 -05:00
Blade Barringer
3153fbac3c
Fix bug where mutliple user ids could not be saved
2015-08-21 08:19:39 -05:00
Blade Barringer
7fcfe6734b
Correct spacing
2015-08-21 08:19:06 -05:00
Blade Barringer
fca6f91f13
Merge branch 'develop' into analytics-service-server-side
2015-07-24 15:19:31 -05:00
Blade Barringer
054d884154
Merge branch 'develop' into analytics-service-server-side
2015-07-19 10:13:34 -05:00
Sabe Jones
ffc441ab82
feat(quests): Improve drop notif
2015-07-16 16:22:49 -05:00
hairlessbear
7223eeb681
Invites a new party member to a quest if the quest is still in the invitation stage ( fixes #5598 )
2015-07-13 13:01:35 -04:00
Blade Barringer
cdcc085530
Adjust test
2015-07-10 23:21:23 -05:00
TheHollidayInn
acb82f99ce
Remove user's group msg notification when they are kicked from the group
2015-07-10 22:39:17 -05:00
Sabe Jones
3bbde2a548
fix(analytics): Include GA label for quest actions
2015-07-10 13:57:46 -05:00
Sabe Jones
175b4fa6e0
fix(analytics): Correct quest key
2015-07-10 13:51:27 -05:00
Sabe Jones
5e89ae200d
feat(analytics): Server tweaks
...
Remove duplicate browser-side tracking for new user registration. Move quest tracking to server side and expand to include all quest accept/reject actions.
2015-07-10 13:47:03 -05:00
Blade Barringer
b72b14fe6c
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-28 21:07:32 -05:00
Blade Barringer
54509d234c
Clean up groups controller
...
* Put nullifying variables back in per https://github.com/HabitRPG/habitrpg/pull/5437/files#r32896108
* converted questStart to a hoisted function
2015-06-21 14:02:40 -05:00
Blade Barringer
19f8ca7980
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-20 17:36:32 -05:00
Blade Barringer
95f1c01b01
Removed more variable assignments that were never getting set
2015-06-20 16:54:33 -05:00
Blade Barringer
68f764bca6
Removed var assignment that is never reached
2015-06-20 16:50:48 -05:00
Blade Barringer
14fe29dd4a
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-14 16:33:38 -05:00
Blade Barringer
8dde41d18a
Wrie and refactor guild tests
2015-06-10 23:39:46 -05:00
Blade Barringer
1bf38578bf
Merge branch 'develop' into hairlessbear-show_group_leader
2015-06-10 17:51:45 -05:00
hairlessbear
90015134da
Fixed 'group.leader.profile.name' issue and changed all instances of 'group.leader' to 'group.leader._id'
2015-06-04 15:18:09 -04:00
Negue
5612b4be6b
Only send "Quest Started" Notifications to users which accepted the quest
2015-06-02 20:02:14 +02:00
Negue
264a1e4b16
FIX: Quest Invitation Notification
...
ADD: Quest Started Notification
2015-06-02 17:40:19 +02:00
Blade Barringer
c1501db292
Refactor chat related things into own service
2015-05-30 12:08:32 -05:00
hairlessbear
a0f3e02f74
Set party.quest.key to null on quest reject and quest cancel
2015-05-27 11:52:53 -04:00
hairlessbear
cc3d63b858
Fixed rewards on quest invite modal
2015-05-27 10:05:03 -04:00
hairlessbear
cfcfb8fd02
Changed invite to RSVPNeeded
2015-05-27 09:18:44 -04:00
hairlessbear
0fa93506f5
Made quest invite modal pop-up on user sync (rewards display currently nonfunctional)
2015-05-26 23:01:29 -04:00
Blade Barringer
bd76b762e6
Merge pull request #5212 from HabitRPG/negue-WIP-Push-notifications
...
Negue wip push notifications
2015-05-18 11:14:53 -05:00
Blade Barringer
d7ce151500
Add translatable strings
2015-05-14 21:56:16 -05:00
Blade Barringer
3cbd5fd9ff
Merge branch 'develop' into negue-WIP-Push-notifications
2015-05-13 19:11:57 -05:00
Matteo Pagliazzi
05f6e5e14d
fix(flags): correctly send flag reports emails
2015-05-13 20:08:46 +02:00
Blade Barringer
4050e9ad0c
Fix guilds not loading \(^ω^\)
2015-05-12 22:28:06 -05:00
Blade Barringer
9a84503aed
Merge branch 'develop' into negue-WIP-Push-notifications
2015-05-12 19:06:34 -05:00
Blade Barringer
ff41a2c240
Refactor group tests
2015-05-12 08:08:55 -05:00
Matteo Pagliazzi
d448ca3ac5
fix(groups): do not try to add members to a party when it does not exists
2015-05-11 22:13:31 +02:00
Matteo Pagliazzi
ae8b170446
fix(emails): remove base url from server
2015-05-11 20:44:52 +02:00
Negue
90edb7719f
Merge branch 'develop' into pushNotifications2
2015-05-08 23:21:18 +02:00
Blade Barringer
30546ccf12
remove extraneous comment
2015-05-07 17:51:51 -05:00
Blade Barringer
9884ed71f8
Merge branch 'develop' into TheHollidayInn-join-button-fix
2015-05-07 17:50:57 -05:00
TheHollidayInn
47121fa70d
Update tests to use get url, added not member tests, and updated logic to prevent users from being added to public guilds
2015-05-07 15:59:21 -05:00
Blade Barringer
cb9738251f
Add isUserInvited to if statement
2015-05-07 13:26:22 -05:00
Matteo Pagliazzi
25fe1d34d6
fix(groups): you should not be able to join a group you are not invited to
2015-05-07 18:56:41 +02:00
TheHollidayInn
bcb7b75380
Fixed conditional and spacing
2015-05-05 20:13:53 -05:00
TheHollidayInn
8a4b43905d
Added tests
2015-05-04 19:12:44 -05:00
TheHollidayInn
0bd39120aa
Updated conditionals
2015-05-03 19:35:47 -05:00
TheHollidayInn
5fe6121495
Added user to group.member if they are a member of the group and not included in the query
2015-05-03 19:35:47 -05:00
TheHollidayInn
65a0ecdd6a
Added query to always include user when populating group members
2015-05-03 19:35:46 -05:00
Negue
b23e901780
Merge branch 'develop' into pushNotifications2
2015-04-27 17:20:25 +02:00
Blade Barringer
730ac4b3df
correct chat api tests; prevent sending a blank message via the api
2015-04-10 18:27:58 -05:00