 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
|
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
|
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 |
|
|
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 |
|
|
Chi Vinh Le
|
46e707ba51
|
Use snake case for new translations
|
2017-06-22 22:04:11 +07:00 |
|
|
KiwiandGitHub
|
e7e66f1e6f
|
Merge branch 'master' into refactor-ban-suspend-actions
|
2017-06-22 21:57:30 +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 |
|
|
Kim GardnerandGitHub
|
cfd55907bd
|
Merge branch 'master' into bugs-fix
|
2017-06-22 14:34:04 +01:00 |
|
|
Kim GardnerandGitHub
|
91907e7647
|
Merge branch 'master' into master
|
2017-06-22 14:28:01 +01:00 |
|
|
Kim GardnerandGitHub
|
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 |
|
|
Kim GardnerandGitHub
|
bde08ea256
|
Merge branch 'master' into update-circle-config
|
2017-06-22 14:07:53 +01:00 |
|
|
Kim Gardner
|
3de6ba1b24
|
Limit circle deploys off only our master branch
|
2017-06-22 14:05:50 +01:00 |
|
|
Kim GardnerandGitHub
|
dac9401c44
|
Merge branch 'master' into bugs-fix
|
2017-06-22 12:30:49 +01:00 |
|
|
A Lawliet
|
bba4474858
|
Search dropdown: clear search when closed
|
2017-06-22 01:51:06 -04:00 |
|
|
KiwiandGitHub
|
259f98a4ec
|
Merge pull request #697 from coralproject/bug-sweep
Bug sweep
|
2017-06-22 01:05:11 +07:00 |
|
|
Chi Vinh Le
|
f7a8f9bbd1
|
Oops this comment needs a rewrite
|
2017-06-22 00:59:04 +07:00 |
|
|
KiwiandGitHub
|
83096dbcce
|
Merge branch 'master' into bug-sweep
|
2017-06-22 00:52:30 +07:00 |
|
|
KiwiandGitHub
|
555a71fd9b
|
Merge pull request #695 from coralproject/bug-killing-spree
Bug killing spree
|
2017-06-22 00:52:00 +07:00 |
|
|
KiwiandGitHub
|
2c57ec3c7c
|
Merge branch 'master' into bug-killing-spree
|
2017-06-22 00:47:27 +07:00 |
|
|
Chi Vinh Le
|
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 |
|
|
Belén CurcioandGitHub
|
a31810ddf4
|
Merge branch 'master' into bug-sweep
|
2017-06-21 14:43:32 -03:00 |
|
|
Belén CurcioandGitHub
|
f6b2a25e72
|
Merge pull request #687 from coralproject/pat
Tokens
|
2017-06-21 14:43:05 -03:00 |
|
|
Wyatt JohnsonandGitHub
|
bd7443672a
|
Merge branch 'master' into pat
|
2017-06-21 11:36:47 -06:00 |
|
|
Belén CurcioandGitHub
|
358ea0d37c
|
Merge branch 'master' into bug-sweep
|
2017-06-21 14:35:50 -03:00 |
|
|
KiwiandGitHub
|
c0dcfe5f4e
|
Merge pull request #694 from coralproject/copy
withCopyToClipboard & ButtonCopyToClipboard
|
2017-06-22 00:35:25 +07:00 |
|
|
Wyatt Johnson
|
91b7cd10f8
|
fixing all the 👻
|
2017-06-21 11:35:00 -06:00 |
|
|
Wyatt Johnson
|
f537b4a772
|
Merge branch 'master' into pat
|
2017-06-21 11:34:18 -06:00 |
|
|
Belen Curcio
|
a9cefd8cbd
|
deleting old ref
|
2017-06-21 14:23:51 -03:00 |
|
|
Belen Curcio
|
f08c2f4152
|
Merge branch 'copy' of github.com:coralproject/talk into copy
|
2017-06-21 13:31:53 -03:00 |
|
|
Belen Curcio
|
cdcd543fe0
|
good looking export
|
2017-06-21 13:30:09 -03:00 |
|
|
Belen Curcio
|
66aec74b38
|
good looking export
|
2017-06-21 13:29:44 -03:00 |
|
|
Belen Curcio
|
85dcc8d0ec
|
Merge branch 'master' of github.com:coralproject/talk into copy
|
2017-06-21 13:28:33 -03:00 |
|