 David Erwin
|
57e0a160a2
|
Add plugins overview and quickstart
|
2017-06-22 17:25:01 -04:00 |
|
|
Belén Curcio
|
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 |
|
|
Kiwi
|
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 Gardner
|
cfd55907bd
|
Merge branch 'master' into bugs-fix
|
2017-06-22 14:34:04 +01:00 |
|
|
Kim Gardner
|
91907e7647
|
Merge branch 'master' into master
|
2017-06-22 14:28:01 +01:00 |
|
|
Kim Gardner
|
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 Gardner
|
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 Gardner
|
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 |
|
|
Kiwi
|
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 |
|
|
Kiwi
|
83096dbcce
|
Merge branch 'master' into bug-sweep
|
2017-06-22 00:52:30 +07:00 |
|
|
Kiwi
|
555a71fd9b
|
Merge pull request #695 from coralproject/bug-killing-spree
Bug killing spree
|
2017-06-22 00:52:00 +07:00 |
|
|
Kiwi
|
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 Curcio
|
a31810ddf4
|
Merge branch 'master' into bug-sweep
|
2017-06-21 14:43:32 -03:00 |
|
|
Belén Curcio
|
f6b2a25e72
|
Merge pull request #687 from coralproject/pat
Tokens
|
2017-06-21 14:43:05 -03:00 |
|
|
Wyatt Johnson
|
bd7443672a
|
Merge branch 'master' into pat
|
2017-06-21 11:36:47 -06:00 |
|
|
Belén Curcio
|
358ea0d37c
|
Merge branch 'master' into bug-sweep
|
2017-06-21 14:35:50 -03:00 |
|
|
Kiwi
|
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 |
|
|
Chi Vinh Le
|
9d572f6c3b
|
Add proptype
|
2017-06-21 22:27:13 +07:00 |
|
|
Chi Vinh Le
|
012ff926eb
|
Use router for 'moderate all' link and only show when necessary
|
2017-06-21 22:21:42 +07:00 |
|
|
Kiwi
|
91fd8ceabd
|
Merge branch 'master' into copy
|
2017-06-21 21:52:51 +07:00 |
|
|
Kiwi
|
4a354f0b9a
|
Merge branch 'master' into bug-sweep
|
2017-06-21 21:48:35 +07:00 |
|
|
Chi Vinh Le
|
3beb62f837
|
Merge branch 'master' into bug-killing-spree
Conflicts:
client/coral-admin/src/routes/Moderation/components/UserDetail.js
|
2017-06-21 21:47:01 +07:00 |
|
|
Chi Vinh Le
|
57ecba6f33
|
Remove unessecary binds
|
2017-06-21 21:36:27 +07:00 |
|
|
Kim Gardner
|
712a53db24
|
Merge pull request #693 from coralproject/show-version-in-nav
Show Talk version number in nav
|
2017-06-21 15:35:52 +01:00 |
|
|
Chi Vinh Le
|
f709057933
|
Require username to be different when editing it
|
2017-06-21 21:18:28 +07:00 |
|
|
Belen Curcio
|
ac89ddc43f
|
Show user details from flag history
|
2017-06-21 11:04:45 -03:00 |
|
|
Belen Curcio
|
b0156fa11f
|
missing header css
|
2017-06-21 10:53:12 -03:00 |
|
|
Belen Curcio
|
16eb93792b
|
Merge branch 'master' of github.com:coralproject/talk into bugs-fix
|
2017-06-21 10:43:28 -03:00 |
|
|
Belen Curcio
|
1b1f2a3608
|
Changing moderation keys: d approve and f reject
|
2017-06-21 10:42:01 -03:00 |
|
|
Chi Vinh Le
|
6628e6d08d
|
Correctly handle login with mixed case email
|
2017-06-21 20:34:33 +07:00 |
|
|
Kim Gardner
|
e2f94aa141
|
Merge branch 'master' into show-version-in-nav
|
2017-06-21 14:29:49 +01:00 |
|
|
Kim Gardner
|
f20b9819aa
|
Merge branch 'master' into copy
|
2017-06-21 14:29:36 +01:00 |
|
|
Chi Vinh Le
|
91fa7b2d8d
|
Show correct login error messages in admin
|
2017-06-21 20:24:54 +07:00 |
|