Commit Graph

7021 Commits

Author SHA1 Message Date
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
Kiwi 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
Kim Gardner 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
Kiwi cee68ae471 Merge pull request #1142 from PepeFranco/reportedComments
Reported comments
2017-11-01 12:17:25 +01:00
Kiwi 33cd783b37 Merge branch 'master' into reportedComments 2017-11-01 12:10:39 +01:00
Kiwi 82ef16a4ee Merge pull request #1144 from blackcathacker/queue_shortcuts
add numbered shortcuts for mod queue
2017-11-01 12:10:17 +01:00
Kiwi 736ab6066f Merge branch 'master' into reportedComments 2017-11-01 12:06:34 +01:00
Kiwi 3327604a58 Merge branch 'master' into queue_shortcuts 2017-11-01 12:04:03 +01:00
Kiwi 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
Kim Gardner 173c9262d1 Merge branch 'master' into queue_shortcuts 2017-10-31 17:18:59 +00:00
Kim Gardner 5e7ee344ec Merge branch 'master' into staff_badge 2017-10-31 17:18:54 +00:00
Kim Gardner b2d0c58a72 Merge branch 'master' into reportedComments 2017-10-31 17:12:02 +00:00
Kiwi 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
Kiwi a56031ac47 Merge branch 'master' into bs-stabilize 2017-10-31 17:13:25 +01:00
Wyatt Johnson 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
Wyatt Johnson d20666adb9 Update users.js
Prefix added by mailer service
2017-10-31 10:00:47 -06:00
Chi Vinh Le 96b44b2b99 Prefix env variables 2017-10-31 16:39:41 +01:00
Wyatt Johnson b92b4027b0 Merge branch 'master' into premod_setting 2017-10-31 09:32:43 -06:00
Jose Franco f1423abdea Merge branch 'master' into reportedComments 2017-10-31 09:31:32 -06:00
Chi Vinh Le c31e6347d0 Sleep between retries 2017-10-31 16:29:32 +01:00
Chi Vinh Le 48179b413c Merge branch 'bs-stabilize' of ssh://github.com/coralproject/talk into bs-stabilize 2017-10-31 16:25:24 +01:00
Kiwi c955fcd29e Merge branch 'master' into bs-stabilize 2017-10-31 16:25:18 +01:00
Kim Gardner 457322e3d0 Merge pull request #1145 from coralproject/readme-updates
Readme updates
2017-10-31 14:40:53 +00:00
Kim Gardner 9ba8cbcbe1 Fix logo link 2017-10-31 14:30:32 +00:00
Kim Gardner 93363a0650 Remove indenting 2017-10-31 14:27:38 +00:00
Chi Vinh Le 7f442ce91e Let MAX_RETRIES be customizable 2017-10-31 14:58:40 +01:00
Chi Vinh Le 42f0d76d98 Add retry number to console outpu 2017-10-31 14:58:25 +01:00
Chi Vinh Le 1578316363 Retry browsers when failed, print summary 2017-10-31 14:25:58 +01:00
Kim Gardner 5c033dbfdf Tweaks 2017-10-31 11:40:33 +00:00
Kim Gardner 3cdf2a3118 Formatting 2017-10-31 11:31:13 +00:00
Kim Gardner 4e5e989d22 Update one-click directions 2017-10-31 11:25:22 +00:00
Kim Gardner 62660ed144 Fix header 2017-10-31 11:18:24 +00:00
Kim Gardner 2d44f7abf4 Spruce up README 2017-10-31 11:12:14 +00:00
Kim Gardner ea98f0275d Merge branch 'master' into premod_setting 2017-10-31 10:35:44 +00:00
blackcathacker 07e6c15c3a add numbered shortcuts for mod queue 2017-10-30 23:08:33 -07:00
blackcathacker 05e91129f4 show staff instead of user badge when reported by staff 2017-10-30 22:16:59 -07:00
PepeFranco 350e679abf Added check for user & comments 2017-10-30 16:58:51 -06:00