Commit Graph

3544 Commits

Author SHA1 Message Date
Kim Gardner 198efd02b4 Merge branch 'master' into smooth-scroll 2017-06-28 10:27:00 +01:00
Kiwi aff486e909 Merge branch 'master' into no-username-alias 2017-06-28 16:22:12 +07:00
Belén Curcio 04b562543e Merge branch 'master' into flag-reason 2017-06-27 16:53:56 -03:00
Belen Curcio dd76ac1ed4 Now the smooth flag works 2017-06-27 16:51:00 -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
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
Chi Vinh Le 97ab338486 Don't alias username 2017-06-27 23:51:49 +07: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
Chi Vinh Le 175dd30d27 Keep comment box when user is degraded (live) 2017-06-27 21:40:48 +07: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
Belen Curcio 4e94727749 Merge branch 'master' of github.com:coralproject/talk into coral-plugin-permalink 2017-06-26 17:34:53 -03:00
Belen Curcio b00d2f569e Removing styles from default.css 2017-06-26 16:01:07 -03:00
Belen Curcio fedca113d2 Adding plugin 2017-06-26 11:50:51 -03:00
Kiwi c7c33dcf13 Merge branch 'master' into unify-taglists 2017-06-26 19:08:38 +07:00
Kim Gardner 58d9f294b7 Merge branch 'master' into fix-highlight-suspect-banned-words-regex 2017-06-26 12:25:30 +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
Belén Curcio b65c07a8a2 Merge branch 'master' into bugs-fix 2017-06-23 14:32:54 -03:00
Belen Curcio 5984f57682 Close after, wrong label 2017-06-23 14:29:22 -03:00
Kiwi bc878051f8 Merge branch 'master' into issue-676-set-domain-whitelist 2017-06-24 00:22:34 +07:00
Kiwi 18a767b8a4 Merge branch 'master' into refactor-ban-suspend-actions 2017-06-23 22:24:01 +07: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
Belen Curcio ea030af440 missing keys 2017-06-23 09:59:05 -03:00
Belen Curcio af59a2e836 Merge branch 'bugs-fix' of github.com:coralproject/talk into bugs-fix 2017-06-23 09:56:43 -03:00
Belen Curcio 2ab2b41b55 unbind 2017-06-23 09:54:21 -03:00
Belén Curcio 4bb64231e9 Merge branch 'master' into issue-676-set-domain-whitelist 2017-06-23 09:50:29 -03:00
Belén Curcio 2800458519 Merge branch 'master' into bugs-fix 2017-06-23 09:49:54 -03:00
Kiwi 90bc9be1b2 Merge branch 'master' into redirect-to-all 2017-06-23 18:29:52 +07:00
Kiwi 6d5b8e73d4 Merge branch 'master' into redirect-to-all 2017-06-23 18:18:18 +07:00
Kiwi 87c14dd824 Merge branch 'master' into fix-moderate-link 2017-06-23 18:15:36 +07:00
Chi Vinh Le e89a15f2d2 If not specified redirect to 'all' tab 2017-06-23 18:11:54 +07:00
Michael Macherey 40b4c0cab4 Issue-676 add addOnBlur preventing loss of domain-whitelist settings
Whithout addOnBlur set true, typed domain-whitelist settings like localhost:3000 get lost and will not be set in configure->Tech Settings->Permitted Domains.
This address issue-676.
2017-06-23 00:35:49 +02:00
A Lawliet 60dd6a37d7 Fix Moderate → link by setting to "All" for that story 2017-06-22 13:44:48 -04:00
Chi Vinh Le 455a034802 Don't show dropdown on current logged in user 2017-06-22 22:13:09 +07:00
Chi Vinh Le 46e707ba51 Use snake case for new translations 2017-06-22 22:04:11 +07:00
Chi Vinh Le 8bb38c5ee5 Refactor and reuse "Actions" in "Moderate" and "Community" 2017-06-22 21:50:19 +07:00
A Lawliet c41b3c27ba Prevent unnecessary render - no need to clear search if already empty, just close dropdown 2017-06-22 10:29:41 -04:00