Commit Graph
7053 Commits
Author SHA1 Message Date
Chi Vinh Le 0b18bb06e7 More tests 2017-11-09 22:31:53 +01:00
Chi Vinh Le 9abb3d30da e2e fixes 2017-11-09 22:04:32 +01:00
Chi Vinh Le f0839c57df Change to allowed name 2017-11-09 21:52:08 +01:00
Chi Vinh Le b2929e9a83 Fail fast 2017-11-09 21:51:41 +01:00
Chi Vinh Le ca7b790962 Return this 2017-11-09 21:51:31 +01:00
Chi Vinh Le 42a477ae41 Fix firefox popup bug e2e 2017-11-09 21:51:03 +01:00
Chi Vinh Le 53461df287 Increase wait for iframe time 2017-11-09 19:30:22 +01:00
KiwiandGitHub 9b18a78ce0 Merge branch 'master' into user-status 2017-11-09 19:20:06 +01:00
Chi Vinh Le da35f39baf Set resolution 2017-11-09 19:19:47 +01:00
Chi Vinh Le e885178dfc Refactor 2 2017-11-09 19:03:01 +01: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
Chi Vinh Le 63b6315435 Refactor #1 2017-11-09 17:50:47 +01:00
Chi Vinh Le 55e4aed511 Merge branch 'master' into user-status 2017-11-09 15:53:42 +01: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
Belen Curcio 9a651880a2 Updated login 2017-11-08 14:00:01 -03:00
Belen Curcio 82e01eac00 Merge branch 'master' of github.com:coralproject/talk into user-status 2017-11-08 13:56:48 -03:00
Belen Curcio 5efdc9865f refacotr 2017-11-08 12:59:08 -03:00
Belen Curcio 62d01cf2a0 perform login 2017-11-08 12:31:33 -03:00
Belen Curcio 81bf63836a tests 2017-11-08 12:23:40 -03:00
Belen Curcio 54ac2985ba Adding classes 2017-11-08 12:23:29 -03:00
Belen Curcio e9bd5703f1 refactor 2017-11-08 11:49:32 -03:00
Belen Curcio a2470fa01b More 2017-11-07 16:43:58 -03:00
Belen Curcio 9b98e3cac9 missing classes 2017-11-07 15:20:14 -03:00
Belen Curcio 918ad915b8 Tests 2017-11-06 23:53:33 -03:00
Belen Curcio d51b6b31f6 Adding missing classes and proptypes 2017-11-06 23:53:19 -03: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