Commit Graph

7162 Commits

Author SHA1 Message Date
Kim Gardner 674d7837f6 Change logo size 2017-10-11 10:38:23 +01:00
Kim Gardner b827abffbb Update Readme 2017-10-11 10:32:35 +01:00
Kim Gardner a48bfbaa69 Merge branch 'master' into dropdown 2017-10-11 09:49:19 +01:00
Kim Gardner dcfdec4df1 Merge branch 'master' into cannot-ignore-staff 2017-10-11 09:49:06 +01:00
Kim Gardner 0fde69608a Merge branch 'master' into count-whitespace-to-char-max 2017-10-11 09:29:19 +01:00
Kim Gardner 0225d38560 Merge pull request #1083 from coralproject/refactor-configure
Refactor Configure, Add Slots
2017-10-11 09:26:37 +01:00
Chi Vinh Le 34178919dc Count leading and trailing whitespace towards char count 2017-10-11 15:16:21 +07:00
Chi Vinh Le 7b76450eb5 Merge branch 'master' into refactor-configure
Conflicts:
	client/coral-admin/src/routes/Configure/components/Configure.css
	client/coral-admin/src/routes/Moderation/components/Moderation.js
2017-10-11 14:17:36 +07:00
Kiwi 3adc3e87cd Merge pull request #1084 from coralproject/danish-lang-config
Update i18n config to support new Danish translation
2017-10-11 09:03:50 +02:00
Kiwi b25fa9c7f3 Merge branch 'master' into danish-lang-config 2017-10-11 08:51:07 +02:00
Kiwi f712e426e2 Merge pull request #1081 from PepeFranco/ReadersNotifications
Added notifications when flagging failed
2017-10-11 08:50:52 +02:00
Kiwi a9882c8904 Merge branch 'master' into danish-lang-config 2017-10-11 08:45:16 +02:00
Kiwi a0f9242f02 Merge branch 'master' into ReadersNotifications 2017-10-11 08:44:36 +02:00
Wyatt Johnson fa6c0afe93 Merge pull request #1085 from coralproject/snyk-fix-cdba6ef9
[Snyk Update] New fixes for 4 vulnerable dependency paths
2017-10-11 00:36:52 -06:00
Chi Vinh Le 1d2f7b5298 Use correct import path 2017-10-11 13:34:27 +07:00
snyk-bot 5f9d47a199 fix: package.json & .snyk to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/npm:mime:20170907


The following vulnerabilities are fixed with a Snyk patch:
- https://snyk.io/vuln/npm:marked:20170112

Latest report for coralproject/talk:
https://snyk.io/test/github/coralproject/talk
2017-10-11 02:07:15 +00:00
Wyatt Johnson 29d7494385 fixed more yaml issues, added lint step 2017-10-10 14:04:37 -06:00
Kim Gardner 6145fd2855 Merge branch 'danish-lang-config' of git+ssh://github.com/coralproject/talk into danish-lang-config 2017-10-10 19:27:24 +01:00
Jose Franco 14d2b63f2e Merge branch 'master' into ReadersNotifications 2017-10-10 12:58:43 -05:00
PepeFranco cf59bb213c Changed FlagButton to use getErrorMessages util for failed flagging instead of custom messages 2017-10-10 12:55:32 -05:00
PepeFranco cecf2f4606 Merge branch 'ReadersNotifications' of https://github.com/PepeFranco/talk into ReadersNotifications 2017-10-10 12:54:51 -05:00
Kim Gardner bd7dfdbe55 Fix yml indentation 2017-10-10 18:52:53 +01:00
Wyatt Johnson 98ee3c7b55 Merge branch 'master' into danish-lang-config 2017-10-10 11:44:05 -06:00
Wyatt Johnson 0fc0e9c467 Merge branch 'master' into cannot-ignore-staff 2017-10-10 11:30:00 -06:00
Wyatt Johnson 91931b2e6f Merge branch 'master' into flags-locales 2017-10-10 11:22:59 -06:00
Wyatt Johnson cab94842aa small naming change 2017-10-10 11:22:19 -06:00
Wyatt Johnson 86c3c286ee Graph fixes and migrations
- Added migrations for mapping old keys
- Added migration for fixing old dont agree flags
- Removed enum requirement for output
2017-10-10 11:22:19 -06:00
Kim Gardner 398dedf75b Merge pull request #1080 from facuesr/ie11-issues
Fix issue 1071
2017-10-10 18:19:50 +01:00
Kim Gardner d11ac54e1d Merge branch 'master' into cannot-ignore-staff 2017-10-10 18:19:11 +01:00
Kim Gardner 764d562497 Merge branch 'master' into ReadersNotifications 2017-10-10 18:18:58 +01:00
Kim Gardner 4548134e3f Merge branch 'master' into dropdown 2017-10-10 18:18:34 +01:00
Kim Gardner 4efcd624c3 Merge branch 'master' into talk-product-guide 2017-10-10 18:14:37 +01:00
Kim Gardner 48af316380 Merge branch 'master' into ie11-issues 2017-10-10 18:13:28 +01:00
Kim Gardner 98f46409ca Merge pull request #1070 from coralproject/viewing-options
Viewing Options, and bug fixing
2017-10-10 18:13:09 +01:00
Kim Gardner dee5651709 Merge branch 'master' into ie11-issues 2017-10-10 18:09:54 +01:00
Belen Curcio c5cee13bd7 Accesibility 2017-10-10 13:24:56 -03:00
Kim Gardner e40a30d200 Fixes and cleanup 2017-10-10 17:17:04 +01:00
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