Commit Graph

4042 Commits

Author SHA1 Message Date
Belen Curcio bd21719ea5 Handling non safari browsers 2017-05-24 17:20:23 -03:00
Belen Curcio 8266c65043 Merge Conflicts 2017-05-22 09:39:04 -03:00
Belen Curcio 317f7134f2 linting 2017-05-22 09:03:10 -03:00
Belen Curcio 9936b6ec47 Prettier 2017-05-22 08:59:34 -03:00
Belen Curcio 1d96f67db6 Merge branch 'master' of github.com:coralproject/talk into coral-plugin-auth 2017-05-22 08:58:33 -03:00
Belen Curcio 9d00a27f1d Auth as a plugin 2017-05-22 08:40:45 -03:00
Belen Curcio f364a1e0a1 Refactor 2017-05-22 08:23:58 -03:00
Belen Curcio 1aacb565d4 linting 2017-05-19 20:10:49 -03:00
Belen Curcio 801a6f8a53 External plugin auth fully working, now refactor 2017-05-19 20:00:33 -03:00
Belen Curcio dbfd2aff7c SignInButton 2017-05-19 19:29:50 -03:00
Belen Curcio 3af49de0ce New login slots and auth plugins 2017-05-19 18:04:54 -03:00
Belen Curcio 904aef0afc Adding coral-plugin-auth 2017-05-19 17:32:54 -03:00
Belen Curcio 87ada30eff Ádding Stream Slot 2017-05-19 17:32:16 -03:00
Riley Davis f32208b35b Merge pull request #585 from coralproject/multiple-roles
Multiple roles
2017-05-19 13:12:20 -06:00
riley 2c620c868d merge master 2017-05-19 11:05:46 -06:00
Kiwi 04fbeededa Merge pull request #600 from coralproject/suspend-user
Suspend user
2017-05-19 23:29:13 +07:00
Kiwi 8cb9945e25 Merge branch 'master' into multiple-roles 2017-05-19 23:26:45 +07:00
riley 17ceadd8c9 move client-side perms to services 2017-05-19 09:18:24 -06:00
Chi Vinh Le 3688d3f970 Gracefully allow user with no email 2017-05-19 17:53:10 +07:00
Chi Vinh Le 1d6455058e Apply review suggestions 2017-05-19 17:51:58 +07:00
Chi Vinh Le 1374217680 Merge branch 'master' into suspend-user 2017-05-19 17:46:06 +07:00
Kim Gardner f35a9ec8cd Merge pull request #602 from coralproject/content-type-fix
added fix for chrome + content type negotiation
2017-05-18 18:40:35 -04:00
Wyatt Johnson 25230f2e9d added fix for chrome + content type negotiation 2017-05-18 16:30:28 -06:00
Kim Gardner f29df23c07 Merge pull request #601 from coralproject/read-only-inputs
handle no-interaction input the correct way
2017-05-18 17:21:12 -04:00
Kim Gardner b3e494d279 Merge branch 'master' into read-only-inputs 2017-05-18 17:14:48 -04:00
Kim Gardner 13376504b5 Merge pull request #598 from gobengo/edit-comment-settings
Edit Comment Window Length Setting
2017-05-18 17:14:29 -04:00
Kim Gardner 12ec058588 Merge branch 'master' into edit-comment-settings 2017-05-18 17:07:37 -04:00
Kim Gardner 5cbe9029aa Merge pull request #596 from gobengo/fix-ignore-user
Ignored user tombstones work again
2017-05-18 16:43:46 -04:00
riley 6deee7cb80 add a perms utils file 2017-05-18 14:28:43 -06:00
Riley Davis c772cffc92 handle no-interaction input the correct way 2017-05-18 13:51:48 -06:00
Chi Vinh Le 89b7918e41 Tiny renaming 2017-05-19 02:29:59 +07:00
Chi Vinh Le b521934ee2 Remove unneeded refetch 2017-05-19 02:24:47 +07: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
Chi Vinh Le 0040bc4c01 Remove remaining debug msgs 2017-05-19 02:12:27 +07:00
Chi Vinh Le 0588a8ab66 Use async / await :-) 2017-05-19 02:07:38 +07:00
Chi Vinh Le 859a0b1fbe Make until arg required 2017-05-19 02:03:36 +07:00
Chi Vinh Le d995cdde07 Make email message required 2017-05-19 02:01:47 +07:00
Chi Vinh Le f641a3ec40 Complete suspend user implementation 2017-05-19 01:52:03 +07:00
Kim Gardner e80e79f267 Merge branch 'master' into edit-comment-settings 2017-05-18 14:23:14 -04:00
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
Benjamin Goering 1d322d8c70 Merge branch 'master' into fix-ignore-user 2017-05-18 10:50:00 -07:00
Benjamin Goering aaa2da6c23 Stream container refetch then setCommentCountCache to asset.commentCount instead of silly zero 2017-05-18 10:43:38 -07:00
Wyatt Johnson 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
Benjamin Goering fb33eefe8e trivial changes requested by review 2017-05-18 08:19:52 -07:00
Benjamin Goering cfc6d4bfea Merge branch 'fix-ignore-user' of github.com:gobengo/talk into fix-ignore-user 2017-05-18 08:12:40 -07:00