Commit Graph

8775 Commits

Author SHA1 Message Date
Belen Curcio 0d66e42313 Merge branch 'viewing-options' of github.com:coralproject/talk into viewing-options 2017-10-10 13:16:37 -03:00
Belen Curcio 154949ff47 Update 2017-10-10 13:12:55 -03:00
Kim Gardner 33e25403e7 Rename file to da.yml 2017-10-10 17:04:27 +01:00
PepeFranco c8dc1f84e6 Merge branch 'master' of https://github.com/coralproject/talk into ReadersNotifications 2017-10-10 11:03:15 -05:00
Belen Curcio 7fcc7753f8 Update 2017-10-10 12:50:31 -03:00
Kim Gardner 569260a4b9 Fix configuration and alphabetize languages 2017-10-10 16:47:33 +01:00
Belen Curcio 2028e56f48 using props, not state for selected 2017-10-10 12:40:09 -03:00
Belen Curcio 1c535bda89 Lowering down the animation 2017-10-10 12:27:32 -03:00
Belen Curcio 1f9ff3f36d Merge branch 'dropdown' of github.com:coralproject/talk into dropdown 2017-10-10 12:27:18 -03:00
Belen Curcio 18b18a7aef Removing global listeners 2017-10-10 12:26:41 -03:00
Belen Curcio f2ea269f7a Merge branch 'master' of github.com:coralproject/talk into dropdown 2017-10-10 12:26:29 -03:00
Belen Curcio bbad09d271 Missing proptype 2017-10-10 12:26:06 -03:00
Belén Curcio 932cec27de Merge branch 'master' into dropdown 2017-10-10 12:25:18 -03:00
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