Commit Graph

8345 Commits

Author SHA1 Message Date
Kim Gardner 69acb6d5a0 Fix typos and clean up styling 2017-10-12 14:06:09 +01:00
Kim Gardner 58aff2487a Merge pull request #1093 from coralproject/user-search
User Search Improvements
2017-10-12 13:39:50 +01:00
Kim Gardner 4f72f5d4ae Merge branch 'master' into user-search 2017-10-12 13:25:23 +01:00
Kim Gardner 27c44e942e Merge pull request #1086 from coralproject/count-whitespace-to-char-max
Count leading and trailing whitespace towards char count
2017-10-12 13:22:49 +01:00
Kim Gardner 22bbe5c614 Merge branch 'master' into user-search 2017-10-12 13:15:21 +01:00
Kim Gardner bccce1d9bd Merge branch 'master' into count-whitespace-to-char-max 2017-10-12 13:11:28 +01:00
Kim Gardner a914cf1591 Merge branch 'master' into dropdown 2017-10-12 13:10:25 +01:00
Kim Gardner ba7ee5d327 Merge pull request #1092 from coralproject/snyk-patch
SNYK Patch of yarn.lock
2017-10-12 13:09:51 +01:00
Kim Gardner f035a9d1e9 Flagged Usernames --> Reported Usernames 2017-10-12 13:05:13 +01:00
Kim Gardner 1c6f3b80c4 Merge branch 'master' into snyk-patch 2017-10-12 11:27:58 +01:00
Kim Gardner 1b00cdbea3 Merge pull request #1063 from coralproject/talk-product-guide
Talk Product Guide - part 1
2017-10-12 11:27:02 +01:00
Kiwi 1e41ae9402 Merge branch 'master' into count-whitespace-to-char-max 2017-10-12 10:26:23 +02:00
Wyatt Johnson 86f48cea96 Modified user search to include whole word search 2017-10-11 16:41:09 -06:00
Wyatt Johnson 94f4c57038 patched 2017-10-11 15:38:08 -06:00
Wyatt Johnson 97eee92499 updated docs 2017-10-11 15:32:25 -06:00
Kim Gardner 5dfc5d87ad Merge branch 'master' into dropdown 2017-10-11 17:04:04 +01:00
Chi Vinh Le e4399b734e Use TALK_ROOT_URL, global timeout, other improvements 2017-10-11 21:02:46 +07:00
Kim Gardner 09ecd2a055 Merge branch 'master' into talk-product-guide 2017-10-11 14:20:18 +01:00
Kiwi 1fffa1427d Merge pull request #1089 from coralproject/add-testing-info-to-readme
Small Readme tweaks
2017-10-11 15:03:39 +02:00
Chi Vinh Le cde3c4e17e Move logs to test/e2e 2017-10-11 20:01:27 +07:00
Kim Gardner ac28106251 Add docs on Toxic Comments 2017-10-11 13:56:35 +01:00
Chi Vinh Le 3abbe3119d E2e with nightwatch and browserstack 2017-10-11 19:50:13 +07:00
Kim Gardner 1dd1a0d986 Update Trust details and update nav 2017-10-11 13:43:48 +01:00
Kim Gardner a7d87f4ee1 Add Trust Product Docs 2017-10-11 13:34:15 +01:00
Kim Gardner 025d0cf812 Merge branch 'master' into talk-product-guide 2017-10-11 12:41:24 +01:00
Kim Gardner 8ac93c9785 Merge branch 'master' into count-whitespace-to-char-max 2017-10-11 11:26:50 +01:00
Kim Gardner 1ec71ebd00 Merge branch 'master' into cannot-ignore-staff 2017-10-11 11:26:45 +01:00
Kim Gardner 48d4eeddf3 Merge branch 'master' into dropdown 2017-10-11 11:26:35 +01:00
Kim Gardner 0615be9ab4 Merge branch 'master' into add-testing-info-to-readme 2017-10-11 11:26:07 +01:00
Kim Gardner e0dc41b721 Merge pull request #1088 from coralproject/add-testing-info-to-readme
Add Testing section to Readme with Browserstack logo
2017-10-11 11:22:09 +01:00
Kim Gardner b46ad5448c Update readme 2017-10-11 11:08:19 +01:00
Kiwi 8e9e61a610 Update README.md 2017-10-11 12:05:25 +02:00
Kim Gardner 341e8d9af6 Cleanup license text 2017-10-11 10:40:28 +01:00
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