Kim Gardner and GitHub
e1b3eb9ff7
Merge branch 'master' into issue-676-set-domain-whitelist
2017-06-23 16:19:46 +01:00
Belén Curcio and GitHub
4bb64231e9
Merge branch 'master' into issue-676-set-domain-whitelist
2017-06-23 09:50:29 -03:00
Kiwi and GitHub
90bc9be1b2
Merge branch 'master' into redirect-to-all
2017-06-23 18:29:52 +07:00
Kiwi and GitHub
6d5b8e73d4
Merge branch 'master' into redirect-to-all
2017-06-23 18:18:18 +07:00
Kiwi and GitHub
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
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
A Lawliet
bba4474858
Search dropdown: clear search when closed
2017-06-22 01:51:06 -04:00
Kiwi and GitHub
83096dbcce
Merge branch 'master' into bug-sweep
2017-06-22 00:52:30 +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 and GitHub
358ea0d37c
Merge branch 'master' into bug-sweep
2017-06-21 14:35:50 -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 and GitHub
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
Kim Gardner and GitHub
e2f94aa141
Merge branch 'master' into show-version-in-nav
2017-06-21 14:29:49 +01:00
Chi Vinh Le
91fa7b2d8d
Show correct login error messages in admin
2017-06-21 20:24:54 +07:00
Kim Gardner
74fff2f1ac
Add all stories link to story search dropdown
2017-06-21 14:14:33 +01:00
Chi Vinh Le
4b063607ab
Return the returns
2017-06-21 20:04:38 +07:00
Chi Vinh Le
9b26bc9d96
Fix Typo
2017-06-21 19:53:00 +07:00
Chi Vinh Le
9815248b8d
Prevent errors being swallowed
2017-06-21 19:17:48 +07:00
Chi Vinh Le
fc14e9d2fd
Prevent double execution of fetchMore
2017-06-21 01:29:10 +07:00
Chi Vinh Le
49420e152e
Click outside closes TopRightMenu, detect click outside iframe
2017-06-21 01:29:10 +07:00
Chi Vinh Le
644c291d7f
Don't cut off long comment
2017-06-21 01:29:07 +07:00
Belen Curcio
942ea7b916
ButtonCopyToClipboard
2017-06-20 10:37:10 -03:00
Chi Vinh Le
4d53a72767
Always default to all queue
2017-06-20 20:00:00 +07:00
Belen Curcio
d97fb0a83f
Refs by ReactDOMNode
2017-06-20 09:47:37 -03:00
Chi Vinh Le
14311dc298
Merge branch 'master' into subscribe-mod-actions
...
Conflicts:
client/coral-admin/src/routes/Moderation/components/Comment.js
2017-06-20 19:34:56 +07:00
Belen Curcio
7faa00c463
withCopyToClipboard
2017-06-20 09:05:01 -03:00
Belen Curcio
d23d426567
Adding the translations
2017-06-20 08:37:53 -03:00
Belen Curcio
fe8f3ae4bb
Moving Copy component
2017-06-20 08:32:08 -03:00
Kim Gardner
646b5be8c8
Show version in nav
2017-06-20 10:48:01 +01:00
Kim Gardner and GitHub
672e36c66c
Merge branch 'master' into fixes
2017-06-20 09:54:38 +01:00
Kim Gardner and GitHub
38a53d61f3
Merge branch 'master' into fixes
2017-06-20 09:53:24 +01:00
Kim Gardner and GitHub
fc15bcae4e
Merge branch 'master' into keyboard-shortcuts
2017-06-20 09:46:04 +01:00
Belen Curcio
99bb4b7198
New Links
2017-06-19 18:09:38 -03:00
Belen Curcio
12a5654fb8
Keyboard shorcuts working
2017-06-19 17:48:20 -03:00
Belen Curcio
dad6534011
Fix close modal
2017-06-19 17:26:57 -03:00
Belen Curcio
c36a0bc9e9
d approve and f reject
2017-06-19 17:23:57 -03:00
Belen Curcio
16ef833fd8
Ádding Copy component, and UserDetail fic
2017-06-19 16:17:50 -03:00
Chi Vinh Le
523f23269b
Translate, pep up notifications
2017-06-20 01:38:38 +07:00
Chi Vinh Le
b8967dcdb4
More accurate loading detection
2017-06-20 01:09:37 +07:00
Chi Vinh Le
70276c3358
Fix subscription issues
2017-06-20 01:01:39 +07:00
Chi Vinh Le
fbbd0fa027
Merge branch 'master' into subscribe-mod-actions
...
Conflicts:
client/coral-admin/src/routes/Moderation/components/Moderation.js
client/coral-admin/src/routes/Moderation/components/styles.css
client/coral-admin/src/routes/Moderation/containers/Moderation.js
2017-06-19 23:52:10 +07:00
Chi Vinh Le
0cd3921f44
Simplification
2017-06-19 21:29:33 +07:00
Chi Vinh Le
f954d2be90
Better loading detection
2017-06-19 21:23:30 +07:00
Chi Vinh Le
e1bc1476ea
Remove the need for querying all assets
2017-06-19 21:08:12 +07:00