Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Terms and Conditions #47

Merged
merged 5 commits into from May 9, 2018
Merged

Update Terms and Conditions #47

merged 5 commits into from May 9, 2018

Conversation

@annashipman
Copy link
Member

@annashipman annashipman commented Apr 30, 2018

This PR updates the T&Cs for the site to clarify how we use users' data. Comments are very welcome, particularly on whether we need c598b9d or whether that is too much information.

annashipman added 3 commits Apr 30, 2018
This was `if... else if...` but in Jekyll it should actually be `if... elsif...`. The error meant that all pages on the site except the homepage were being set as `body class='programme', which had the effect of `<ul>` on the T&Cs page not showing up (in the programme, unordered lists are used structurally).
This is just making it all into a list and a couple of small grammatical changes.
Including translating it into clearer language.
<h3>Your other data</h3>
<p><ul>
<li>If your session is accepted, the information you provide (not including your email address) will be published.</li>
<li>If you submit session proposals, or give feedback or reviews to other sessions, they appear anonymous to other users but can be traced to you in the database through your user id and your name be seen by the programme committee at the time of the programme meeting.</li>

This comment has been minimized.

@jennyd

jennyd May 1, 2018
Contributor

"your name can/may/will be seen"?

@jennyd
Copy link
Contributor

@jennyd jennyd commented May 4, 2018

We don't have an easily findable link to the terms and conditions page any more - it was linked from the "Lead a session" page but we've removed that from the navigation now. Maybe there should be a link in the footer to it?

@annashipman
Copy link
Member Author

@annashipman annashipman commented May 9, 2018

Thanks @jennyd, both good points. I'll update them before I merge this, and merge this before sending my email.

I'm not sure if this extra detail is necessary.
@annashipman annashipman force-pushed the update-t-and-cs branch from c598b9d to 3d68cde May 9, 2018
@annashipman annashipman changed the title Update Terms and Conditions - comments please Update Terms and Conditions May 9, 2018
@annashipman
Copy link
Member Author

@annashipman annashipman commented May 9, 2018

I've made those changes, including adding T&Cs to the footer.

@annashipman annashipman merged commit a3f2729 into master May 9, 2018
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@annashipman annashipman deleted the update-t-and-cs branch May 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants