From cd8074ae2965bd01e5bb590ba74c5be3522a5ea0 Mon Sep 17 00:00:00 2001 From: Devin Matte Date: Mon, 4 Dec 2017 15:28:45 -0500 Subject: [PATCH] Fixed Insecure Font Issue Fixed the insecure font issue as well as updating the README and updated a few older assets. --- .../src/modules/sm/App/styles/bootstrap.css | 2 +- index.php | 12 +++---- package.json | 2 +- readme.md | 35 +++++++++++++++---- 4 files changed, 36 insertions(+), 15 deletions(-) diff --git a/assets/src/modules/sm/App/styles/bootstrap.css b/assets/src/modules/sm/App/styles/bootstrap.css index ac5e079..593da3a 100644 --- a/assets/src/modules/sm/App/styles/bootstrap.css +++ b/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 diff --git a/index.php b/index.php index 73f71c6..54933e9 100644 --- a/index.php +++ b/index.php @@ -54,7 +54,7 @@ - + @@ -121,12 +121,12 @@ ga('create', '', 'rit.edu'); - + - - - - + + + + diff --git a/package.json b/package.json index 42e5689..23f5f8e 100644 --- a/package.json +++ b/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", diff --git a/readme.md b/readme.md index 9882828..f52b702 100644 --- a/readme.md +++ b/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)) \ No newline at end of file