 Belén Curcio
|
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 Davis
|
f0b1460aa8
|
Merge pull request #399 from coralproject/mod-squad
update dashboard links
|
2017-03-08 15:01:00 -07:00 |
|
|
Riley Davis
|
ee84b821fc
|
Merge branch 'master' into mod-squad
|
2017-03-08 14:57:19 -07:00 |
|
|
David Erwin
|
c467460580
|
Merge pull request #393 from coralproject/banned-optimize-bug
rejected comment optimize bug
|
2017-03-08 16:16:06 -05:00 |
|
|
David Jay
|
3c28f68d0a
|
Merge branch 'master' into mod-squad
|
2017-03-08 15:32:48 -05:00 |
|
|
David Jay
|
be3212e144
|
Merge branch 'master' into banned-optimize-bug
|
2017-03-08 15:05:12 -05:00 |
|
|
Riley Davis
|
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 Davis
|
bc1fc15572
|
Merge branch 'master' into banned-optimize-bug
|
2017-03-08 09:34:55 -07:00 |
|
|
Riley Davis
|
68d64665a9
|
Merge branch 'master' into keyboard-shortcuts
|
2017-03-08 09:34:38 -07:00 |
|
|
Samantha Hankins
|
9d2d878790
|
Merge branch 'master' into long-titles
|
2017-03-07 17:17:44 -05:00 |
|
|
Samantha Hankins
|
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 |
|
|
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 Davis
|
9d13eedede
|
Merge pull request #387 from coralproject/notification-warning
move notifications to parent
|
2017-03-07 12:30:02 -07:00 |
|
|
Riley Davis
|
c4f2d876ee
|
Merge branch 'master' into notification-warning
|
2017-03-07 12:22:42 -07:00 |
|
|
David Jay
|
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 Davis
|
87ef7ffb67
|
Merge branch 'master' into reply-box-focus
|
2017-03-07 11:54:55 -07:00 |
|
|
David Jay
|
d0d0766ca6
|
Merge branch 'master' into notification-warning
|
2017-03-07 13:33:24 -05:00 |
|
|
David Jay
|
1e34ffd075
|
Merge branch 'master' into banned-optimize-bug
|
2017-03-07 13:31:12 -05:00 |
|
|
David Jay
|
2b947bebf8
|
Merge pull request #383 from coralproject/premod-links
Premod links
|
2017-03-07 13:30:20 -05:00 |
|
|
Riley Davis
|
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 |
|
|
David Jay
|
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 Jay
|
ae5d35273b
|
Merge branch 'master' into global-info-bug
|
2017-03-07 12:58:25 -05:00 |
|
|
David Jay
|
9bf1246d3a
|
Merge pull request #386 from coralproject/configure-bugs
Configure Styles and UX Polish
|
2017-03-07 12:58:02 -05:00 |
|
|
Riley Davis
|
978bf05128
|
Merge branch 'master' into premod-links
|
2017-03-07 10:57:05 -07:00 |
|
|
David Jay
|
7379924e21
|
Merge branch 'master' into global-info-bug
|
2017-03-07 12:56:19 -05:00 |
|
|
David Jay
|
bf1d46d60d
|
Merge branch 'master' into configure-bugs
|
2017-03-07 12:52:57 -05:00 |
|
|
David Jay
|
2c8678f9e1
|
Merge pull request #391 from coralproject/favicon
Favicon Support
|
2017-03-07 12:52:28 -05:00 |
|
|
Riley Davis
|
5e4c251e83
|
style the pending comment correctly
|
2017-03-07 10:47:51 -07:00 |
|
|
Riley Davis
|
3a31ca8d38
|
blur the comment until it's ready
|
2017-03-07 10:06:03 -07:00 |
|
|
Riley Davis
|
09556c9bef
|
indention
|
2017-03-06 14:06:32 -07:00 |
|
|
Belen Curcio
|
d0e67592c0
|
Adding favicon :)
|
2017-03-06 16:05:56 -05:00 |
|
|
Riley Davis
|
d9d086c61e
|
remove a banned comment after it's confirmed as rejected
|
2017-03-06 13:53:56 -07:00 |
|
|
Riley Davis
|
832f3c8abc
|
Merge branch 'master' into configure-bugs
|
2017-03-06 13:52:54 -07:00 |
|
|
Riley Davis
|
aca2af44e2
|
Merge branch 'master' into notification-warning
|
2017-03-06 13:51:25 -07:00 |
|
|
Riley Davis
|
b7fe4c6802
|
Merge pull request #390 from coralproject/password-reset-view-fix
Fix password reset view render path
|
2017-03-06 13:21:37 -07:00 |
|
|
Wyatt Johnson
|
1c81d0a04f
|
Update index.js
|
2017-03-06 13:00:22 -07:00 |
|
|
David Jay
|
450f1fdbac
|
Focusing on reply box when reply is clicked.
|
2017-03-06 13:25:01 -05:00 |
|