 Kim Gardner
|
b827abffbb
|
Update Readme
|
2017-10-11 10:32:35 +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
|
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 |
|
|
Kim Gardner
|
398dedf75b
|
Merge pull request #1080 from facuesr/ie11-issues
Fix issue 1071
|
2017-10-10 18:19:50 +01:00 |
|
|
Kim Gardner
|
764d562497
|
Merge branch 'master' into ReadersNotifications
|
2017-10-10 18:18:58 +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 |
|
|
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 |
|
|
Kim Gardner
|
569260a4b9
|
Fix configuration and alphabetize languages
|
2017-10-10 16:47:33 +01: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
|
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
|
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 |
|
|
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 |
|