Commit Graph

7162 Commits

Author SHA1 Message Date
Kiwi 8d4e45c0ed Merge branch 'master' into coral-plugin-permalink 2017-06-27 23:46:55 +07:00
Kim Gardner 53b481dc68 Merge branch 'master' into unify-taglists 2017-06-27 16:25:00 +01:00
Chi Vinh Le b67ac375ba Pass current user to CommentBox 2017-06-27 22:14:06 +07:00
Chi Vinh Le 500d5d582e Fix edit 2017-06-27 21:51:19 +07:00
Kiwi 5b9fe5688f Merge branch 'master' into live-suspension 2017-06-27 21:44:26 +07:00
Chi Vinh Le 175dd30d27 Keep comment box when user is degraded (live) 2017-06-27 21:40:48 +07:00
David Erwin 33990053fb Merge pull request #709 from coralproject/docs-plugins-quickstart
Docs plugins quickstart
2017-06-27 10:19:53 -04:00
Kim Gardner 3f4747c2ec Fix typo 2017-06-27 14:11:04 +01:00
Chi Vinh Le db3187cb56 Merge branch 'master' into live-suspension 2017-06-27 20:08:53 +07:00
Chi Vinh Le c90c177b7c Live update on stream when banned user, suspended user or rejected username 2017-06-27 20:06:27 +07:00
Kim Gardner 933891b2e3 Merge branch 'master' into docs-plugins-quickstart 2017-06-27 13:41:16 +01:00
Kim Gardner 43dd72c715 Merge branch 'master' into unify-taglists 2017-06-27 13:40:24 +01:00
Kim Gardner a7f0de6e62 Merge branch 'master' into coral-plugin-permalink 2017-06-27 13:40:15 +01:00
Kim Gardner 53742934f9 Merge pull request #715 from coralproject/commentCount
Comment Count by Asset URL
2017-06-27 13:01:47 +01:00
Belen Curcio b8aed80f1c Merge branch 'coral-plugin-permalink' of github.com:coralproject/talk into coral-plugin-permalink 2017-06-26 17:35:07 -03:00
Belen Curcio 4e94727749 Merge branch 'master' of github.com:coralproject/talk into coral-plugin-permalink 2017-06-26 17:34:53 -03:00
Belén Curcio 8412fa5613 Merge branch 'master' into coral-plugin-permalink 2017-06-26 16:26:46 -03:00
Belen Curcio bee1cc124c renamed to talk 2017-06-26 16:26:05 -03:00
Belen Curcio 2ac6ad8eb8 Using the plugin api 2017-06-26 16:16:40 -03:00
Belen Curcio fa9a4ecc50 Clearing the timeout 2017-06-26 16:08:32 -03:00
Belen Curcio b00d2f569e Removing styles from default.css 2017-06-26 16:01:07 -03:00
Belen Curcio 5e1450ffb0 Renaming to talk 2017-06-26 15:46:53 -03:00
Belen Curcio a14e4859a9 refactor 2017-06-26 14:49:24 -03:00
Belen Curcio 2745245564 updated 2017-06-26 14:39:10 -03:00
Kim Gardner 3bb1279acf Merge branch 'master' into docs-plugins-quickstart 2017-06-26 16:15:59 +01:00
Belen Curcio fedca113d2 Adding plugin 2017-06-26 11:50:51 -03:00
Belen Curcio 59407e99d7 commentCount by asset_url 2017-06-26 09:59:28 -03:00
Kiwi c7c33dcf13 Merge branch 'master' into unify-taglists 2017-06-26 19:08:38 +07:00
Kim Gardner 0e152797ad Merge pull request #710 from ALawliet/fix-highlight-suspect-banned-words-regex
Make highlight suspect/banned words regex case insensitive
2017-06-26 12:48:11 +01:00
Kim Gardner 58d9f294b7 Merge branch 'master' into fix-highlight-suspect-banned-words-regex 2017-06-26 12:25:30 +01:00
Kim Gardner fddbf2c00f Merge pull request #713 from coralproject/validate-confirm-password
Validate `confirmPassword` in the web installer
2017-06-26 12:25:16 +01:00
Chi Vinh Le 10ae39ba09 Merge branch 'master' into unify-taglists 2017-06-26 17:39:06 +07:00
Chi Vinh Le a025f4ca24 Validate confirmPassword in the web installer 2017-06-26 17:35:45 +07:00
Chi Vinh Le eb4d85fb86 Refactor TagsInput and Improve UX 2017-06-26 17:34:15 +07:00
A Lawliet 5e6a295f11 Make highlight suspect/banned words regex case insensitive 2017-06-24 15:50:44 -04:00
David Erwin b864761ef8 Merge branch 'master' into docs-plugins-quickstart 2017-06-23 16:22:19 -04:00
David Erwin 01f6bfa979 Clean up the quickstart 2017-06-23 16:18:29 -04:00
Kim Gardner e2a9a42ec6 Merge pull request #708 from coralproject/bugs-fix
BUG: Wrong label in Admin Configure
v2.1.0
2017-06-23 18:37:46 +01:00
Belén Curcio b65c07a8a2 Merge branch 'master' into bugs-fix 2017-06-23 14:32:54 -03:00
David Erwin a49a53903d Finish quickstart first draft 2017-06-23 13:29:35 -04:00
Belen Curcio 5984f57682 Close after, wrong label 2017-06-23 14:29:22 -03:00
Kiwi 1c844061f4 Merge pull request #705 from Goyapa/issue-676-set-domain-whitelist
Issue-676 add addOnBlur preventing loss of domain-whitelist settings
2017-06-24 00:29:19 +07:00
Kiwi bc878051f8 Merge branch 'master' into issue-676-set-domain-whitelist 2017-06-24 00:22:34 +07:00
Kiwi b805451d37 Merge pull request #700 from coralproject/refactor-ban-suspend-actions
Refactor and reuse "Actions" in "Moderate" and "Community"
2017-06-23 22:43:38 +07:00
Chi Vinh Le 4a5424b81d Translation Querido/a 2017-06-23 22:38:30 +07:00
Kiwi 18a767b8a4 Merge branch 'master' into refactor-ban-suspend-actions 2017-06-23 22:24:01 +07:00
Kim Gardner 32b6627144 Merge pull request #696 from coralproject/bugs-fix
Bug Fixes
2017-06-23 16:22:06 +01:00
Kim Gardner e1b3eb9ff7 Merge branch 'master' into issue-676-set-domain-whitelist 2017-06-23 16:19:46 +01:00
Kim Gardner b76578b866 Merge branch 'master' into refactor-ban-suspend-actions 2017-06-23 16:17:26 +01:00
Kim Gardner c09d1524a9 Merge branch 'master' into bugs-fix 2017-06-23 16:17:09 +01:00