Commit Graph
4787 Commits
Author SHA1 Message Date
Kim GardnerandGitHub a7f0de6e62 Merge branch 'master' into coral-plugin-permalink 2017-06-27 13:40:15 +01:00
Kim GardnerandGitHub 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 CurcioandGitHub 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
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
Kim GardnerandGitHub 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 GardnerandGitHub 58d9f294b7 Merge branch 'master' into fix-highlight-suspect-banned-words-regex 2017-06-26 12:25:30 +01:00
Kim GardnerandGitHub 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 a025f4ca24 Validate confirmPassword in the web installer 2017-06-26 17:35:45 +07:00
A Lawliet 5e6a295f11 Make highlight suspect/banned words regex case insensitive 2017-06-24 15:50:44 -04:00
Kim GardnerandGitHub 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 CurcioandGitHub 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
KiwiandGitHub 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
KiwiandGitHub bc878051f8 Merge branch 'master' into issue-676-set-domain-whitelist 2017-06-24 00:22:34 +07:00
KiwiandGitHub 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
KiwiandGitHub 18a767b8a4 Merge branch 'master' into refactor-ban-suspend-actions 2017-06-23 22:24:01 +07:00
Kim GardnerandGitHub 32b6627144 Merge pull request #696 from coralproject/bugs-fix
Bug Fixes
2017-06-23 16:22:06 +01:00
Kim GardnerandGitHub e1b3eb9ff7 Merge branch 'master' into issue-676-set-domain-whitelist 2017-06-23 16:19:46 +01:00
Kim GardnerandGitHub b76578b866 Merge branch 'master' into refactor-ban-suspend-actions 2017-06-23 16:17:26 +01:00
Kim GardnerandGitHub c09d1524a9 Merge branch 'master' into bugs-fix 2017-06-23 16:17:09 +01:00
Kim GardnerandGitHub 548b56be33 Merge pull request #707 from coralproject/redirect-to-all
If not specified redirect to 'all' tab
2017-06-23 16:16:57 +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 CurcioandGitHub 4bb64231e9 Merge branch 'master' into issue-676-set-domain-whitelist 2017-06-23 09:50:29 -03:00
Belén CurcioandGitHub 2800458519 Merge branch 'master' into bugs-fix 2017-06-23 09:49:54 -03:00
KiwiandGitHub 90bc9be1b2 Merge branch 'master' into redirect-to-all 2017-06-23 18:29:52 +07:00
KiwiandGitHub 64a4bf6760 Merge pull request #703 from ALawliet/fix-moderate-link
Fix Moderate → link by setting to "All" for that story
2017-06-23 18:29:38 +07:00
KiwiandGitHub 6d5b8e73d4 Merge branch 'master' into redirect-to-all 2017-06-23 18:18:18 +07:00
KiwiandGitHub 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
Kim GardnerandGitHub 7d84cff0f7 Merge pull request #698 from ALawliet/master
Search dropdown: clear search when closed
2017-06-23 12:10:10 +01:00
Kim GardnerandGitHub 6fa74f84f1 Merge branch 'master' into fix-moderate-link 2017-06-23 09:53:35 +01:00
Kim GardnerandGitHub 10ed5c9a4a Merge branch 'master' into master 2017-06-23 09:53:23 +01: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
Belén CurcioandGitHub bb544a92b3 Merge pull request #704 from coralproject/keep-alive
Added support for keep alive websocket frames
2017-06-22 17:45:02 -03:00
Wyatt Johnson 010f0cb0d7 Added support for keep alive websocket frames 2017-06-22 14:32:49 -06: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