b72b14fe6c
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-28 21:07:32 -05:00
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
19f8ca7980
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-20 17:36:32 -05:00
95f1c01b01
Removed more variable assignments that were never getting set
2015-06-20 16:54:33 -05:00
68f764bca6
Removed var assignment that is never reached
2015-06-20 16:50:48 -05:00
ddc8508816
Merge branch 'develop' into TheHollidayInn-tasks-api-up-checkoff-todo
2015-06-19 23:00:18 -05:00
39adff0e2c
improve error reporting for iOS IAP
2015-06-15 13:09:22 +02:00
bb2f97e802
Added android tests for iap
2015-06-14 18:35:19 -05:00
5b6afde475
Remove console.logs
2015-06-14 18:08:00 -05:00
cd45fc06c6
Collapse return and res.json statements
2015-06-14 18:07:23 -05:00
14fe29dd4a
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-14 16:33:38 -05:00
6997783037
Check that iOS IAP is of correct type
2015-06-14 15:59:43 +02:00
8dde41d18a
Wrie and refactor guild tests
2015-06-10 23:39:46 -05:00
1bf38578bf
Merge branch 'develop' into hairlessbear-show_group_leader
2015-06-10 17:51:45 -05:00
c2614c0447
Moved if statement to assign task completion before saving task to user
2015-06-09 18:48:03 -05:00
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
5612b4be6b
Only send "Quest Started" Notifications to users which accepted the quest
2015-06-02 20:02:14 +02:00
264a1e4b16
FIX: Quest Invitation Notification
...
ADD: Quest Started Notification
2015-06-02 17:40:19 +02:00
c1501db292
Refactor chat related things into own service
2015-05-30 12:08:32 -05:00
726a8f1acb
feat(analytics): Mixpanel implementation WIP
2015-05-29 16:22:35 -05:00
a0f3e02f74
Set party.quest.key to null on quest reject and quest cancel
2015-05-27 11:52:53 -04:00
cc3d63b858
Fixed rewards on quest invite modal
2015-05-27 10:05:03 -04:00
cfcfb8fd02
Changed invite to RSVPNeeded
2015-05-27 09:18:44 -04:00
0fa93506f5
Made quest invite modal pop-up on user sync (rewards display currently nonfunctional)
2015-05-26 23:01:29 -04:00
30ef563534
Merge branch 'negue-anonymizedUser' into develop
2015-05-24 22:04:18 -05:00
abbfdaeda5
Adjust NotGonnaGitUs's PR
...
* move challenge test to separate file
* adjust wording of popover text
* prevent refunding gems for tavern challenges
* adjust ui of challenge creation page
* fix bug in cancel function
* adjust wording of delete confirmation message
2015-05-24 21:22:40 -05:00
120872ffd2
Merge in develop
2015-05-24 15:46:57 -05:00
4e8918818a
fix(pushNotifications): user null check
...
#5252
2015-05-21 23:24:10 +02:00
bd76b762e6
Merge pull request #5212 from HabitRPG/negue-WIP-Push-notifications
...
Negue wip push notifications
2015-05-18 11:14:53 -05:00
d7ce151500
Add translatable strings
2015-05-14 21:56:16 -05:00
023458b6e5
Add test for getting push notification when gifted a subscription
2015-05-13 19:31:26 -05:00
3cbd5fd9ff
Merge branch 'develop' into negue-WIP-Push-notifications
2015-05-13 19:11:57 -05:00
05f6e5e14d
fix(flags): correctly send flag reports emails
2015-05-13 20:08:46 +02:00
4050e9ad0c
Fix guilds not loading ＼(^ω^＼)
2015-05-12 22:28:06 -05:00
8a4abc632f
Refactor push notifications test; Prevent push notification from being sent when buying gems for yourself as a gift
2015-05-12 20:18:06 -05:00
9a84503aed
Merge branch 'develop' into negue-WIP-Push-notifications
2015-05-12 19:06:34 -05:00
ff41a2c240
Refactor group tests
2015-05-12 08:08:55 -05:00
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
ae8b170446
fix(emails): remove base url from server
2015-05-11 20:44:52 +02:00
6d025330e9
Clean up spaces; remove console log
2015-05-10 16:48:48 -05:00
95a90723c8
Merge branch 'develop' into negue-WIP-Push-notifications
2015-05-10 16:27:58 -05:00
8badc7d1a9
Add coupon api tests
2015-05-10 14:54:45 -05:00
2bc13ea69a
delete newMessages
2015-05-10 21:26:55 +02:00
90edb7719f
Merge branch 'develop' into pushNotifications2
2015-05-08 23:21:18 +02:00
f402e21a5c
delete more properties
2015-05-08 19:58:54 +02:00
1f674aab41
/user/anonymized - return user json without personal data
2015-05-08 18:52:29 +02:00
30546ccf12
remove extraneous comment
2015-05-07 17:51:51 -05:00
9884ed71f8
Merge branch 'develop' into TheHollidayInn-join-button-fix
2015-05-07 17:50:57 -05:00
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
cb9738251f
Add isUserInvited to if statement
2015-05-07 13:26:22 -05:00
Blade Barringer