 Blade Barringer
|
4050e9ad0c
|
Fix guilds not loading ＼(^ω^＼)
|
2015-05-12 22:28:06 -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 |
|
|
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 |
|
|
Blade Barringer
|
730ac4b3df
|
correct chat api tests; prevent sending a blank message via the api
|
2015-04-10 18:27:58 -05:00 |
|
|
Blade Barringer
|
426960c590
|
Merge branch 'develop' into Horacious-APIv2
|
2015-04-10 07:33:26 -05:00 |
|
|
Matteo Pagliazzi
|
f12f2b201a
|
typos
|
2015-04-07 16:07:52 +02:00 |
|
|
Matteo Pagliazzi
|
16e67ab7d4
|
put password resets back to email server, check for non registered users unsubscriptions
|
2015-04-07 14:04:03 +02:00 |
|
|
Alys
|
e9baafcbc8
|
Revert "Added Conditional Semantics to group member query to always include the user."
|
2015-03-26 19:54:51 +10:00 |
|
|
Alys
|
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 |
|
|
Matteo Pagliazzi
|
488cd8852b
|
move invites to quest to batch mode
|
2015-03-25 18:11:21 +01:00 |
|
|
Matteo Pagliazzi
|
ab0c5106a1
|
move quest-started email to batch mode
|
2015-03-25 17:52:15 +01:00 |
|
|
kholliday
|
23e7a8e258
|
Added check for user object to prevent errors
|
2015-03-24 08:54:45 -05:00 |
|
|
kholliday
|
1a725c0515
|
Added Conditional Semantics to group member query to always include the user
|
2015-03-23 15:17:21 -05:00 |
|
|
Matteo Pagliazzi
|
9e540e86af
|
add email with optional message when kicking user from group
|
2015-03-18 19:12:53 +01:00 |
|
|
Horacious
|
ef6445d6ec
|
Blocks API from POSTing empty msgs to group chat
Returns 204 on empty or undefined message
|
2015-03-17 21:36:44 -04:00 |
|
|
Blade Barringer
|
1629ca037b
|
Did the _.isMember stuff the right way
|
2015-02-25 15:28:14 -06:00 |
|
|
Matteo Pagliazzi
|
38af7ff3c1
|
emails: add optional reply_to_address variable
|
2015-02-18 19:31:02 +01:00 |
|
|
Blade Barringer
|
8ac9dc3ced
|
Merge branch 'develop' into common-convert
|
2015-02-10 16:27:46 -06:00 |
|
|
Blade Barringer
|
17032a4f13
|
Reverted changes back into website/src
|
2015-02-10 16:06:32 -06:00 |
|
|
Blade Barringer
|
bf4f2299e2
|
Moved src to website/src (again)
|
2015-02-10 16:04:17 -06:00 |
|
|
Blade Barringer
|
e243887563
|
Deleted website/src
|
2015-02-10 16:03:11 -06:00 |
|
|
Blade Barringer
|
75c9b5a978
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
src/controllers/groups.js
src/controllers/payments/index.js
src/controllers/user.js
src/models/user.js
|
2015-02-09 22:21:27 -06:00 |
|
|
Blade Barringer
|
cc767efa20
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
src/controllers/auth.js
src/controllers/challenges.js
src/controllers/groups.js
src/controllers/members.js
src/controllers/payments/index.js
src/controllers/user.js
src/middleware.js
src/models/user.js
|
2015-02-03 21:13:55 -06:00 |
|
|
Blade Barringer
|
220942fb9d
|
Corrected path to common files
|
2015-02-03 14:17:21 -06:00 |
|
|
Blade Barringer
|
8a8ce8d80d
|
Moved folders to website directory
|
2015-02-03 14:10:55 -06:00 |
|