Commit Graph
3983 Commits
Author SHA1 Message Date
riley ff75b9474a merge master 2017-05-18 12:18:00 -06: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
Wyatt JohnsonandGitHub 5a272413e6 Merge pull request #599 from coralproject/gzip
Added gzip compression to bundle assets
2017-05-18 11:34:05 -06:00
Wyatt Johnson 4dc83aaf63 added middleware wrap 2017-05-18 11:27:28 -06:00
Wyatt Johnson 12713dae86 Removed unused assets 2017-05-18 11:18:08 -06:00
Wyatt Johnson 555c593059 Added gzip compression to bundle assets 2017-05-18 11:08:46 -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 54abaeb587 wrap the not-authorized warning in a template 2017-05-17 15:47:41 -06:00
Riley Davis 4a97db3357 emma's copy 2017-05-17 15:41:49 -06:00
Riley Davis 88377b3180 do not show Config tab for non-admins 2017-05-17 15:37:13 -06:00
Kim GardnerandGitHub 0dfec6e619 Merge pull request #597 from coralproject/copy-button-should-work
user detail copy button should work
2017-05-17 17:35:08 -04:00
Riley Davis e343897526 user detail copy button regression 2017-05-17 15:11:00 -06:00
Kim GardnerandGitHub 413eef8834 Merge pull request #564 from coralproject/user-detail-ui
User detail ui
2017-05-17 16:41:00 -04:00
Riley Davis c66e3141e0 actually check permissions 2017-05-17 11:38:43 -06:00
Riley Davis a0f41bb19d show total comments and rejected % 2017-05-17 10:54:14 -06:00
Wyatt Johnson fde4dee52f Resolver cleanup 2017-05-16 17:26:34 -06:00
riley b49ace99eb add permission for EDIT_COMMENT 2017-05-16 16:38:30 -06:00
riley d081c0c5b5 remove context 2017-05-16 16:34:04 -06:00
riley 03ce044c53 merge master 2017-05-16 16:33:41 -06:00
riley 31647fb2f0 have function params in the correct order 2017-05-16 15:41:27 -06:00
Wyatt Johnson f4b9191476 Added author_id to comment count query 2017-05-16 14:20:20 -06:00
Riley DavisandGitHub 4ca5c4bc09 Merge branch 'master' into user-detail-ui 2017-05-16 13:54:13 -06:00
KiwiandGitHub c21e500e58 Merge pull request #593 from coralproject/readd-last-comment
Readd lastComment field to asset resolver
2017-05-17 01:35:07 +07:00
Chi Vinh Le 7d858c7b3f Readd lastComment field to asset resolver 2017-05-17 01:25:06 +07:00
riley c7e9fe3f5f update backend with the can() method 2017-05-16 10:50:09 -06:00
Wyatt Johnson e90ce7f4c3 fixed merge issue 2017-05-16 10:20:16 -06:00
riley 62e8e4c5c5 change how constants are exposed 2017-05-16 10:15:43 -06:00
Wyatt Johnson 3e2ed222ed Merge branch 'trust-merge' into user-detail-ui 2017-05-16 09:53:35 -06:00
riley 7896b3f33b merge master 2017-05-16 09:43:49 -06:00
Belén CurcioandGitHub e561819c8d Merge pull request #592 from coralproject/invalidate-old-data
Invalidate old user data
2017-05-16 08:57:32 -03: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
KiwiandGitHub acdc00af18 Merge pull request #591 from coralproject/refetch-profile-only-after-login
Only refetch for login on `My Profile`.
2017-05-16 18:12:54 +07:00
Belén CurcioandGitHub f9cf5fb744 Merge branch 'master' into refetch-profile-only-after-login 2017-05-16 07:57:20 -03:00
Chi Vinh Le e1b80c3317 Only refetch for login 2017-05-16 17:50:17 +07:00
Belén CurcioandGitHub f37c1c3b5d Merge pull request #590 from coralproject/auth-login-fixes
Auth login fixes
2017-05-16 07:42:32 -03: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
Belén CurcioandGitHub 084bd6710f Merge pull request #589 from coralproject/fix
Updated Lock File
2017-05-16 00:14:02 -03:00
Belen Curcio df843a23dd updated loc 2017-05-16 00:09:33 -03:00
Kim GardnerandGitHub 95e770aff8 Merge pull request #588 from coralproject/fix
Fix for FB login.
2017-05-15 22:57:30 -04: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 4b6e562492 Missing "" to send strings instead of objects 2017-05-15 23:22:36 -03:00
riley 4d3788e4c9 saving my place so i dont have too many threads 2017-05-15 16:25:32 -06:00
Wyatt Johnson 50db2d1dda Initial merge of trust functionality 2017-05-15 15:28:57 -06:00
Kim GardnerandGitHub 297dee6da8 Merge pull request #587 from coralproject/edit-changes
Edit Consistency
2017-05-15 16:47:33 -04:00
Belen Curcio 2b7f545c2d lint 2017-05-15 17:31:53 -03:00