Commit Graph
353 Commits
Author SHA1 Message Date
Chi Vinh Le 7b76450eb5 Merge branch 'master' into refactor-configure
Conflicts:
	client/coral-admin/src/routes/Configure/components/Configure.css
	client/coral-admin/src/routes/Moderation/components/Moderation.js
2017-10-11 14:17:36 +07:00
Belen Curcio 0d66e42313 Merge branch 'viewing-options' of github.com:coralproject/talk into viewing-options 2017-10-10 13:16:37 -03:00
Belen Curcio 154949ff47 Update 2017-10-10 13:12:55 -03:00
Kim GardnerandGitHub c0a54b6538 Merge branch 'master' into viewing-options 2017-10-10 13:06:18 +01:00
Belén CurcioandGitHub 29c7c9e810 Merge branch 'master' into viewing-options 2017-10-10 00:18:03 -03:00
Tyler BrewerandGitHub 48c291a9c3 Merge branch 'master' into fix-shortcut-icon 2017-10-09 11:01:26 -04:00
Chi Vinh Le c0ff9c1beb Merge branch 'master' into refactor-configure
Conflicts:
	client/coral-admin/src/routes/Moderation/components/Moderation.js
2017-10-09 21:30:03 +07:00
Belen Curcio dbe6e675c9 Modal Keys should show on tablet 2017-10-06 13:02:18 -03:00
Belen Curcio 0f6bbb21a3 Fix drawer too 2017-10-06 11:05:38 -03:00
Belen Curcio c2cbf91cad Merge branch 'master' of github.com:coralproject/talk into viewing-options 2017-10-06 11:02:46 -03:00
Belen Curcio e4b225b4c2 ViewingOptions, Cards, Proptypes and MediaQueries 2017-10-06 10:10:08 -03:00
tylerbrewer2 a4591ecb55 fix hidden shortcut icon 2017-10-05 20:51:54 -04:00
Gerardo GálvezandGitHub 931b5ad3ac Merge branch 'master' into moderate-shortcuts 2017-10-05 17:18:18 -05:00
Gerardo Galvez c0bb5e5cb2 Add moderator shortcuts to open search and switch between queues. 2017-10-05 16:57:46 -05:00
Chi Vinh Le 9c00050f6a Load settings from graph 2017-10-05 21:05:05 +07:00
Belen Curcio 886df1cdca Now every section is full width :D 2017-10-05 08:21:17 -03:00
Belen Curcio 91a25fc3c1 max-width 2017-10-05 08:00:08 -03:00
tylerbrewer2 85f9000a64 fix admin navigation width 2017-10-04 20:22:39 -04:00
Chi Vinh Le b1bc97c8d5 Improve styling 2017-10-02 22:34:12 +07:00
Chi Vinh Le 075d62a32a Move CommentDetails to plugin-api 2017-10-02 20:50:43 +07:00
Chi Vinh Le 7d41421526 adminCommentMoreFlagDetails slot and more 2017-09-29 23:34:40 +07:00
Chi Vinh Le f9693c7154 Refactor and pluginize comment details 2017-09-29 19:42:44 +07:00
Chi Vinh Le 5d718f6dd4 Only shw user flags in detail 2017-09-28 22:02:06 +07:00
Chi Vinh Le 219399a231 Refactor ComemntDetail and implement ToxicDetail 2017-09-27 22:50:45 +07:00
Belén CurcioandGitHub c5e078f1e1 Merge branch 'master' into mod-indicator 2017-09-25 13:49:56 -03:00
Belen Curcio e6f18d8558 Updates 2017-09-25 13:49:26 -03:00
Belen Curcio 19e23479ee Showing the indicators 2017-09-22 17:45:28 -03:00
Belen Curcio 86687f10d8 Working indicators 2017-09-22 17:38:46 -03:00
Belen Curcio 3b6bcba055 Indicator for Community 2017-09-22 17:25:59 -03:00
Chi Vinh Le 1e0451ceba More styling refactor 2017-09-22 22:58:49 +07:00
Wyatt JohnsonandGitHub 4913eda974 Merge branch 'master' into new-flags 2017-09-19 17:12:56 -06:00
Chi Vinh Le 7a4aae93b4 Introduce adminCommentLabels and implement Toxic comment label 2017-09-19 23:14:34 +07:00
Chi Vinh Le b0219948a0 Added core labels 2017-09-19 22:29:51 +07:00
Chi Vinh Le 563a6d23dd First pass adding labels 2017-09-19 21:43:58 +07:00
Belén CurcioandGitHub 79cdd65e30 Merge branch 'master' into flagged-count 2017-09-18 14:12:23 -03:00
Belén CurcioandGitHub 959193f8b5 Merge branch 'master' into flagged-count 2017-09-18 13:19:41 -03:00
Belen Curcio a07d661655 Adding CountBadge and flaggedUsernamesCount 2017-09-18 11:53:52 -03:00
Chi Vinh Le 33822ff6c0 More linting error fixes 2017-09-18 20:38:32 +07:00
Chi Vinh Le f19b333537 Fix some linter warnings 2017-09-18 18:56:52 +07:00
Chi Vinh Le ad361413c7 Reimplement wordlist on server using same regexp solution 2017-09-14 17:36:04 +07:00
Chi Vinh Le abc651c55d Add some optimizations 2017-09-14 00:50:01 +07:00
Chi Vinh Le fa335564ed Generate RegExp from phrases 2017-09-14 00:10:29 +07:00
Chi Vinh Le 6487072be1 Merge branch 'new-regexp-highlighter' of ssh://github.com/coralproject/talk into new-regexp-highlighter 2017-09-13 22:23:41 +07:00
Chi Vinh Le a16f101a12 Match phrases not just words 2017-09-13 22:20:32 +07:00
Kim GardnerandGitHub 2905ffb5cb Merge branch 'master' into new-regexp-highlighter 2017-09-13 12:43:29 +01:00
Chi Vinh Le 7976aace00 Typo 2017-09-12 22:46:24 +07:00
Chi Vinh Le 98b95cab86 Reintroduce linkify 2017-09-12 21:31:59 +07:00
Chi Vinh Le d8ca9dfb07 Fix edit animation 2017-09-12 20:58:33 +07:00
Chi Vinh Le ee3cee2a50 Typo 2017-09-12 20:55:31 +07:00
Chi Vinh Le 65a6c408a7 Add some docs 2017-09-12 20:54:30 +07:00