From ca51357705769f815eadd674b357e34ca7e4590d Mon Sep 17 00:00:00 2001 From: Nick Freear Date: Thu, 6 Dec 2018 18:03:46 +0000 Subject: [PATCH] Bug #51, Edit CHANGELOG; add GDPR tags [iet:10993886][ci skip] --- .gitignore | 1 + README.md | 6 ++++++ docs/CHANGELOG.md | 12 +++++++++++- docs/privacy-ou-generic.html | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9f14ab8..ded0686 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ node_modules/ *.diff *.log *.tgz +*.xml /dropbox /*.html !index.html diff --git a/README.md b/README.md index c71c08d..29fbd7f 100644 --- a/README.md +++ b/README.md @@ -115,6 +115,10 @@ See the release notes in the [changelog][]. See the [contributing guide][contrib]. +## GDPR + +Details of GDPR / privacy actions can be found in [Bug #51][]. + ## License Distributed under the [GNU General Public License, version 3 or later][gpl]. @@ -164,4 +168,6 @@ Copyright © 2018 [The Open University][ou]. All rights reserved. ([Institute of [contrib]: docs/CONTRIBUTING.md [contrib-x]: https://github.com/IET-OU/our-journey/blob/master/docs/CONTRIBUTING.md +[Bug #51]: https://github.com/IET-OU/our-journey/issues/51 "GDPR/privacy" + [End]: //. diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 66c69d5..c5b3a7b 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -7,6 +7,15 @@ ## [Latest][] + * Embed demo video with _VTT_ captions on video page, #56; + +## v[1.5.0][] + + * _30 November 2018_; + * Added demonstration video (_MPEG-4_), with transcript, #56; + * keyboard nav fixes / floating editor code simplification + * easy save button and post it char limit tweak + * On load file display fixes; on load journey extends to correct length; * Add timing functionality (performance), #54; * Updated URLs in `test/example` HTML; * Site Javascript to link to privacy policy in footer, #51; @@ -18,7 +27,7 @@ * Fixed menu and editor keyboard accessibility, #44; * Fixed scrolling to adapt to user's … (_accessibility?_), #44, * Updated help page; - * Added privacy policy, #51; + * Added privacy policy (_GDPR_), #51; ## v[1.4.2][] @@ -101,6 +110,7 @@ See [spreadsheet][gdoc]. [1.4.2]: https://github.com/IET-OU/our-journey/releases/tag/1.4.2 "22 October (4a48769)" [1.4.7]: https://github.com/IET-OU/our-journey/commit/97f197a37884408fb "25 October (97f197a)" [1.4.10]: https://github.com/IET-OU/our-journey/releases/tag/1.4.10 "25 October (6b32aee)" +[1.5.0]: https://github.com/IET-OU/our-journey/commit/c280beeeb31f4486a#!-1.5.0 "30 November (c280bee)" [latest]: https://github.com/IET-OU/our-journey/commits "Currently unreleased commits" [changelog]: https://github.com/IET-OU/our-journey/blob/master/docs/CHANGELOG.md diff --git a/docs/privacy-ou-generic.html b/docs/privacy-ou-generic.html index 99581d7..d5bfcb6 100644 --- a/docs/privacy-ou-generic.html +++ b/docs/privacy-ou-generic.html @@ -1,4 +1,5 @@ +