 David Jayandgaba
|
1fd74068cd
|
Merge branch 'master' into open-closed-stream-buttons
|
2017-03-20 07:27:18 -07: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
|
6a72f4d066
|
Merge pull request #397 from coralproject/long-titles
Adding fix for handling long titles in the Moderation Queue
|
2017-03-09 11:17:11 -05: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 |
|
|
riley
|
2cdf2bb332
|
add moderate button
|
2017-03-08 15:26:45 -07:00 |
|
|
Riley DavisandGitHub
|
f0b1460aa8
|
Merge pull request #399 from coralproject/mod-squad
update dashboard links
|
2017-03-08 15:01:00 -07: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 ErwinandGitHub
|
c467460580
|
Merge pull request #393 from coralproject/banned-optimize-bug
rejected comment optimize bug
|
2017-03-08 16:16:06 -05:00 |
|
|
Riley Davis
|
e4cdc73bf8
|
fix for react-mdn-selectfield in FF
|
2017-03-08 13:53:39 -07: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 |
|
|
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
|
8989f3bfc2
|
Merge pull request #389 from coralproject/keyboard-shortcuts
Keyboard shortcuts
|
2017-03-08 11:10:24 -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
|
bc1fc15572
|
Merge branch 'master' into banned-optimize-bug
|
2017-03-08 09:34:55 -07:00 |
|
|
Riley DavisandGitHub
|
68d64665a9
|
Merge branch 'master' into keyboard-shortcuts
|
2017-03-08 09:34:38 -07:00 |
|
|
Samantha HankinsandGitHub
|
9d2d878790
|
Merge branch 'master' into long-titles
|
2017-03-07 17:17:44 -05:00 |
|
|
Samantha HankinsandGitHub
|
02767cf060
|
Merge pull request #395 from coralproject/user-facing
User facing Styles Updates
|
2017-03-07 17:13:19 -05:00 |
|
|
Belen Curcio
|
cceeafadec
|
Indent
|
2017-03-07 16:53:42 -05:00 |
|
|
Belen Curcio
|
af4a69a677
|
Changing icon and link
|
2017-03-07 16:50:36 -05:00 |
|
|
Belen Curcio
|
f563bcf119
|
Adding fix for long text
|
2017-03-07 16:35:01 -05:00 |
|
|
Belen Curcio
|
d1119604e0
|
ícon styling for infobox
|
2017-03-07 15:59:05 -05:00 |
|
|
Riley Davis
|
e578f901b2
|
fix some firefox display things
|
2017-03-07 13:38:01 -07:00 |
|
|
Belen Curcio
|
eb06f3892d
|
changes
|
2017-03-07 15:27:43 -05:00 |
|
|
Belen Curcio
|
ee30f549a1
|
Lato all the things
|
2017-03-07 15:04:35 -05:00 |
|
|
Belen Curcio
|
dc96b550a6
|
Button should inherit font
|
2017-03-07 14:56:28 -05:00 |
|
|
riley
|
c1d6a4dc7e
|
Merged master into banned-optimize-bug
|
2017-03-07 12:31:42 -07:00 |
|
|
Riley DavisandGitHub
|
9d13eedede
|
Merge pull request #387 from coralproject/notification-warning
move notifications to parent
|
2017-03-07 12:30:02 -07:00 |
|
|
Riley DavisandGitHub
|
c4f2d876ee
|
Merge branch 'master' into notification-warning
|
2017-03-07 12:22:42 -07:00 |
|
|
David JayandGitHub
|
7e55ecab59
|
Merge pull request #388 from coralproject/reply-box-focus
Focusing on reply box when reply is clicked.
|
2017-03-07 14:19:37 -05:00 |
|
|
Riley DavisandGitHub
|
87ef7ffb67
|
Merge branch 'master' into reply-box-focus
|
2017-03-07 11:54:55 -07:00 |
|
|
Riley DavisandGitHub
|
162091a6d0
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-07 11:44:10 -07:00 |
|
|
David JayandGitHub
|
d0d0766ca6
|
Merge branch 'master' into notification-warning
|
2017-03-07 13:33:24 -05:00 |
|
|
David JayandGitHub
|
1e34ffd075
|
Merge branch 'master' into banned-optimize-bug
|
2017-03-07 13:31:12 -05:00 |
|
|
David JayandGitHub
|
2b947bebf8
|
Merge pull request #383 from coralproject/premod-links
Premod links
|
2017-03-07 13:30:20 -05:00 |
|
|
Riley DavisandGitHub
|
e15e4b004f
|
Merge branch 'master' into keyboard-shortcuts
|
2017-03-07 11:26:58 -07:00 |
|
|
Riley Davis
|
37dad96fee
|
Merge branch 'master'
Conflicts:
client/coral-admin/src/containers/Configure/StreamSettings.js
|
2017-03-07 11:23:22 -07:00 |
|
|
David Jay
|
78a2a64671
|
Not displaying premod or rejected comments.
|
2017-03-07 13:13:21 -05:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
0b280d0de2
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-07 19:12:45 +01:00 |
|
|
David JayandGitHub
|
3d4521ab1d
|
Merge pull request #384 from coralproject/global-info-bug
Guidelines info box has a word wrapping issue
|
2017-03-07 13:11:39 -05:00 |
|
|
David JayandGitHub
|
ae5d35273b
|
Merge branch 'master' into global-info-bug
|
2017-03-07 12:58:25 -05:00 |
|