Commit Graph

4827 Commits

Author SHA1 Message Date
Kiwi b7a981e84b Merge branch 'master' into no-username-alias 2017-06-28 16:37:01 +07:00
Kim Gardner ca0431054b Merge pull request #720 from coralproject/flag-reason
BUG: Flag Username - Offensive, doesn't show up in the Community Admin
2017-06-28 10:33:52 +01:00
Kim Gardner 3f03994a51 Merge branch 'master' into flag-reason 2017-06-28 10:27:48 +01:00
Kiwi aff486e909 Merge branch 'master' into no-username-alias 2017-06-28 16:22:12 +07:00
Kim Gardner 37e6c2c45c Merge pull request #717 from coralproject/live-suspension
Live update on stream when banned user, suspended user or rejected username
2017-06-28 10:16:18 +01:00
Belén Curcio 04b562543e Merge branch 'master' into flag-reason 2017-06-27 16:53:56 -03:00
Belen Curcio e03e15fb3b renaming 2017-06-27 16:20:08 -03:00
Belen Curcio f13682c125 flagMap added to the admin side 2017-06-27 16:12:13 -03:00
Belén Curcio 6d4765b45d Merge branch 'master' into no-username-alias 2017-06-27 16:03:03 -03:00
David Erwin b94824b8ee Merge branch 'master' into live-suspension 2017-06-27 14:14:21 -04:00
Belén Curcio cb1b9a1463 Merge pull request #714 from coralproject/unify-taglists
Refactor TagsInput and improve UX
2017-06-27 14:54:57 -03:00
Belen Curcio 35ccc5070d Flag refactor 2017-06-27 14:52:12 -03:00
Kiwi efb18cdb32 Merge branch 'master' into unify-taglists 2017-06-28 00:28:32 +07:00
Kiwi 2338ff1694 Merge branch 'master' into no-username-alias 2017-06-28 00:15:14 +07:00
Chi Vinh Le b134d4099c More concise and functional subscribing 2017-06-28 00:13:47 +07:00
Kim Gardner 1b40521f88 Merge branch 'master' into live-suspension 2017-06-27 17:53:58 +01:00
Kim Gardner 88473a1c71 Merge pull request #716 from coralproject/coral-plugin-permalink
Talk Plugin Permalink
2017-06-27 17:53:38 +01:00
Chi Vinh Le 97ab338486 Don't alias username 2017-06-27 23:51:49 +07:00
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