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
89d1d63b24
Merge pull request #5198 from SabreCat/pet-skins
...
Pet Skins and Ears
2015-05-13 15:44:23 -05:00
05f6e5e14d
fix(flags): correctly send flag reports emails
2015-05-13 20:08:46 +02:00
29109051d7
feat(customize): Animal skins and ears
...
Implements a base-pet-themed set of avatar skins and head accessories, the latter of which has additional handling for the user to purchase them from the Avatar Customization page.
2015-05-13 11:19:08 -05: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
30fd8e26e6
revert last 2 commits
2015-05-11 17:02:36 +02:00
e966de7bf0
feat(emails): add field to keep track of weekly recap emails
2015-05-11 16:54:44 +02:00
fc1f6ba0b9
fix(emails): always use main site as base url
2015-05-11 15:43:35 +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
90edb7719f
Merge branch 'develop' into pushNotifications2
2015-05-08 23:21:18 +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
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
bcb7b75380
Fixed conditional and spacing
2015-05-05 20:13:53 -05:00
8a4b43905d
Added tests
2015-05-04 19:12:44 -05:00
0bd39120aa
Updated conditionals
2015-05-03 19:35:47 -05:00
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
65a0ecdd6a
Added query to always include user when populating group members
2015-05-03 19:35:46 -05:00
4085ed5b15
Comment commit to test travis-ci
2015-05-04 03:56:28 +05:30
c18fbb79ed
Separated the deletion of the challenge to its own function in the async.waterfall
2015-05-04 03:43:30 +05:30
46cb0240c3
Gems are now refunded to challenge leader on deletion. Needs better description in "broken" field.
2015-05-04 02:33:59 +05:30
e3570e609b
Fixes Issue #5103
...
Altered the error messages that are part of the login and forgotten password processes.
These messages now remind the the user that they may have created an account through facebook.
2015-05-01 13:01:29 +10:00
b23e901780
Merge branch 'develop' into pushNotifications2
2015-04-27 17:20:25 +02:00
37f7db3c4e
feat(emails): add support for weekly recap emails
2015-04-22 16:30:53 +02:00
b027e2c407
Corrected port and db to use
2015-04-13 17:22:24 -05:00
730ac4b3df
correct chat api tests; prevent sending a blank message via the api
2015-04-10 18:27:58 -05:00
426960c590
Merge branch 'develop' into Horacious-APIv2
2015-04-10 07:33:26 -05:00
fee002b289
feat(analytics): better events organization via category>label>action>value
2015-04-08 17:29:55 -06:00
804b7b20c7
fix email sending for non registered users
2015-04-08 19:07:36 +02:00
f12f2b201a
typos
2015-04-07 16:07:52 +02:00
d21fb41aef
when signing up, delete previous email preferences
2015-04-07 16:04:33 +02:00
b2ffbf4113
password resets back to nodemailer...
2015-04-07 15:53:26 +02:00
16e67ab7d4
put password resets back to email server, check for non registered users unsubscriptions
2015-04-07 14:04:03 +02:00
e6c1a72c39
use callback itself as context
2015-04-07 14:04:03 +02:00
9e95f9c17d
pass entire unsubscription url to email server
2015-04-07 14:04:03 +02:00
Blade Barringer