 gaba
|
b2234bc3c9
|
Merge branch 'master'
Conflicts:
client/coral-admin/src/containers/Dashboard/Widget.css
|
2017-03-20 07:28:17 -07:00 |
|
|
Riley Davisandgaba
|
e0d3ad32e2
|
Merge branch 'master' into open-closed-stream-buttons
|
2017-03-20 07:27:20 -07:00 |
|
|
David Erwinandgaba
|
5f5d33931e
|
Merge branch 'master' into open-closed-stream-buttons
|
2017-03-20 07:27:19 -07:00 |
|
|
Riley Davisandgaba
|
b94401a8cf
|
make only the title clickable
|
2017-03-20 07:27:19 -07:00 |
|
|
David Jayandgaba
|
1fd74068cd
|
Merge branch 'master' into open-closed-stream-buttons
|
2017-03-20 07:27:18 -07:00 |
|
|
Riley Davisandgaba
|
90298436c6
|
Merge branch 'master' into widget-auto-update
|
2017-03-20 07:27:17 -07:00 |
|
|
David Jayandgaba
|
203776d07c
|
Merge branch 'mod-queue-load-more' of github.com:coralproject/talk into mod-queue-load-more
|
2017-03-20 07:27:16 -07:00 |
|
|
David Jayandgaba
|
a78648fc0d
|
Merge branch 'master' into mod-queue-load-more
|
2017-03-20 07:27:15 -07:00 |
|
|
Belén Curcioandgaba
|
6d43969e3b
|
Merge branch 'master' into autoreject-on-ban
|
2017-03-20 07:27:14 -07:00 |
|
|
Riley Davisandgaba
|
aec0f678c0
|
Merge branch 'master' into autoreject-on-ban
|
2017-03-20 07:27:13 -07:00 |
|
|
gaba
|
ff71908a10
|
Merge branch 'master' into mod-queue-load-more
|
2017-03-20 07:26:00 -07:00 |
|
|
David Erwinandgaba
|
a430ca65c2
|
Merge branch 'master' into widget-auto-update
|
2017-03-20 07:24:17 -07:00 |
|
|
David Erwinandgaba
|
ede6c44c93
|
Merge branch 'master' into flag-username-reset
|
2017-03-20 07:24:15 -07:00 |
|
|
David Erwinandgaba
|
8b0f01f2aa
|
Merge pull request #394 from coralproject/bugfix-mod-queue-refresh
Preventing admin panel refresh on accept and reject
|
2017-03-20 07:24:14 -07:00 |
|
|
Riley Davisandgaba
|
065ccfbfc4
|
Merge branch 'master' into flag-username-reset
|
2017-03-20 07:24:13 -07:00 |
|
|
David Jay
|
a0953c0689
|
Adding proptypes to loadmore component.
|
2017-03-09 13:33:00 -05:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
491694b9c1
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-09 17:20:00 +01:00 |
|
|
Belén CurcioandGitHub
|
9bfc7d2037
|
Merge branch 'master' into long-titles
|
2017-03-09 11:05:08 -05:00 |
|
|
Belen Curcio
|
438877d58f
|
Merge branch 'long-titles' of github.com:coralproject/talk into long-titles
|
2017-03-09 11:03:37 -05:00 |
|
|
Belen Curcio
|
ce7a2d54d0
|
Font Size
|
2017-03-09 10:59:28 -05:00 |
|
|
David JayandGitHub
|
9b53930861
|
Merge branch 'master' into flag-username-reset
|
2017-03-08 17:49:59 -05:00 |
|
|
riley
|
2cdf2bb332
|
add moderate button
|
2017-03-08 15:26:45 -07:00 |
|
|
David JayandGitHub
|
a8d090d5a2
|
Merge branch 'master' into autoreject-on-ban
|
2017-03-08 17:07:26 -05:00 |
|
|
Riley Davis
|
7b5721e0c6
|
Merged branch open-closed-stream-buttons into open-closed-stream-buttons
|
2017-03-08 15:00:09 -07:00 |
|
|
Riley Davis
|
b34758e8cc
|
unused vars
|
2017-03-08 14:59:55 -07:00 |
|
|
Riley DavisandGitHub
|
ee84b821fc
|
Merge branch 'master' into mod-squad
|
2017-03-08 14:57:19 -07:00 |
|
|
Riley DavisandGitHub
|
c9e5b91b18
|
Merge branch 'master' into open-closed-stream-buttons
|
2017-03-08 14:53:24 -07:00 |
|
|
Riley Davis
|
eaf035acd6
|
simplify dashboard table rendering
|
2017-03-08 14:53:07 -07:00 |
|
|
David Jay
|
fac3d26c22
|
Closing ban dialog after ban is complete.
|
2017-03-08 16:39:53 -05:00 |
|
|
David Jay
|
d203a9afe0
|
Auto-rejecting comments on ban.
|
2017-03-08 16:06:34 -05:00 |
|
|
Riley Davis
|
e4cdc73bf8
|
fix for react-mdn-selectfield in FF
|
2017-03-08 13:53:39 -07:00 |
|
|
David Jay
|
3262d136b7
|
Resetting report menu on close.
|
2017-03-08 15:44:19 -05:00 |
|
|
David JayandGitHub
|
3c28f68d0a
|
Merge branch 'master' into mod-squad
|
2017-03-08 15:32:48 -05:00 |
|
|
David JayandGitHub
|
a13e0205de
|
Merge branch 'master' into open-closed-stream-buttons
|
2017-03-08 15:22:08 -05:00 |
|
|
David JayandGitHub
|
be3212e144
|
Merge branch 'master' into banned-optimize-bug
|
2017-03-08 15:05:12 -05:00 |
|
|
David JayandGitHub
|
510ee2c28e
|
Merge branch 'master' into bugfix-mod-queue-refresh
|
2017-03-08 15:04:45 -05:00 |
|
|
David JayandGitHub
|
3861d14a07
|
Merge branch 'master' into mod-queue-load-more
|
2017-03-08 15:04:24 -05:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
dae2e7d9d6
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-08 20:09:50 +01:00 |
|
|
gaba
|
69916a6ef2
|
I could not figure out how to send the parameter to the graphql query through the client.
|
2017-03-08 19:39:28 +01:00 |
|
|
Riley DavisandGitHub
|
4d69ecc425
|
Merge branch 'master' into widget-auto-update
|
2017-03-08 11:12:53 -07:00 |
|
|
Riley Davis
|
ec634fa3c0
|
add translations
|
2017-03-08 11:12:44 -07:00 |
|
|
David Jay
|
15193e97a8
|
Preventing keys from scrolling past the end of the comment queue.
|
2017-03-08 13:01:37 -05:00 |
|
|
Riley Davis
|
0863ca26ff
|
update dashboard links
|
2017-03-08 09:56:36 -07:00 |
|
|
Riley DavisandGitHub
|
097fc30ac9
|
Merge branch 'master' into bugfix-mod-queue-refresh
|
2017-03-08 09:35:05 -07:00 |
|
|
Riley DavisandGitHub
|
bc1fc15572
|
Merge branch 'master' into banned-optimize-bug
|
2017-03-08 09:34:55 -07:00 |
|
|
Riley DavisandGitHub
|
8c67acf609
|
Merge branch 'master' into mod-queue-load-more
|
2017-03-08 09:34:49 -07:00 |
|
|
Riley DavisandGitHub
|
68d64665a9
|
Merge branch 'master' into keyboard-shortcuts
|
2017-03-08 09:34:38 -07:00 |
|
|
Riley Davis
|
47f6f4cb6c
|
styles and auto-update Dashboard
|
2017-03-07 16:51:22 -07:00 |
|
|
Samantha HankinsandGitHub
|
9d2d878790
|
Merge branch 'master' into long-titles
|
2017-03-07 17:17:44 -05:00 |
|
|
Belen Curcio
|
cceeafadec
|
Indent
|
2017-03-07 16:53:42 -05:00 |
|