Kim Gardner
2063c4a90e
Fixes per code review
2017-10-10 16:24:49 +01:00
Belén Curcio
4d0d0735e8
Merge branch 'master' into viewing-options
2017-10-10 12:20:59 -03:00
Kiwi
bd73140f23
Merge branch 'master' into ReadersNotifications
2017-10-10 15:38:54 +02:00
Kim Gardner
b77c330823
Update i18n code
2017-10-10 14:02:07 +01:00
Kim Gardner
9f02165aa6
Merge branch 'master' of git+ssh://github.com/coralproject/talk into danish-lang-config
2017-10-10 14:01:12 +01:00
Kim Gardner
522857f0d6
Merge pull request #1079 from Rarer/Danish-Translation
...
Danish translation
2017-10-10 13:59:58 +01:00
Kim Gardner
f1e81575cb
Update i18n config to support Danish
2017-10-10 13:56:47 +01:00
Kim Gardner
69ace56172
Merge branch 'master' into Danish-Translation
2017-10-10 13:08:44 +01:00
Kim Gardner
0a991c938a
Merge branch 'master' into talk-product-guide
2017-10-10 13:08:23 +01:00
Kim Gardner
d6e7bb0a0a
Merge branch 'master' into flags-locales
2017-10-10 13:08:19 +01:00
Kim Gardner
6a2b6bb845
Merge branch 'master' into ReadersNotifications
2017-10-10 13:07:37 +01:00
Kim Gardner
78857e8de0
Merge branch 'master' into ie11-issues
2017-10-10 13:07:03 +01:00
Kim Gardner
3c7e0462f5
Merge branch 'master' into cannot-ignore-staff
2017-10-10 13:06:54 +01:00
Kim Gardner
c0a54b6538
Merge branch 'master' into viewing-options
2017-10-10 13:06:18 +01:00
Kim Gardner
15f07b1360
Merge pull request #1068 from tylerbrewer2/fix-shortcut-icon
...
fix hidden shortcut icon
2017-10-10 13:05:20 +01:00
Chi Vinh Le
61604a7d07
Export ConfigureCard in plugin-api
2017-10-10 17:06:45 +07:00
Chi Vinh Le
dfcb9e24df
Refactor components
2017-10-10 17:00:25 +07:00
Belen Curcio
7b38bac525
Stories Dropdown, Proptypes and tiny refactor
2017-10-10 03:18:28 -03:00
Belen Curcio
16847f9fec
Translations and PropTypes
2017-10-10 02:48:12 -03:00
Belen Curcio
71af62585a
Adding Dropdown and Option Compoennt
2017-10-10 02:47:51 -03:00
Belén Curcio
29c7c9e810
Merge branch 'master' into viewing-options
2017-10-10 00:18:03 -03:00
PepeFranco
c81d9c0bd1
Added notifications when flagging failed
2017-10-09 21:59:47 -05:00
Facu
0519b1d1ff
fix 1071
2017-10-09 15:41:06 -03:00
Morten Nissen
046a17801e
Fixed some mistakes, and general proof reading
2017-10-09 20:38:29 +02:00
Chi Vinh Le
21342b8b81
Fix title styling
2017-10-09 23:56:16 +07:00
Chi Vinh Le
ec436bcb39
Refactor Configure styles
2017-10-09 23:50:43 +07:00
Chi Vinh Le
59eff3e29e
Refactor moderationSettings styles
2017-10-09 23:37:37 +07:00
Chi Vinh Le
574cbf8e79
Refactor TechSettings styles
2017-10-09 23:28:32 +07:00
Chi Vinh Le
b3fc920919
Refactor EmbedLink styles
2017-10-09 23:26:15 +07:00
Chi Vinh Le
1d089ee151
Refactor Domainlist styles
2017-10-09 23:00:21 +07:00
Chi Vinh Le
0434ecf755
Refactor Wordlist styles
2017-10-09 22:58:58 +07:00
Tyler Brewer
48c291a9c3
Merge branch 'master' into fix-shortcut-icon
2017-10-09 11:01:26 -04:00
Chi Vinh Le
c0ff9c1beb
Merge branch 'master' into refactor-configure
...
Conflicts:
client/coral-admin/src/routes/Moderation/components/Moderation.js
2017-10-09 21:30:03 +07:00
Chi Vinh Le
3d3e0491a4
Remove updateWordlist and add test
2017-10-09 21:13:47 +07:00
Chi Vinh Le
c52e42c644
Allow changing wordlist and domains using the updateSettings mutation
2017-10-09 16:51:27 +07:00
Kiwi
77d30bdbc1
Merge pull request #1066 from gerardogalvez/moderate-shortcuts
...
Add moderator shortcuts to open search and switch between queues.
2017-10-09 08:59:03 +02:00
Daniel Janeiro
efdf7a6b25
Handle IgnoreUser mutation errors
...
We now check if the IgnoreUser mutation returned an error before
updating the apollo store. If the mutation returns an error we keep
the store as it is, otherwise the user is added to the ignore list.
2017-10-07 23:02:33 +01:00
Daniel Janeiro
7eaad1541b
Implement cannot ignore staff in users service
...
`UsersService.ignoreUsers` now checks if any user provided is a staff
member. In case it is it throws a ErrCannotIgnoreStaff error.
2017-10-07 23:02:25 +01:00
Daniel Janeiro
0c7b35ffde
Add cannot ignore staff error
2017-10-07 21:51:58 +01:00
Gerardo Galvez
e4ff48ea88
Merge branch 'moderate-shortcuts' of https://github.com/gerardogalvez/talk into moderate-shortcuts
2017-10-06 20:20:48 -05:00
Gerardo Galvez
cbd7337dbc
Add spanish translations and cleaner way to get the activeTabIndex
2017-10-06 20:19:30 -05:00
Morten Nissen
c0e9836a57
Added danish translation
2017-10-07 01:50:11 +02:00
Belén Curcio
c7bf3c1a3c
Merge branch 'master' into moderate-shortcuts
2017-10-06 18:07:30 -03:00
Tyler Brewer
bb78ba9b0b
Merge branch 'master' into fix-shortcut-icon
2017-10-06 16:09:59 -04:00
Kiwi
62834ae412
Merge pull request #1067 from lancekruegger/Issue-1024-forgot-password-flow
...
Update forgot password flow to match site styling
2017-10-06 21:43:14 +02:00
David Erwin
0c62ff0f9f
Merge branch 'master' into Issue-1024-forgot-password-flow
2017-10-06 15:38:26 -04:00
Kiwi
380f20d525
Merge pull request #1072 from kamos1/fix-1037
...
fix issue 1037
2017-10-06 21:35:45 +02:00
Lance Ruegger
252ec8f6ac
Change full constructor to use class property, fix typo in handleChangeEmail, pass value to TextField to ensure they stay in sync.
2017-10-06 12:26:03 -07:00
kamos1
e95e0381c2
remove removeNewLine and add .trim to length variable
2017-10-06 13:25:32 -06:00
kamos1
8ab31d7009
add trim to prevent empty spaces, tabs and other whitespace characters
2017-10-06 13:19:37 -06:00