 Riley Davis
|
bc1fc15572
|
Merge branch 'master' into banned-optimize-bug
|
2017-03-08 09:34:55 -07:00 |
|
|
Riley Davis
|
8c67acf609
|
Merge branch 'master' into mod-queue-load-more
|
2017-03-08 09:34:49 -07:00 |
|
|
Riley Davis
|
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 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 |
|
|
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 Davis
|
d66dcd8548
|
Merge branch 'master' into mod-queue-load-more
|
2017-03-07 12:33:04 -07: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 |
|
|
David Jay
|
95aa89faed
|
Switching premod status update to updateQueries function.
|
2017-03-07 14:16:44 -05:00 |
|
|
Riley Davis
|
87ef7ffb67
|
Merge branch 'master' into reply-box-focus
|
2017-03-07 11:54:55 -07:00 |
|
|
Riley Davis
|
162091a6d0
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-07 11:44:10 -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
|
21003ca994
|
Merge branch 'master' into mod-queue-load-more
|
2017-03-07 11:29:59 -07: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 |
|
|
Gabriela Rodríguez Berón
|
0b280d0de2
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-07 19:12:45 +01: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 |
|
|
Riley Davis
|
d46795bbb7
|
Merge branch 'master' into mod-queue-load-more
|
2017-03-07 10:55:28 -07: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 |
|
|
David Jay
|
2a6236b618
|
Moving ModerationMenu to a stateless compenent.
|
2017-03-07 12:37:12 -05:00 |
|
|
gaba
|
f8bc1037d2
|
Adds the reason.
|
2017-03-07 18:36:27 +01:00 |
|
|
David Jay
|
54aa3bc8fa
|
Styling load more button.
|
2017-03-07 12:31:43 -05:00 |
|
|
Riley Davis
|
3a31ca8d38
|
blur the comment until it's ready
|
2017-03-07 10:06:03 -07:00 |
|
|
gaba
|
62423e620e
|
Remove edge on user.
|
2017-03-07 18:04:50 +01:00 |
|
|
David Jay
|
d5b46f219e
|
Adding load more button.
|
2017-03-07 11:54:44 -05:00 |
|
|
gaba
|
54354c3cc6
|
Translation.
|
2017-03-07 16:27:12 +01:00 |
|
|
gaba
|
564b8d8eaa
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-07 13:04:28 +01:00 |
|
|
gaba
|
d06a5d37f0
|
Moves to the loader and work on the user query to add pagination and action type.
|
2017-03-07 07:29:32 +01:00 |
|
|
Wyatt Johnson
|
d82f3d0f0d
|
Added initial recaptcha + RL support
|
2017-03-06 15:26:44 -07:00 |
|
|
Riley Davis
|
09556c9bef
|
indention
|
2017-03-06 14:06:32 -07:00 |
|