 Wyatt Johnson
|
401d8a423d
|
added emails for status changes
|
2017-11-09 16:07:46 -07:00 |
|
|
Wyatt Johnson
|
d80401a49b
|
Merge branch 'next' into user-status-refactor
|
2017-11-09 14:59:47 -07:00 |
|
|
Wyatt Johnson
|
cb768d3190
|
Merge branch 'master' into next
|
2017-11-09 14:59:32 -07:00 |
|
|
Kim Gardner
|
44d6ad340d
|
Merge pull request #1156 from coralproject/queue-fix
Queue fix for custom assets
|
2017-11-09 17:09:25 +00:00 |
|
|
Wyatt Johnson
|
77c927ac59
|
added migration, migration tests 🎉
|
2017-11-08 16:35:38 -07:00 |
|
|
Wyatt Johnson
|
18f5b0cc5e
|
queue fix for sometimes null settings
|
2017-11-08 14:24:48 -07:00 |
|
|
Wyatt Johnson
|
0257e09a40
|
Merge branch 'next' into user-status-refactor
|
2017-11-08 13:52:48 -07:00 |
|
|
Wyatt Johnson
|
61df0e1eeb
|
Merge branch 'master' into next
|
2017-11-08 13:49:21 -07:00 |
|
|
Wyatt Johnson
|
1b7f78b562
|
user queries
|
2017-11-08 13:40:46 -07:00 |
|
|
Kiwi
|
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 |
|
|
Wyatt Johnson
|
9e84c72148
|
added more mutations
|
2017-11-08 09:41:38 -07:00 |
|
|
Belén Curcio
|
e88445beac
|
Merge branch 'master' into user-pending
|
2017-11-06 13:48:26 -03: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 |
|
|
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 |
|