Merge pull request #150 from devinmatte/develop

Fixed Insecure Font Issue, Updated README, and Updated Vendored Assets

Author: bgrawi

assets/src/modules/sm/App/styles/bootstrap.css

@@ -1,4 +1,4 @@
-@import url("//fonts.googleapis.com/css?family=Lato:400,700,900,400italic");
+@import url("https://fonts.googleapis.com/css?family=Lato:400,700,900,400italic");
 
 /*!
  * Bootstrap v3.0.0

index.php

@@ -54,7 +54,7 @@
 
 		<!-- STYLE SHEETS -->
 		<link rel="stylesheet" href="//brick.a.ssl.fastly.net/Roboto:300,700">
-		<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.1/css/font-awesome.css">
+		<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
         <link rel="stylesheet" href="<?=$ASSETROOTADDRESS?>assets/prod/<?=$APP_VERSION?>/modules/sm/dist.min.css">
 
 		<!-- OPEN GRAPH TAGS -->
@@ -121,12 +121,12 @@
 
 			ga('create', '<?= $GOOGLEANALYTICS ?>', 'rit.edu');
 		</script>
-		<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+		<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
 		<script src="//cdnjs.cloudflare.com/ajax/libs/mousetrap/1.4.6/mousetrap.min.js"></script>
-		<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.0.3/js/bootstrap.min.js"></script>
-		<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.15/angular.min.js"></script>
-		<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.15/angular-animate.min.js"></script>
-		<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.15/angular-sanitize.min.js"></script>
+		<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script>
+		<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.32/angular.min.js"></script>
+		<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.32/angular-animate.min.js"></script>
+		<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.32/angular-sanitize.min.js"></script>
 		<script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.8/angular-ui-router.min.js"></script>
         <script src="<?=$ASSETROOTADDRESS?>assets/prod/<?=$APP_VERSION?>/modules/sm/dist.min.js"></script>
 	</body>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "schedulemaker",
-  "version": "3.0.30",
+  "version": "3.0.31",
   "private": true,
   "description": "A course database lookup tool and schedule building web application for use at Rochester Institute of Technology.",
   "main": "index.php",

readme.md

@@ -1,11 +1,32 @@
 # ScheduleMaker
+
 A course database lookup tool and schedule building web application for use at Rochester Institute of Technology.
 
-Instructions for setting up a dev environment:
->1. Install Apache (Use XAMPP if you're on Windows: https://www.apachefriends.org/index.html)
->2. Install Node.js: https://nodejs.org/en/
->3. Clone either the master or a fork of this repo to your local machine
->4. Copy the config.example.php file to config.php in /inc/
->5. Contact a current dev to help with server/database config.
+## Dev Environment
+
+### Required Packages
+- [PHP](https://secure.php.net/)
+- [Node.js](https://nodejs.org/en/)
+- [Apache](https://httpd.apache.org/) or [XAMPP (Windows)](https://www.apachefriends.org/index.html)
+
+
+### Setup
+- Fork and clone the repository
+- Copy the `config.example.php` file to `config.php` in `/inc/`
+- Contact a current maintainer for server/database configs
+
+
+### Development
+- To build js files run `npm run-script build`
+- Increment the version number in `package.json` after updating js/css files
+
+
+## Maintainers
+
+### Current Maintainers
+
+- Ben Grawi ([@bgrawi](https://github.com/bgrawi))
+- Devin Matte ([@devinmatte](https://github.com/devinmatte))
 
-To build js files run "npm run-script build"
+#### Past Maintainers
+- Benjamin Russell ([@benrr101](https://github.com/benrr101))