 Chi Vinh Le
|
0b7432b75e
|
Merge branch 'master' into i18n-refactor
Conflicts:
client/coral-sign-in/components/FakeComment.js
client/coral-sign-in/components/UserBox.js
|
2017-05-29 20:23:27 +07:00 |
|
|
IAmSamHankins
|
05e5200e79
|
moderation panel design cleanup PT 144120491
|
2017-05-26 12:48:15 -04:00 |
|
|
Chi Vinh Le
|
a39fcee3f8
|
More error handling fixes
|
2017-05-26 03:04:06 +07:00 |
|
|
gaba
|
8da7df353c
|
Adds a bunch of missing strings.
|
2017-05-23 16:06:04 -04:00 |
|
|
gaba
|
67fb829717
|
A few more issues from the merge.
|
2017-05-19 13:29:23 -07:00 |
|
|
gaba
|
625362d51e
|
Merge branch 'master' into i18n-refactor
|
2017-05-19 12:44:34 -07:00 |
|
|
gaba
|
9be443eda8
|
Moves i18n into coral-framework.
|
2017-05-19 12:28:44 -07:00 |
|
|
riley
|
2c620c868d
|
merge master
|
2017-05-19 11:05:46 -06:00 |
|
|
riley
|
17ceadd8c9
|
move client-side perms to services
|
2017-05-19 09:18:24 -06:00 |
|
|
gaba
|
3ca22bd101
|
Fix translation keys.
|
2017-05-18 15:14:37 -07:00 |
|
|
riley
|
056ba9a04c
|
do the same thing for the Drawer
|
2017-05-18 12:11:11 -06:00 |
|
|
riley
|
d98ce38bf5
|
show config tab to admins. hide menu items from users that can't access admin
|
2017-05-18 12:06:07 -06:00 |
|
|
riley
|
c4210db307
|
staff should not see moderate tag. translations
|
2017-05-17 16:10:02 -06:00 |
|
|
riley
|
3fc1029a93
|
do not require auth in the Header
|
2017-05-17 16:00:01 -06:00 |
|
|
Riley Davis
|
88377b3180
|
do not show Config tab for non-admins
|
2017-05-17 15:37:13 -06:00 |
|
|
gaba
|
5bd9bc992b
|
Move i18n into a service
|
2017-05-17 12:53:36 -07:00 |
|
|
Chi Vinh Le
|
97121382c7
|
Merge branch 'master' into suspend-user
Conflicts:
client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
client/coral-admin/src/containers/ModerationQueue/components/Comment.js
client/coral-framework/utils/index.js
package.json
|
2017-05-16 21:02:33 +07:00 |
|
|
gaba
|
423cb3cade
|
Merge branch 'master' into i18n-refactor
|
2017-05-15 14:02:34 -07:00 |
|
|
gaba
|
b31212f847
|
Second run of notation change for translations.
|
2017-05-15 08:35:55 -07:00 |
|
|
Chi Vinh Le
|
63fa3c4de7
|
Implement suspend user components
|
2017-05-15 22:28:04 +07:00 |
|
|
gaba
|
633086cfa3
|
Fix a few more strings and translations.
|
2017-05-15 07:11:11 -07:00 |
|
|
Wyatt Johnson
|
ae5da93730
|
linting fixes
|
2017-05-11 17:44:51 -06:00 |
|
|
gaba
|
3b80ee8b13
|
Add YAML loader. Fix i18n module to get YAML files.
|
2017-05-11 15:05:09 -07:00 |
|
|
gaba
|
653091fdf9
|
Merge branch 'master' into i18n-refactor
|
2017-05-11 09:02:21 -07:00 |
|
|
Riley Davis
|
f3f0b9c858
|
change mouse cursor for disabled buttons
|
2017-05-04 15:55:46 -06:00 |
|
|
Riley Davis
|
4507059a04
|
same thing for BanUserDialog and the keyboard shortcuts
|
2017-05-04 15:43:23 -06:00 |
|
|
gaba
|
c0fc87ea21
|
Merge branch 'master' into i18n-refactor
|
2017-05-01 11:28:06 -07:00 |
|
|
Riley Davis
|
8293408c52
|
pull some custom code out of ActionButton
|
2017-05-01 10:22:11 -06:00 |
|
|
riley
|
d5b800f590
|
add accepted rejected aciton buttons
|
2017-04-27 11:17:53 -06:00 |
|
|
Riley DavisandGitHub
|
fc567e8a92
|
Merge branch 'master' into shortcuts-in-cog
|
2017-04-26 13:34:13 -06:00 |
|
|
gaba
|
9e41f0bd65
|
Merge branch 'master' into i18n-refactor
|
2017-04-25 16:10:45 -05:00 |
|
|
Riley Davis
|
b88cbe30de
|
have all the comments show up in All Queue with proper statuses
|
2017-04-25 13:23:39 -06:00 |
|
|
Riley Davis
|
a94e6a0ada
|
have default...just in case
|
2017-04-25 12:40:28 -06:00 |
|
|
Riley Davis
|
89f0663723
|
shortcuts list should be accessible from the cog
|
2017-04-25 12:38:00 -06:00 |
|
|
Riley Davis
|
5666c4ac90
|
condense some var definitions
|
2017-04-25 11:57:36 -06:00 |
|
|
Riley DavisandGitHub
|
37ac5157dd
|
Merge branch 'master' into comment-status-display
|
2017-04-25 11:45:27 -06:00 |
|
|
Riley Davis
|
cee1c5bc1c
|
have active state on action buttons depending on comment status
|
2017-04-25 11:21:28 -06:00 |
|
|
gaba
|
59e23ffd60
|
Moves into YAML and own module.
|
2017-04-24 18:09:13 -05:00 |
|
|
Riley Davis
|
b71b7cc883
|
move the shortcuts note logic into redux state
|
2017-04-24 14:04:57 -06:00 |
|
|
Riley Davis
|
d1ab279f74
|
add a little keyboard shortcut widget
|
2017-04-21 13:26:32 -06:00 |
|
|
Chi Vinh Le
|
2d0208046b
|
Implement MarkdownEditor
|
2017-03-30 20:49:18 +07:00 |
|
|
gaba
|
9eaed90318
|
Revert "Revert "Story 138187767 - Moderate Flag User Names""
This reverts commit 903aa23f19.
|
2017-03-24 11:15:42 -07:00 |
|
|
David ErwinandGitHub
|
903aa23f19
|
Revert "Story 138187767 - Moderate Flag User Names"
|
2017-03-23 11:18:55 -04:00 |
|
|
Riley DavisandGitHub
|
d8e92968a5
|
Merge branch 'master' into admin-ux
|
2017-03-22 13:22:21 -06:00 |
|
|
Belen Curcio
|
6a5f667336
|
hover, menu order
|
2017-03-22 13:20:26 -03:00 |
|
|
gaba
|
e5bac88bb5
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-20 15:02:38 -07:00 |
|
|
Wyatt Johnsonandgaba
|
8eac8d6890
|
Merge branch 'master' into recaptcha-fix
|
2017-03-20 10:46:58 -07:00 |
|
|
Wyatt Johnsonandgaba
|
5768d30a7a
|
Added new pageData action/reducer
|
2017-03-20 10:46:57 -07:00 |
|
|
Riley Davisandgaba
|
517ede1977
|
dashboard reload fix
|
2017-03-20 10:45:29 -07:00 |
|
|
gaba
|
2a66a78d41
|
Merge branch 'master' into recaptcha-support
|
2017-03-20 10:37:18 -07:00 |
|