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
ab1b75b655
finalize unsubscription page
2015-04-07 14:04:03 +02:00
a7c789746a
fix error when signing up
2015-04-07 14:04:03 +02:00
71108ee935
feat(email): WIP start implementing unsubscription page and related features
2015-04-07 14:04:03 +02:00
7d735519ec
feat(email-unsubscription-page): create model to hold unsubscriptions
2015-04-07 14:04:03 +02:00
6cfdfc5225
Added group type to challenge API, link to guild/party on challenges
2015-04-06 02:44:43 -04:00
eef3e293e2
Populate group and challenge leader on challenge GET request
2015-04-06 02:18:29 -04:00
79fe0b53c5
Added _isMember to APIv2 challenges/:cid endpoint (requires user auth)
2015-04-06 02:18:29 -04:00
ec66bfb0cd
Specify which API routes need no authentication. Specify task types for full scoring route. For simple scoring, state that it's only Habits and explain that other tasks can use full scoring.
2015-04-03 21:24:48 +10:00
06ffd4db44
fix(i18n): when no lanaguage is passed in the request
2015-04-02 20:06:17 +02:00
f0e7f0464c
fix(seasonal): NO FLOWERS
...
We do not say the F word here. Strange things happen in Habitica when someone uses that word. We speak only of "the smelly things with the petals."
2015-04-01 23:07:36 -05:00
b6a4d65d8c
feat(seasonal): Shiny Seed
2015-04-01 22:36:07 -05:00
507c1dd69a
feat(i18n): add support for different chinese versions
2015-04-01 18:43:21 +02:00
7105bc195f
add all Changes of #4565
2015-03-27 18:35:32 +01:00
e46789c303
feat(analytics): track cron count
2015-03-26 17:11:33 -04:00
e9baafcbc8
Revert "Added Conditional Semantics to group member query to always include the user."
2015-03-26 19:54:51 +10:00
ecaa1d31ac
Merge pull request #4908 from TheHollidayInn/join-button-fix
...
Added Conditional Semantics to group member query to always include the user.
2015-03-26 18:53:01 +10:00
de972eebc0
change email priority
2015-03-25 21:24:09 +01:00
488cd8852b
move invites to quest to batch mode
2015-03-25 18:11:21 +01:00
ab0c5106a1
move quest-started email to batch mode
2015-03-25 17:52:15 +01:00
f470bcd1e1
add support for personal merge vars and move RECIPIENT_NAME to use them
2015-03-25 17:39:28 +01:00
560d51b2e2
feat(tour): esc force closes, but puts justin head in toolbar. clicking
...
justin head brings tour back.
2015-03-24 15:41:44 -06:00
23e7a8e258
Added check for user object to prevent errors
2015-03-24 08:54:45 -05:00
1a725c0515
Added Conditional Semantics to group member query to always include the user
2015-03-23 15:17:21 -05:00
Blade Barringer