Merge 05d152e into f09f777

TAMULib · Jan 10, 2019 · 5bc24b9 · 5bc24b9
2 parents f09f777 + 05d152e
commit 5bc24b9
Show file tree

Hide file tree

Showing 8 changed files with 4,661 additions and 2,268 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: node_js
 
 node_js:
-  - "6"
+  - "8"
 
 addons:
   - chrome: stable

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,3 +1,5 @@
+var sass = require('node-sass');
+
 module.exports = function (grunt) {
 
 	// Configurable paths
@@ -184,6 +186,7 @@ module.exports = function (grunt) {
 
 		sass: {
 			options: {
+				implementation: sass,
 				sourceMap: false
 			},
 			dist: {

diff --git a/app/config/routes.js b/app/config/routes.js
@@ -5,7 +5,7 @@ app.config(function ($routeProvider) {
     }).
     when('/management/:tab', {
         templateUrl: 'views/management.html',
-        access: ["ROLE_ADMIN", "ROLE_MANGER"]
+        access: ["ROLE_ADMIN", "ROLE_MANAGER"]
     }).
     when('/home', {
         redirectTo: '/'