Merge pull request #177 from aopell/develop

Version 6.1

PRIVACY.md

@@ -0,0 +1,35 @@
+# Privacy Policy - Schoology Plus
+
+## Introduction
+
+It is Schoology Plus's policy to respect your privacy regarding any information we may collect while operating our browser extension. This Privacy Policy applies to the Schoology Plus browser extension for Chrome, Firefox, and Microsoft Edge (hereinafter, "us", "we", "the Extension", or "Schoology Plus"). We respect your privacy and are committed to protecting personally identifiable information accessible to us through the Extension. We have adopted this privacy policy ("Privacy Policy") to explain what information may be collected by our Extension, how we use this information, and under what circumstances we may disclose the information to third parties. This Privacy Policy applies only to information we collect through the Extension and does not apply to our collection of information from other sources.
+
+## Non Personally Identifying Information
+
+Like most website operators, Schoology Plus collects non-personally-identifying information of the sort that web browsers and servers typically make available, such as the browser type, language preference, referring site, and the date and time of each user request. Schoology Plus's purpose in collecting non-personally identifying information is to better understand how Schoology Plus's users use the Extension. From time to time, Schoology Plus may release non-personally-identifying information in the aggregate, e.g., by publishing a report on trends in the usage of the Extension.
+
+Schoology Plus uses Google Analytics to collect information for these purposes. If you would like to opt-out of tracking, you can install the [Google Analytics Opt-out Add-on](https://chrome.google.com/webstore/detail/google-analytics-opt-out/fllaojicojecljbmefodhfapmkghcbnh?hl=en) or another tracking-prevention extension.
+
+## Personally Identifying Information
+
+By using Schoology Plus, you grant us access to view and modify the contents of the Schoology website in your web browser. However, we DO NOT harvest or collect any information that can personally identify you longer than absolutely necessary to perform calculations or page enhancements. This information (including, but not limited to: school name, grades, and assignment details) is only modified locally and never leaves your computer. 
+
+## Aggregated Statistics
+
+Schoology Plus may collect statistics about the behavior of users. Schoology Plus may display this information publicly or provide it to others. However, Schoology Plus does not disclose your personally-identifying information.
+
+## Cookies
+
+To enrich and perfect your online experience, Schoology Plus uses "Cookies", similar technologies and services provided by others to display personalized content and store your preferences on your computer. A cookie is a string of information that a website stores on a user's computer, and that the user's browser provides to the website each time the user returns. Schoology Plus uses cookies to help us identify and track users' extension preferences. Schoology Plus users who do not wish to have cookies placed on their computers should set their browsers to refuse cookies before using the Extension, with the drawback that certain features of Schoology Plus may not function properly without the aid of cookies. By continuing to use the Extension without changing your cookie settings, you hereby acknowledge and agree to Schoology Plus's use of cookies.
+
+## Privacy Policy Changes
+
+Although most changes are likely to be minor, Schoology Plus may change its Privacy Policy from time to time, and in Schoology Plus's sole discretion. Schoology Plus encourages users to frequently check this page for any changes to its Privacy Policy. Your continued use of the Extension after any change in this Privacy Policy will constitute your acceptance of such change. Any major changes will be prominently announced.
+
+## Disclaimer
+
+Schoology Plus is not affiliated with Schoology Inc. or the Los Angeles Unified School District. Schoology, the SCHOOLOGY® wordmark, and the S logo are registered and unregistered trademarks of Schoology, Inc. in the United States. All product names, logos, and brands are property of their respective owners.
+
+## Contact
+
+The developers of Schoology Plus can be contacted by email at [[email protected]](mailto:[email protected]) or through Discord at [this link](https://aopell.me/SchoologyPlus/discord).

README.md

@@ -5,12 +5,12 @@
 [![Chrome Download](https://img.shields.io/chrome-web-store/v/fbfppoaockpecjpbdmldojdehdpepfef.svg?label=chrome%20download)](https://chrome.google.com/webstore/detail/schoology-plus/fbfppoaockpecjpbdmldojdehdpepfef)
 [![Chrome Web Store Users](https://img.shields.io/chrome-web-store/users/fbfppoaockpecjpbdmldojdehdpepfef.svg)](https://chrome.google.com/webstore/detail/schoology-plus/fbfppoaockpecjpbdmldojdehdpepfef)
 [![Chrome Web Store Rating](https://img.shields.io/chrome-web-store/rating/fbfppoaockpecjpbdmldojdehdpepfef.svg)](https://chrome.google.com/webstore/detail/schoology-plus/fbfppoaockpecjpbdmldojdehdpepfef)
-[![Firefox Download](https://img.shields.io/badge/dynamic/json.svg?label=firefox%20download&url=https%3A%2F%2Faopell.me%2FSchoologyPlus%2Fupdate.json&query=%24.addons%5B%27schoology.plus%40aopell.me%27%5D.updates%5B0%5D.version&colorB=orange)](http://aopell.me/SchoologyPlus/firefox-download.html)
+[![Mozilla Add-on](https://img.shields.io/amo/v/schoology-plus?color=orange&label=firefox%20download)](https://addons.mozilla.org/en-US/firefox/addon/schoology-plus/)
 [![Discord](https://img.shields.io/discord/526898202495025172.svg?color=7289da&label=discord)](https://aopell.github.io/SchoologyPlus/discord.html)
 [![Changelog](https://img.shields.io/github/release/aopell/SchoologyPlus.svg?label=changelog&colorB=lightgrey)](https://aopell.me/SchoologyPlus/changelog)
 
 [![Download for Chrome](https://developer.chrome.com/webstore/images/ChromeWebStore_Badge_v2_206x58.png)](https://chrome.google.com/webstore/detail/schoology-plus/fbfppoaockpecjpbdmldojdehdpepfef)
-[<img src="https://imgur.com/hVupcaT.png" height="58" alt="Download for Firefox">](http://aopell.me/SchoologyPlus/firefox-download.html)
+[<img src="https://imgur.com/hVupcaT.png" height="58" alt="Download for Firefox">](https://addons.mozilla.org/en-US/firefox/addon/schoology-plus/)
 
 #### Contents
 - [Features](#features)

css/all.css

@@ -254,7 +254,7 @@ video.easter-egg {
 }
 
 .restore-defaults {
-    color: red;
+    color: red !important;
     margin-top: 10px;
     font-weight: normal;
 }
@@ -273,7 +273,7 @@ input[type=text].setting-item {
 }
 
 .close-button {
-    color: red;
+    color: red !important;
     font-weight: normal;
     font-size: 20px;
 }
@@ -507,7 +507,8 @@ body .grading-groups-list .grading-group,
 body #grading-group-
 span.ajax-post-comment,
 .period-row .title,
-.category-row .title {
+.category-row .title,
+._2mWUT a {
     color: var(--hover-color) !important;
 }
 
@@ -518,6 +519,7 @@ body a.link-btn {
 footer li a,
 header li a,
 .splus-modal-footer-text a,
-body a.link-btn.active {
+body a.link-btn.active,
+a._3_bfp {
     color: white !important;
 }

js/all.js

@@ -18,7 +18,7 @@
 
 // Check Schoology domain
 {
-    const BLACKLISTED_DOMAINS = ["asset-cdn.schoology.com", "www.schoology.com", "schoology.com"];
+    const BLACKLISTED_DOMAINS = ["asset-cdn.schoology.com", "ui.schoology.com", "www.schoology.com", "schoology.com"];
     let dd = Setting.getValue("defaultDomain");
 
     if (dd !== window.location.host && !BLACKLISTED_DOMAINS.includes(window.location.host)) {
@@ -67,7 +67,7 @@ bottom.appendChild(createElement("span", ["footer-divider"], { textContent: "|"
 
 document.documentElement.style.setProperty("--default-visibility", "visible");
 
-let verboseModalFooterText = `&copy; Aaron Opell, Glen Husman 2017-2020 | <a href="${getBrowser() == "Chrome" ? `https://chrome.google.com/webstore/detail/${chrome.runtime.id}` : "https://github.com/aopell/SchoologyPlus/releases/latest"}">Schoology Plus v${chrome.runtime.getManifest().version_name || chrome.runtime.getManifest().version}${getBrowser() != "Chrome" || chrome.runtime.getManifest().update_url ? '' : ' dev'}</a> | <a href="https://aopell.github.io/SchoologyPlus/discord.html" title="Get support, report bugs, suggest features, and chat with the Schoology Plus community">Discord Support Server</a> | <a href="https://github.com/aopell/SchoologyPlus">GitHub</a> | <a href="#" id="open-contributors">Contributors</a> | <a href="#" id="open-changelog"> Changelog</a>`;
+let verboseModalFooterText = `&copy; Aaron Opell, Glen Husman 2017-2020 | <a href="${getBrowser() == "Chrome" ? `https://chrome.google.com/webstore/detail/${chrome.runtime.id}` : "https://github.com/aopell/SchoologyPlus/releases/latest"}">Schoology Plus v${chrome.runtime.getManifest().version_name || chrome.runtime.getManifest().version}${getBrowser() != "Chrome" || chrome.runtime.getManifest().update_url ? '' : ' dev'}</a> | <a href="https://aopell.github.io/SchoologyPlus/discord.html" title="Get support, report bugs, suggest features, and chat with the Schoology Plus community">Discord Server</a> | <a href="https://github.com/aopell/SchoologyPlus">GitHub</a> | <a href="#" id="open-contributors">Contributors</a> | <a target="_blank" href="https://aopell.me/SchoologyPlus/privacy-policy">Privacy Policy</a> | <a href="#" id="open-changelog"> Changelog</a>`;
 let modalFooterText = "Schoology Plus";
 
 let frame = document.createElement("iframe");

js/background.js

@@ -241,7 +241,7 @@ function loadAssignmentNotifications(storageContent) {
             timeModified = true;
         }
         let div = document.querySelector("div") || document.body.appendChild(document.createElement("div"));
-        div.innerHTML = response.output;
+        div.innerHTML = DOMPurify.sanitize(response.output);
         let notifications = div.querySelectorAll(".edge-sentence");
         let months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
         let totalAssignments = 0;

js/version-specific.js

@@ -183,16 +183,6 @@ let migrationsTo = {
                 new Date(2019, 1 /* February - don't you just love JavaScript */, 14)
             )
         ]);
-    },
-    "5.7": function(currentVersion, previousVersion) {
-        saveBroadcasts([
-            createBroadcast(
-                570,
-                '<span style="font-size: 20px;">Leave a review for Schoology Plus!</span>',
-                '<div style="border: 1px solid black; background-color: lightgray; padding: 5px; font-size: 14px;">Do you love Schoology Plus?<br/>If so, we\'d really appreciate if you\'d leave us a review on the Chrome Web Store!<br/><br/><a href="https://chrome.google.com/webstore/detail/schoology-plus/fbfppoaockpecjpbdmldojdehdpepfef" target="_blank"><strong style="font-weight: 900">Click here to visit the page for Schoology Plus on the Chrome Web Store</strong></a></div>',
-                new Date(2019, 11 /* December */, 11)
-            )
-        ]);
     }
 };