wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-03 02:48:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,162 Commits 10 Branches 125 Tags
367ec00a025e0851abe4bcad3cf2df56163f9964
Commit Graph

7162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jeff Nelson a394ba29b3 Update 02-02-advanced-configuration.md 
Change TALK_SMTP_EMAIL to TALK_SMTP_FROM_EMAIL
 2017-11-08 07:11:03 -05: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
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
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
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 Curcio e88445beac Merge branch 'master' into user-pending 2017-11-06 13:48:26 -03:00
Belen Curcio 33be7531a0 Merge branch 'master' of github.com:coralproject/talk 2017-11-06 12:58:15 -03:00
Devon Jue 2131638f48 undo reject comment on stream 2017-11-04 17:17:30 -07:00
Wyatt Johnson 7034003fd1 fixed changed package script 2017-11-02 17:55:31 -06:00
Wyatt Johnson b5bcbc4fc8 added username edit, tests 2017-11-02 17:54:56 -06:00
Wyatt Johnson 04e6f5b52d added prebuild 2017-11-02 17:23:09 -06:00
Wyatt Johnson 76a255fb7b initial pass at status support 2017-11-02 17:16:57 -06:00
Wyatt Johnson 1f3722edc1 Merge branch 'master' into user-status-refactor 2017-11-02 16:06:34 -06: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
Kim Gardner c0cb641df3 Merge branch 'master' into user-pending 2017-11-01 11:27:04 +00: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
Kiwi 7226c475e3 Merge branch 'master' into user-pending 2017-10-31 19:25:51 +01: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
Kim Gardner c4ad667788 Merge branch 'master' into user-pending 2017-10-31 16:03:07 +00:00