 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 |
|
|
Chi Vinh Le
|
0588a8ab66
|
Use async / await :-)
|
2017-05-19 02:07:38 +07:00 |
|
|
Chi Vinh Le
|
f641a3ec40
|
Complete suspend user implementation
|
2017-05-19 01:52:03 +07:00 |
|
|
Wyatt Johnson
|
12713dae86
|
Removed unused assets
|
2017-05-18 11:18:08 -06:00 |
|
|
Riley Davis
|
e343897526
|
user detail copy button regression
|
2017-05-17 15:11:00 -06:00 |
|
|
Chi Vinh Le
|
492b973206
|
Add 1 extra suspension minute
|
2017-05-18 02:28:01 +07:00 |
|
|
Chi Vinh Le
|
2bdf413b88
|
Integrate into embed stream
|
2017-05-18 02:28:01 +07:00 |
|
|
Chi Vinh Le
|
76e87f4c34
|
Move previous suspendUser feature to rejectUsername
|
2017-05-18 02:28:01 +07:00 |
|
|
Riley Davis
|
a0f41bb19d
|
show total comments and rejected %
|
2017-05-17 10:54:14 -06:00 |
|
|
Chi Vinh Le
|
056ff427a5
|
Merge branch 'master' into suspend-user
|
2017-05-17 21:50:28 +07:00 |
|
|
Chi Vinh Le
|
71c743dda7
|
Extend backend to support new suspend feature
|
2017-05-17 20:05:18 +07: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 |
|
|
Chi Vinh Le
|
c7e0577708
|
Merge branch 'master' into invalidate-old-data
|
2017-05-16 18:17:45 +07:00 |
|
|
Chi Vinh Le
|
2ab8cc9481
|
Allow Apollo to invalidate old user data
|
2017-05-16 18:17:43 +07:00 |
|
|
Chi Vinh Le
|
e1b80c3317
|
Only refetch for login
|
2017-05-16 17:50:17 +07:00 |
|
|
Chi Vinh Le
|
ec19618052
|
Readd login fixes
|
2017-05-16 17:26:53 +07:00 |
|
|
Chi Vinh Le
|
81f51b69ec
|
Clear token before dispatching logout action
|
2017-05-16 17:13:19 +07:00 |
|
|
Belen Curcio
|
d3252b8c87
|
Done :)
|
2017-05-15 23:47:29 -03:00 |
|
|
Belen Curcio
|
1eada688fe
|
Prettier
|
2017-05-15 23:23:22 -03:00 |
|
|
Belen Curcio
|
2b7f545c2d
|
lint
|
2017-05-15 17:31:53 -03:00 |
|
|
Belen Curcio
|
b789a8e107
|
Removing kiwis fix since this was fixed in auth tokens branch
|
2017-05-15 17:23:57 -03:00 |
|
|
Belen Curcio
|
b2e5c0452a
|
The merge conficts
|
2017-05-15 17:13:48 -03:00 |
|
|
Chi Vinh Le
|
74e1436ae4
|
Use correct error key
|
2017-05-16 01:09:33 +07:00 |
|
|
Chi Vinh Le
|
def35f0a93
|
Fix login issues
|
2017-05-16 00:55:12 +07:00 |
|
|
Chi Vinh Le
|
06001763ff
|
Remove unused files
|
2017-05-16 00:52:37 +07: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 |
|
|
Belen Curcio
|
4e86e4197c
|
handling logout
|
2017-05-15 13:13:28 -03:00 |
|
|
Chi Vinh Le
|
a9207428fe
|
Calculate "until"
|
2017-05-15 23:07:46 +07:00 |
|
|
Belen Curcio
|
57ced201eb
|
WebStorage events
|
2017-05-15 12:52:54 -03:00 |
|
|
Belen Curcio
|
370cdf8c09
|
Ádding middlewares to our network interface
|
2017-05-15 12:51:07 -03:00 |
|
|
Chi Vinh Le
|
63fa3c4de7
|
Implement suspend user components
|
2017-05-15 22:28:04 +07:00 |
|
|
Belen Curcio
|
292f758ac9
|
Comment history relies on authtokens
|
2017-05-15 12:17:30 -03:00 |
|
|
Belen Curcio
|
76b96a66a2
|
Adding Bearer token to the Graph Client
|
2017-05-15 11:41:36 -03:00 |
|
|
Belen Curcio
|
8754ade5a4
|
merge
|
2017-05-12 21:52:29 -03:00 |
|
|
Wyatt Johnson
|
9403280c56
|
Merge branch 'master' into edit-changes
|
2017-05-12 15:44:19 -06:00 |
|
|
Belen Curcio
|
964cc362e7
|
Login, logout with tokens. WIP
|
2017-05-12 18:26:24 -03:00 |
|
|
Belen Curcio
|
7fd5509490
|
Prettier
|
2017-05-12 15:48:19 -03:00 |
|
|
Belen Curcio
|
5e8a02c461
|
Removing CSRF
|
2017-05-12 15:40:53 -03:00 |
|
|
Wyatt Johnson
|
ffd96f57e9
|
Comment too short fixes
|
2017-05-12 11:16:52 -06:00 |
|
|
Wyatt Johnson
|
e3017efebf
|
Front end edits to accomedate ignoredUsers
|
2017-05-12 10:25:59 -06:00 |
|
|
Chi Vinh Le
|
072437b0fd
|
Prevent empty edit
|
2017-05-12 22:45:33 +07:00 |
|
|
Chi Vinh Le
|
95a7a1ca47
|
Rename registry
|
2017-05-12 20:15:04 +07:00 |
|
|
Chi Vinh Le
|
7857cadef5
|
Merge branch 'master' into query-mutation-api
Conflicts:
client/coral-embed-stream/src/components/Comment.js
client/coral-embed-stream/src/containers/Embed.js
client/coral-embed-stream/src/containers/Stream.js
client/coral-embed-stream/src/index.js
client/coral-framework/graphql/fragments/commentView.graphql
client/coral-framework/graphql/mutations/index.js
client/coral-framework/hocs/index.js
client/coral-framework/hocs/withFragments.js
|
2017-05-12 19:50:36 +07:00 |
|
|
Wyatt Johnson
|
ae5da93730
|
linting fixes
|
2017-05-11 17:44:51 -06:00 |
|
|
Wyatt Johnson
|
a65d045c65
|
lint fixes
|
2017-05-11 17:38:49 -06:00 |
|
|
Wyatt Johnson
|
08e7a90d69
|
lint fixes
|
2017-05-11 17:34:47 -06:00 |
|
|
Wyatt Johnson
|
d497ad3369
|
initial pagination rewrite, cleanups to comment edit
|
2017-05-11 17:27:02 -06:00 |
|
|
Benjamin GoeringandGitHub
|
923e20f867
|
Merge branch 'master' into edit-comment
|
2017-05-11 10:42:41 -07:00 |
|