 Belen Curcio
|
bd21719ea5
|
Handling non safari browsers
|
2017-05-24 17:20:23 -03:00 |
|
|
riley
|
2c620c868d
|
merge master
|
2017-05-19 11:05:46 -06:00 |
|
|
Chi Vinh Le
|
061c18670b
|
Merge branch 'master' into suspend-user
Conflicts:
client/coral-admin/src/constants/moderation.js
client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
|
2017-05-19 02:19:24 +07:00 |
|
|
riley
|
ff75b9474a
|
merge master
|
2017-05-18 12:18:00 -06:00 |
|
|
riley
|
03ce044c53
|
merge master
|
2017-05-16 16:33:41 -06:00 |
|
|
riley
|
7896b3f33b
|
merge master
|
2017-05-16 09:43:49 -06: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 |
|
|
Belen Curcio
|
2b7f545c2d
|
lint
|
2017-05-15 17:31:53 -03:00 |
|
|
Belen Curcio
|
b2e5c0452a
|
The merge conficts
|
2017-05-15 17:13:48 -03:00 |
|
|
Belen Curcio
|
75aa8d79df
|
linting
|
2017-05-15 14:50:26 -03:00 |
|
|
Belen Curcio
|
843c3a16c8
|
Admin share same network interface, and unifying actions
|
2017-05-15 14:48:12 -03:00 |
|
|
Chi Vinh Le
|
63fa3c4de7
|
Implement suspend user components
|
2017-05-15 22:28:04 +07:00 |
|
|
Wyatt Johnson
|
ae5da93730
|
linting fixes
|
2017-05-11 17:44:51 -06:00 |
|
|
Riley Davis
|
14b483d089
|
create roles helper
|
2017-05-11 14:23:02 -06:00 |
|
|
Riley Davis
|
40ff265ab1
|
merge master
|
2017-05-10 11:07:48 -06:00 |
|
|
Riley Davis
|
4507059a04
|
same thing for BanUserDialog and the keyboard shortcuts
|
2017-05-04 15:43:23 -06:00 |
|
|
riley
|
57b0b5ec67
|
add a drawer for the user details
|
2017-05-04 13:58:43 -06:00 |
|
|
riley
|
4a42436b7b
|
load user via HOC UserDetail
|
2017-05-03 12:54:02 -06:00 |
|
|
Riley Davis
|
b71b7cc883
|
move the shortcuts note logic into redux state
|
2017-04-24 14:04:57 -06:00 |
|
|
gaba
|
e5bac88bb5
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-20 15:02:38 -07:00 |
|
|
Wyatt Johnson
|
46ecf0c06f
|
Renamed pageData -> config
|
2017-03-20 10:46:59 -07:00 |
|
|
Wyatt Johnson
|
5768d30a7a
|
Added new pageData action/reducer
|
2017-03-20 10:46:57 -07:00 |
|
|
gaba
|
2a66a78d41
|
Merge branch 'master' into recaptcha-support
|
2017-03-20 10:37:18 -07:00 |
|
|
Riley Davis
|
92055c7814
|
correctly handle error when not logged in
|
2017-03-20 10:21:58 -07:00 |
|
|
Riley Davis
|
c8a0ded4ad
|
try to just add recaptcha manually
use react-recaptcha
remove recaptcha file
|
2017-03-20 07:36:21 -07:00 |
|
|
David Erwin
|
2f86b9eecf
|
Merge branch 'master' into bugfix-ban-dialog-language
|
2017-03-20 07:29:09 -07:00 |
|
|
Wyatt Johnson
|
df4e07d39c
|
Renamed pageData -> config
|
2017-03-17 08:37:58 -06:00 |
|
|
Wyatt Johnson
|
598fcc4cb0
|
Added new pageData action/reducer
|
2017-03-16 11:07:38 -06:00 |
|
|
Riley Davis
|
736ac11782
|
Merge branch 'master' into recaptcha-support
|
2017-03-16 10:12:28 -06:00 |
|
|
Riley Davis
|
9beff74862
|
correctly handle error when not logged in
|
2017-03-15 11:16:13 -06:00 |
|
|
Riley Davis
|
7bbf8abd3d
|
try to just add recaptcha manually
use react-recaptcha
remove recaptcha file
|
2017-03-14 15:32:16 -06:00 |
|
|
David Jay
|
377563c798
|
Hiding rejected note on ban dialog for rejected comments.
|
2017-03-08 17:02:47 -05:00 |
|
|
gaba
|
564b8d8eaa
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-07 13:04:28 +01:00 |
|
|
gaba
|
1899dcbb7e
|
Suspend User dialog.
|
2017-03-02 09:27:53 -08:00 |
|
|
gaba
|
3626d2678e
|
Accept button working. Add suspend user dialog.
|
2017-03-01 23:43:25 -08:00 |
|
|
gaba
|
f5ef33d24e
|
Ban Button with graphql mutation.
|
2017-03-01 12:57:12 -08:00 |
|
|
riley
|
b346083d11
|
Merged master into admin-login-upgrade
|
2017-03-01 11:19:48 -07:00 |
|
|
David Jay
|
3b04dab0d5
|
Merge branch 'master' into bugfix-user-state
|
2017-03-01 12:57:40 -05:00 |
|
|
Kim Gardner
|
87dddaf5b3
|
Merge branch 'master' into admin-login-upgrade
|
2017-03-01 09:01:15 -05:00 |
|
|
gaba
|
6dfd3fc4ef
|
Fix the people tag.
|
2017-02-28 22:10:14 -08:00 |
|
|
gaba
|
da3c812dc1
|
Adds graphql for users flagged in the server and client.
|
2017-02-28 21:33:01 -08:00 |
|
|
riley
|
7ccf77b1ad
|
add reset password link
|
2017-02-28 17:10:51 -07:00 |
|
|
Belen Curcio
|
1db0a75010
|
Merge
|
2017-02-28 20:42:03 -03:00 |
|
|
Riley Davis
|
1f3eb5f516
|
Merged branch master into admin-login-upgrade
|
2017-02-28 16:31:49 -07:00 |
|
|
riley
|
8f23ca678d
|
add Alert component to coral-ui
|
2017-02-28 16:31:30 -07:00 |
|
|
David Jay
|
230488117f
|
Merge branch 'master' into bugfix-user-state
|
2017-02-28 18:20:00 -05:00 |
|
|
Riley Davis
|
e2273f5810
|
change PermissionRequired to LoginView and create a login form. delete old login page
|
2017-02-28 14:32:01 -07:00 |
|
|
David Jay
|
fed28b3eec
|
Refetching on login and logout.
|
2017-02-28 16:13:51 -05:00 |
|
|
Belen Curcio
|
013625df27
|
no validation for domains
|
2017-02-27 16:39:52 -03:00 |
|
|
Belen Curcio
|
9305853502
|
Renamed to PermittedDomains
|
2017-02-27 15:50:07 -03:00 |
|