Skip to content

Commit

Permalink
Merge pull request #608 from gwu-libraries/t600-tumblr-TOS
Browse files Browse the repository at this point in the history
Fixes #600 - Adds Tumblr TOS
  • Loading branch information
justinlittman authored Dec 20, 2016
2 parents d11a4d2 + 23e1291 commit 5a5e539
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions sfm/ui/templates/ui/terms_snippet.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class="well">
<p>Collecting and using data from social media platforms is subject to those platforms' terms (<a href="https://twitter.com/rules" target="_blank">Twitter</a>,
<a href="https://www.flickr.com/help/guidelines" target="_blank">Flickr</a>, <a href="http://www.weibo.com/signup/v5/protocol" target="_blank">Sina Weibo</a>),
<a href="https://www.flickr.com/help/guidelines" target="_blank">Flickr</a>, <a href="http://www.weibo.com/signup/v5/protocol" target="_blank">Sina Weibo</a>, <a href="https://www.tumblr.com/policy/en/terms-of-service" target="_blank">Tumblr</a>),
as you agreed to them when you created your social media account. Social Feed Manager respects those platforms' terms as an
application (<a href="https://dev.twitter.com/overview/terms/policy" target="_blank">Twitter</a>, <a href="https://www.flickr.com/services/developer" target="_blank">Flickr</a>, <a href="http://open.weibo.com/wiki/%E9%A6%96%E9%A1%B5" target="_blank">Sina Weibo</a>). </p>
application (<a href="https://dev.twitter.com/overview/terms/policy" target="_blank">Twitter</a>, <a href="https://www.flickr.com/services/developer" target="_blank">Flickr</a>, <a href="http://open.weibo.com/wiki/%E9%A6%96%E9%A1%B5" target="_blank">Sina Weibo</a>, <a href="https://www.tumblr.com/docs/en/api_agreement" target="_blank">Tumblr</a>). </p>

<p>Social Feed Manager provides data to you for your research and academic use. Social media platforms' terms of service <strong>generally do not allow
republishing of full datasets,</strong> and you should refer to their terms to understand what you may share.
Expand All @@ -11,4 +11,4 @@
<p>In addition to respecting the platforms' terms, as a user of Social Feed Manager and data collected within it, it is your
responsibility to consider the ethical aspects of collecting and using social media data. Your discipline or professional
organization may offer guidance. Here are <a href="http://gwu-libraries.github.io/sfm-ui/resources/ethics" target="_blank">a few resources to consider.</a></p>
</div>
</div>

0 comments on commit 5a5e539

Please sign in to comment.