From 41a36e2e1877b4a2ab6751c011e80582f8ccbcf2 Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Wed, 23 May 2018 01:14:52 +0200 Subject: Add privacy and ToS links To be GDPR compliant we need to provide privacy statement. These should be linked on the index page. So as soon as a document exist under `public/docs/privacy.md` the link will show up. Since we already add legal links, we also add Terms of Use, which will show up as soon as `public/docs/terms-of-use.md` exists. This should allow everyone to provide the legal documents they need for GDPR and other privacy and business laws. Signed-off-by: Sheogorath --- public/views/index/body.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'public') diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs index d8766fec..e3a3a85c 100644 --- a/public/views/index/body.ejs +++ b/public/views/index/body.ejs @@ -147,7 +147,7 @@

- © 2018 HackMD | <%= __('Releases') %> + © 2018 HackMD | <%= __('Releases') %><% if(privacyStatement) { %> | <%= __('Privacy') %><% } %><% if(termsOfUse) { %> | <%= __('Terms of Use') %><% } %>

<%- __('Follow us on %s and %s.', ' GitHub, Twitter', ' Facebook') %> -- cgit v1.2.3 From 9fd09a8dfb8c59a44e9b2b51658e9e638a855635 Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Fri, 25 May 2018 17:03:35 +0200 Subject: Add delete user UI This provides the UI for the delete user feature introduced in 4229084c6211db3d22cd9abec99b957725650b9e Placing of the user delete button is not perfect, but can be moved to an own user tab later on. Signed-off-by: Sheogorath --- public/js/cover.js | 20 ++++++++++++-------- public/views/index/body.ejs | 33 +++++++++++++++++++++++++++------ 2 files changed, 39 insertions(+), 14 deletions(-) (limited to 'public') diff --git a/public/js/cover.js b/public/js/cover.js index c9c2b6cb..2a09b4c3 100644 --- a/public/js/cover.js +++ b/public/js/cover.js @@ -39,7 +39,7 @@ const options = { '' + '
' + '
' + - '
' + + '
' + '
' + '

' + '

' + @@ -208,8 +208,8 @@ function historyCloseClick (e) { e.preventDefault() const id = $(this).closest('a').siblings('span').html() const value = historyList.get('id', id)[0]._values - $('.ui-delete-modal-msg').text('Do you really want to delete below history?') - $('.ui-delete-modal-item').html(` ${value.text}
${value.time}`) + $('.ui-delete-history-modal-msg').text('Do you really want to delete below history?') + $('.ui-delete-history-modal-item').html(` ${value.text}
${value.time}`) clearHistory = false deleteId = id } @@ -277,7 +277,7 @@ function deleteHistory () { checkHistoryList() } } - $('.delete-modal').modal('hide') + $('.delete-history-modal').modal('hide') deleteId = null clearHistory = false }) @@ -297,12 +297,12 @@ function deleteHistory () { deleteId = null }) } - $('.delete-modal').modal('hide') + $('.delete-history-modal').modal('hide') clearHistory = false }) } -$('.ui-delete-modal-confirm').click(() => { +$('.ui-delete-history-modal-confirm').click(() => { deleteHistory() }) @@ -342,8 +342,8 @@ $('.ui-open-history').bind('change', e => { }) $('.ui-clear-history').click(() => { - $('.ui-delete-modal-msg').text('Do you really want to clear all history?') - $('.ui-delete-modal-item').html('There is no turning back.') + $('.ui-delete-history-modal-msg').text('Do you really want to clear all history?') + $('.ui-delete-history-modal-item').html('There is no turning back.') clearHistory = true deleteId = null }) @@ -371,6 +371,10 @@ $('.ui-refresh-history').click(() => { }) }) +$('.ui-delete-user-modal-cancel').click(() => { + $('.ui-delete-user').parent().removeClass('active') +}) + $('.ui-logout').click(() => { clearLoginState() location.href = `${serverurl}/logout` diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs index e3a3a85c..d4350540 100644 --- a/public/views/index/body.ejs +++ b/public/views/index/body.ejs @@ -27,6 +27,7 @@

@@ -108,7 +109,7 @@ - + @@ -157,8 +158,8 @@
- - -- cgit v1.2.3 From 75f28ca7f3600ab6483f38ad47a0c8430858f5c3 Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Sat, 26 May 2018 03:19:10 +0200 Subject: Add export data UI This adds the UI for the export feature introduced in bcbb8c67c9f8092643c318140f6613324f306bd2 It allows to download all notes from the main page in the default user submenu. Signed-off-by: Sheogorath --- public/views/index/body.ejs | 1 + 1 file changed, 1 insertion(+) (limited to 'public') diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs index f28ab11d..a7c5a0b8 100644 --- a/public/views/index/body.ejs +++ b/public/views/index/body.ejs @@ -27,6 +27,7 @@ -- cgit v1.2.3 From fce735e833f91a0f1d17c518b65c4c724d1a4b4d Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Mon, 28 May 2018 09:26:21 +0200 Subject: Add privacy policy example As we use various services and integration we should provide an example privacy policy. It has to be adjust when using it to match your setup. Signed-off-by: Sheogorath --- public/docs/privacy.md.example | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 public/docs/privacy.md.example (limited to 'public') diff --git a/public/docs/privacy.md.example b/public/docs/privacy.md.example new file mode 100644 index 00000000..08bf9091 --- /dev/null +++ b/public/docs/privacy.md.example @@ -0,0 +1,17 @@ +Privacy +=== + +We process the following data, for the following purposes: + +|your data|our usage| +|---------|---------| +|IP-Address|Used to communicate with your browser and our servers. It's may exposed to third-parties which provide resources for this service. These services are, depending on your login method, the document you visit and the setup of this instance: Google, Disqus, MathJax, GitHub, SlideShare/LinkedIn, yahoo, Gravatar, Imgur, Amazon, and Cloudflare.| +|Usernames and profiles|Your username as well as user profiles that are connected with it are transmitted and stored by us to provide a useful login integration with services like GitHub, Facebook, Twitter, GitLab, Dropbox, Google. Depending on the setup of this HackMD instance there are maybe other third-parties involved using SAML, LDAP or the integration with a Mattermost instance.| +|Profile pictures| Your profile picture is either loaded from the service you used to login, the HackMD instance or Gravatar.| +|Uploaded pictures| Pictures that are uploaded for documents are either uploaded to Amazon S3, Imgur, a minio instance or the local filesystem of the HackMD server.| + +All account data and notes are stored in a mysql/postgres/sqlite database. Besides the user accounts and the document themselves also relationships between the documents and the user accounts are stored. This includes ownership, authorship and revisions of all changes made during the creation of a note. + +To delete your account and all your notes owned by your user account, you can find a button in the drop down menu on the front page. + +The deletion of guest notes is not possible. These don't have any ownership and this means we can't connect these to you or anyone else. If you participated in a guest note or a note owned by someone else, your authorship for the revisions is removed from these notes as well. But the content you created will stay in place as the integrity of these notes has to stay untouched. -- cgit v1.2.3