 Kim GardnerandGitHub
|
4373c382e1
|
Merge pull request #1151 from coralproject/feature/fix-email-config-docs
Fix incorrect email configuration in docs
|
2017-11-10 12:02:22 +00:00 |
|
|
Kim GardnerandGitHub
|
af6787bc0f
|
Merge branch 'master' into feature/fix-email-config-docs
|
2017-11-10 11:37:15 +00:00 |
|
|
KiwiandGitHub
|
19b8d0a6ea
|
Merge pull request #1150 from coralproject/e2e-v2
e2e v2
|
2017-11-10 10:08:27 +01:00 |
|
|
Wyatt JohnsonandGitHub
|
0da0b1a37e
|
Merge branch 'master' into feature/fix-email-config-docs
|
2017-11-09 16:23:24 -07:00 |
|
|
Kim GardnerandGitHub
|
24e8aab0fe
|
Merge branch 'master' into e2e-v2
|
2017-11-09 17:09:56 +00:00 |
|
|
Kim GardnerandGitHub
|
44d6ad340d
|
Merge pull request #1156 from coralproject/queue-fix
Queue fix for custom assets
|
2017-11-09 17:09:25 +00:00 |
|
|
KiwiandGitHub
|
95ca43ff8c
|
Merge branch 'master' into e2e-v2
|
2017-11-09 16:23:20 +01:00 |
|
|
Kim Gardner
|
247e05383e
|
One more fix
|
2017-11-09 11:23:48 +00:00 |
|
|
Kim Gardner
|
3988fb9e93
|
Merge branch 'feature/fix-email-config-docs' of git+ssh://github.com/coralproject/talk into feature/fix-email-config-docs
|
2017-11-09 11:20:07 +00:00 |
|
|
Kim GardnerandGitHub
|
7d524efaad
|
Merge branch 'master' into feature/fix-email-config-docs
|
2017-11-09 11:19:57 +00:00 |
|
|
Kim Gardner
|
d7a88cdc2a
|
Fix config key
|
2017-11-09 11:18:58 +00:00 |
|
|
Wyatt Johnson
|
18f5b0cc5e
|
queue fix for sometimes null settings
|
2017-11-08 14:24:48 -07:00 |
|
|
KiwiandGitHub
|
2df18f07cb
|
Merge pull request #1140 from coralproject/user-pending
Users with PENDING status should not be allowed to post & E2E for User Status
|
2017-11-08 19:27:41 +01:00 |
|
|
Chi Vinh Le
|
786e85686d
|
Fix invalid regexp for ie
|
2017-11-08 18:57:06 +01:00 |
|
|
Jeff NelsonandGitHub
|
a394ba29b3
|
Update 02-02-advanced-configuration.md
Change TALK_SMTP_EMAIL to TALK_SMTP_FROM_EMAIL
|
2017-11-08 07:11:03 -05:00 |
|
|
Chi Vinh Le
|
4f89c1e1c3
|
Add some comments and description
|
2017-11-07 17:50:56 +01:00 |
|
|
Chi Vinh Le
|
c3e551deb5
|
Disable bs for branches
|
2017-11-07 17:48:12 +01:00 |
|
|
Chi Vinh Le
|
0678ea0344
|
Small tweak
|
2017-11-07 17:07:50 +01:00 |
|
|
Chi Vinh Le
|
b09b56bd24
|
Temporarily enable browserstack
|
2017-11-07 16:52:27 +01:00 |
|
|
Chi Vinh Le
|
2a0f70f084
|
Clean DB before serve
|
2017-11-07 16:42:37 +01:00 |
|
|
KiwiandGitHub
|
bf2e11ef9a
|
Merge branch 'master' into e2e-v2
|
2017-11-07 16:29:51 +01:00 |
|
|
Chi Vinh Le
|
0fc810a7b1
|
e2e v2
|
2017-11-07 16:21:09 +01:00 |
|
|
Belén CurcioandGitHub
|
e88445beac
|
Merge branch 'master' into user-pending
|
2017-11-06 13:48:26 -03:00 |
|
|
Kim GardnerandGitHub
|
39a980b22f
|
Merge pull request #1146 from coralproject/isStaff
Use isStaff instead
|
2017-11-01 17:38:37 +00:00 |
|
|
Chi Vinh Le
|
ce0b63fe75
|
Use isStaff instead
|
2017-11-01 13:29:04 +01:00 |
|
|
Kim GardnerandGitHub
|
c0cb641df3
|
Merge branch 'master' into user-pending
|
2017-11-01 11:27:04 +00:00 |
|
|
KiwiandGitHub
|
cee68ae471
|
Merge pull request #1142 from PepeFranco/reportedComments
Reported comments
|
2017-11-01 12:17:25 +01:00 |
|
|
KiwiandGitHub
|
33cd783b37
|
Merge branch 'master' into reportedComments
|
2017-11-01 12:10:39 +01:00 |
|
|
KiwiandGitHub
|
82ef16a4ee
|
Merge pull request #1144 from blackcathacker/queue_shortcuts
add numbered shortcuts for mod queue
|
2017-11-01 12:10:17 +01:00 |
|
|
KiwiandGitHub
|
736ab6066f
|
Merge branch 'master' into reportedComments
|
2017-11-01 12:06:34 +01:00 |
|
|
KiwiandGitHub
|
3327604a58
|
Merge branch 'master' into queue_shortcuts
|
2017-11-01 12:04:03 +01:00 |
|
|
KiwiandGitHub
|
0c3cfd21a9
|
Merge pull request #1143 from blackcathacker/staff_badge
show staff instead of user badge when reported by staff
|
2017-11-01 11:59:56 +01:00 |
|
|
blackcathacker
|
903e70d641
|
updates per review
|
2017-10-31 17:10:25 -07:00 |
|
|
blackcathacker
|
21f6caa942
|
cleaner method chain per review
|
2017-10-31 16:50:35 -07:00 |
|
|
PepeFranco
|
f70ccf641a
|
Fixed lint issue
|
2017-10-31 13:29:44 -06:00 |
|
|
PepeFranco
|
dd4e3d7ec8
|
Merge branch 'reportedComments' of https://github.com/PepeFranco/talk into reportedComments
|
2017-10-31 13:00:05 -06:00 |
|
|
PepeFranco
|
886a468993
|
Reverting comment changes
|
2017-10-31 12:56:32 -06:00 |
|
|
PepeFranco
|
de0dad6243
|
Merge branch 'master' of https://github.com/coralproject/talk into reportedComments
Updating
|
2017-10-31 12:49:44 -06:00 |
|
|
KiwiandGitHub
|
7226c475e3
|
Merge branch 'master' into user-pending
|
2017-10-31 19:25:51 +01:00 |
|
|
Kim GardnerandGitHub
|
173c9262d1
|
Merge branch 'master' into queue_shortcuts
|
2017-10-31 17:18:59 +00:00 |
|
|
Kim GardnerandGitHub
|
5e7ee344ec
|
Merge branch 'master' into staff_badge
|
2017-10-31 17:18:54 +00:00 |
|
|
Kim GardnerandGitHub
|
b2d0c58a72
|
Merge branch 'master' into reportedComments
|
2017-10-31 17:12:02 +00:00 |
|
|
KiwiandGitHub
|
b34b033a18
|
Merge pull request #1139 from coralproject/bs-stabilize
Stabilize browserstack tests
|
2017-10-31 17:47:50 +01:00 |
|
|
Chi Vinh Le
|
4195d8b419
|
Merge branch 'bs-stabilize' of ssh://github.com/coralproject/talk into bs-stabilize
|
2017-10-31 17:34:59 +01:00 |
|
|
Chi Vinh Le
|
bfb2da519f
|
Exit code can be negative
|
2017-10-31 17:34:28 +01:00 |
|
|
Chi Vinh Le
|
8821c0aa5c
|
Typos
|
2017-10-31 17:33:44 +01:00 |
|
|
KiwiandGitHub
|
a56031ac47
|
Merge branch 'master' into bs-stabilize
|
2017-10-31 17:13:25 +01:00 |
|
|
Wyatt JohnsonandGitHub
|
a3eeec34df
|
Merge pull request #1137 from blackcathacker/premod_setting
Send user an email when they are banned #1050
|
2017-10-31 10:06:00 -06:00 |
|
|
Kim GardnerandGitHub
|
c4ad667788
|
Merge branch 'master' into user-pending
|
2017-10-31 16:03:07 +00:00 |
|
|
Wyatt JohnsonandGitHub
|
d20666adb9
|
Update users.js
Prefix added by mailer service
|
2017-10-31 10:00:47 -06:00 |
|