b65c07a8a2
Merge branch 'master' into bugs-fix
2017-06-23 14:32:54 -03:00
5984f57682
Close after, wrong label
2017-06-23 14:29:22 -03:00
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
bc878051f8
Merge branch 'master' into issue-676-set-domain-whitelist
2017-06-24 00:22:34 +07:00
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
4a5424b81d
Translation Querido/a
2017-06-23 22:38:30 +07:00
18a767b8a4
Merge branch 'master' into refactor-ban-suspend-actions
2017-06-23 22:24:01 +07:00
32b6627144
Merge pull request #696 from coralproject/bugs-fix
...
Bug Fixes
2017-06-23 16:22:06 +01:00
e1b3eb9ff7
Merge branch 'master' into issue-676-set-domain-whitelist
2017-06-23 16:19:46 +01:00
b76578b866
Merge branch 'master' into refactor-ban-suspend-actions
2017-06-23 16:17:26 +01:00
c09d1524a9
Merge branch 'master' into bugs-fix
2017-06-23 16:17:09 +01:00
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
ea030af440
missing keys
2017-06-23 09:59:05 -03:00
af59a2e836
Merge branch 'bugs-fix' of github.com:coralproject/talk into bugs-fix
2017-06-23 09:56:43 -03:00
2ab2b41b55
unbind
2017-06-23 09:54:21 -03:00
4bb64231e9
Merge branch 'master' into issue-676-set-domain-whitelist
2017-06-23 09:50:29 -03:00
2800458519
Merge branch 'master' into bugs-fix
2017-06-23 09:49:54 -03:00
90bc9be1b2
Merge branch 'master' into redirect-to-all
2017-06-23 18:29:52 +07:00
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
6d5b8e73d4
Merge branch 'master' into redirect-to-all
2017-06-23 18:18:18 +07:00
87c14dd824
Merge branch 'master' into fix-moderate-link
2017-06-23 18:15:36 +07:00
e89a15f2d2
If not specified redirect to 'all' tab
2017-06-23 18:11:54 +07:00
7d84cff0f7
Merge pull request #698 from ALawliet/master
...
Search dropdown: clear search when closed
2017-06-23 12:10:10 +01:00
6fa74f84f1
Merge branch 'master' into fix-moderate-link
2017-06-23 09:53:35 +01:00
10ed5c9a4a
Merge branch 'master' into master
2017-06-23 09:53:23 +01:00
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
bb544a92b3
Merge pull request #704 from coralproject/keep-alive
...
Added support for keep alive websocket frames
2017-06-22 17:45:02 -03:00
010f0cb0d7
Added support for keep alive websocket frames
2017-06-22 14:32:49 -06:00
60dd6a37d7
Fix Moderate → link by setting to "All" for that story
2017-06-22 13:44:48 -04:00
455a034802
Don't show dropdown on current logged in user
2017-06-22 22:13:09 +07:00
46e707ba51
Use snake case for new translations
2017-06-22 22:04:11 +07:00
e7e66f1e6f
Merge branch 'master' into refactor-ban-suspend-actions
2017-06-22 21:57:30 +07:00
8bb38c5ee5
Refactor and reuse "Actions" in "Moderate" and "Community"
2017-06-22 21:50:19 +07:00
c41b3c27ba
Prevent unnecessary render - no need to clear search if already empty, just close dropdown
2017-06-22 10:29:41 -04:00
cfd55907bd
Merge branch 'master' into bugs-fix
2017-06-22 14:34:04 +01:00
91907e7647
Merge branch 'master' into master
2017-06-22 14:28:01 +01:00
a5048eadb4
Merge pull request #699 from coralproject/update-circle-config
...
Limit circle deploys off only our master branch
2017-06-22 14:27:42 +01:00
bde08ea256
Merge branch 'master' into update-circle-config
2017-06-22 14:07:53 +01:00
3de6ba1b24
Limit circle deploys off only our master branch
2017-06-22 14:05:50 +01:00
dac9401c44
Merge branch 'master' into bugs-fix
2017-06-22 12:30:49 +01:00
bba4474858
Search dropdown: clear search when closed
2017-06-22 01:51:06 -04:00
259f98a4ec
Merge pull request #697 from coralproject/bug-sweep
...
Bug sweep
2017-06-22 01:05:11 +07:00
f7a8f9bbd1
Oops this comment needs a rewrite
2017-06-22 00:59:04 +07:00
83096dbcce
Merge branch 'master' into bug-sweep
2017-06-22 00:52:30 +07:00
555a71fd9b
Merge pull request #695 from coralproject/bug-killing-spree
...
Bug killing spree
2017-06-22 00:52:00 +07:00
2c57ec3c7c
Merge branch 'master' into bug-killing-spree
2017-06-22 00:47:27 +07:00
c0e9e4272b
Merge branch 'master' into bug-killing-spree
...
Conflicts:
client/coral-admin/src/routes/Moderation/components/UserDetail.js
2017-06-22 00:46:17 +07:00
a31810ddf4
Merge branch 'master' into bug-sweep
2017-06-21 14:43:32 -03:00
f6b2a25e72
Merge pull request #687 from coralproject/pat
...
Tokens
2017-06-21 14:43:05 -03:00
bd7443672a
Merge branch 'master' into pat
2017-06-21 11:36:47 -06:00
Belén Curcio