 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 |
|
|
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 |
|
|
Riley Davis
|
5cb7172bbe
|
Merge branch 'master'
Conflicts:
client/coral-embed-stream/src/Embed.js
|
2017-03-06 11:01:37 -07:00 |
|
|
Riley Davis
|
000833509f
|
remove notification reducer. have parent show notifications
|
2017-03-06 10:59:12 -07:00 |
|
|
Belen Curcio
|
e80d6e7b0a
|
Configure UX Style Polish!
|
2017-03-06 12:12:26 -05:00 |
|
|
David Jay
|
77386fb21d
|
Merge pull request #385 from coralproject/version-endpoint-fix
Moved to correct route
|
2017-03-06 12:04:19 -05:00 |
|
|
Wyatt Johnson
|
56350ffe1a
|
Moved to correct route
|
2017-03-06 09:58:21 -07:00 |
|
|
Belen Curcio
|
6cd75b57dc
|
border box
|
2017-03-03 16:18:58 -05:00 |
|
|
David Jay
|
3280ed9ae5
|
Merge branch 'master' into premod-links
|
2017-03-03 16:17:40 -05:00 |
|
|
Belen Curcio
|
ec4fc566c1
|
props
|
2017-03-03 16:15:30 -05:00 |
|
|
David Jay
|
be8332da66
|
Switching link action from flag to premod.
|
2017-03-03 16:12:53 -05:00 |
|
|
David Jay
|
b9488dc36c
|
Updating moderation.
|
2017-03-03 16:09:34 -05:00 |
|
|
David Jay
|
b912b60428
|
Removing unecessary log statement.
|
2017-03-03 16:01:53 -05:00 |
|
|
Belen Curcio
|
1f0d102115
|
new components!! textarea stuff and configure bugs
|
2017-03-03 15:53:53 -05:00 |
|
|
David Jay
|
2e5d453ea7
|
Updating link search and adding settings in admin panel.
|
2017-03-03 15:44:03 -05:00 |
|
|
Belen Curcio
|
a1a45a7969
|
Styles and disable and enable things
|
2017-03-03 15:10:15 -05:00 |
|
|
David Jay
|
cb88f0a9b7
|
Flagging links when settings are set appropriately.
|
2017-03-03 14:32:57 -05:00 |
|
|
Kim Gardner
|
6c4282128e
|
Merge pull request #382 from coralproject/my_history_comments_reverse
Reverse chronological order for My Comment History
|
2017-03-03 13:45:08 -05:00 |
|
|
Kim Gardner
|
1d1aa9c30e
|
Merge branch 'master' into my_history_comments_reverse
|
2017-03-03 13:41:18 -05:00 |
|