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
bc878051f8
Merge branch 'master' into issue-676-set-domain-whitelist
2017-06-24 00:22:34 +07:00
18a767b8a4
Merge branch 'master' into refactor-ban-suspend-actions
2017-06-23 22:24:01 +07: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
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
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
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
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
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
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
83096dbcce
Merge branch 'master' into bug-sweep
2017-06-22 00:52:30 +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
358ea0d37c
Merge branch 'master' into bug-sweep
2017-06-21 14:35:50 -03:00
85dcc8d0ec
Merge branch 'master' of github.com:coralproject/talk into copy
2017-06-21 13:28:33 -03:00
9d572f6c3b
Add proptype
2017-06-21 22:27:13 +07:00
012ff926eb
Use router for 'moderate all' link and only show when necessary
2017-06-21 22:21:42 +07:00
4a354f0b9a
Merge branch 'master' into bug-sweep
2017-06-21 21:48:35 +07:00
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
57ecba6f33
Remove unessecary binds
2017-06-21 21:36:27 +07:00
f709057933
Require username to be different when editing it
2017-06-21 21:18:28 +07:00
ac89ddc43f
Show user details from flag history
2017-06-21 11:04:45 -03:00
b0156fa11f
missing header css
2017-06-21 10:53:12 -03:00
16eb93792b
Merge branch 'master' of github.com:coralproject/talk into bugs-fix
2017-06-21 10:43:28 -03:00
1b1f2a3608
Changing moderation keys: d approve and f reject
2017-06-21 10:42:01 -03:00
e2f94aa141
Merge branch 'master' into show-version-in-nav
2017-06-21 14:29:49 +01:00
91fa7b2d8d
Show correct login error messages in admin
2017-06-21 20:24:54 +07:00
74fff2f1ac
Add all stories link to story search dropdown
2017-06-21 14:14:33 +01:00
4b063607ab
Return the returns
2017-06-21 20:04:38 +07:00
9b26bc9d96
Fix Typo
2017-06-21 19:53:00 +07:00
38eaff5397
Don't render title when it's null
2017-06-21 19:41:22 +07:00
420513804c
Show correct notification message when edit fails
2017-06-21 19:37:19 +07:00
b0079c191b
Remove non existant 'truthy' tests
2017-06-21 19:31:55 +07:00
9815248b8d
Prevent errors being swallowed
2017-06-21 19:17:48 +07:00
79346738d7
Have Moderate this Stream link also default to All
2017-06-21 13:01:23 +01:00
706a12d2e2
No MoreMore
2017-06-21 02:48:59 +07:00
fc14e9d2fd
Prevent double execution of fetchMore
2017-06-21 01:29:10 +07:00
Belén Curcio