societyserver · ajinkya007 · Jul 2, 2016 · Jul 2, 2016 · Jul 2, 2016 · Jul 7, 2016
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ node_modules/
 bower_components/
 app/lib/components/
 *.swp
+*.*~
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,3 @@
 language: node_js
 node_js:
-  - 0.8
-
-before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-  - npm install --quiet -g karma
-  - ./scripts/web-server.js > /dev/null &
-  - sleep 1 # give server time to start
-
-script:
-  - karma start config/karma.conf.js --no-auto-watch --single-run --reporters=dots --browsers=Firefox
-  - karma start config/karma-e2e.conf.js --reporters=dots --browsers=Firefox
+  - "node"
diff --git a/app/css/calendar.css b/app/css/calendar.css
diff --git a/app/index.html b/app/index.html
@@ -9,19 +9,18 @@
 		<script src="lib/components/angular-ui-router/release/angular-ui-router.min.js"></script>
 		<script src="lib/components/angular-bootstrap/ui-bootstrap.min.js "></script>
 		<script src="lib/components/angular-bootstrap/ui-bootstrap-tpls.min.js "></script>
-		<script src="lib/angular/localStorageModule.js"></script>
+		<script src="lib/components/angular-local-storage/dist/angular-local-storage.js"></script>
+		<link href="lib/components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"></link>
 		<script src="js/app.js"></script>
 		<script src="js/steam.js"></script>
 		<script src="js/main.js"></script>
 		<script src="js/register.js"></script>
-		<link href="lib/components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"></link>
 	</head>
 
 	<body>
-		<div class="container">
-			<header ng-include="'partials/nav.html'"></header>
-			<div ui-view></div>
-			<footer ng-include="'partials/footer.html'"></footer>
-		<div>
+		<header ng-include="'partials/nav.html'"></header>
+       		<div ui-view></div>
+		<br />
+		<footer ng-include="'partials/footer.html'"></footer>
 	</body>
 </html>
diff --git a/app/js/seed-app.js b/app/js/seed-app.js
diff --git a/app/js/seed-controllers.js b/app/js/seed-controllers.js
diff --git a/app/js/seed-directives.js b/app/js/seed-directives.js
diff --git a/app/js/seed-filters.js b/app/js/seed-filters.js
diff --git a/app/js/seed-services.js b/app/js/seed-services.js
diff --git a/app/lib/angular/localStorageModule.js b/app/lib/angular/localStorageModule.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,4 @@ node_modules/ @@
     bower_components/
     app/lib/components/
     *.swp
+    *.*~