:Merge branch 'feature/media' of github.com:jonniespratley/angular-cm…

…s into feature/media
jonniespratley · Dec 17, 2014 · 90700be · 90700be
2 parents 6091c71 + 579ada9
commit 90700be
Show file tree

Hide file tree

Showing 18 changed files with 988 additions and 392 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -18,6 +18,7 @@ var proxyConfig = {
 		forward: {
 			'/socket.io/*': serverEndpoint,
 			'/socket.io': serverEndpoint,
+			'/cms-content': serverEndpoint,
 			'/api': serverEndpoint
 		}
 	}
@@ -76,7 +77,7 @@ module.exports = function (grunt) {
 					livereload: '<%= connect.options.livereload %>'
 				},
 				files: [
-					'<%= yeoman.app %>/{,**/}*.html',
+				//	'<%= yeoman.app %>/{,**/}*.html',
 					'.tmp/styles/{,*/}*.css',
 					'<%= yeoman.app %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}'
 				],

diff --git a/app/index.html b/app/index.html
@@ -141,7 +141,7 @@
 	<!-- build:js({.tmp,app}) scripts/scripts.js -->
 	<script src="scripts/config.js"></script>
 	<script src="scripts/app.js"></script>
-	<script src="scripts/templates.js"></script>
+	<!--script src="scripts/templates.js"></script-->
 	<script src="scripts/controllers/main.js"></script>
 	<script src="scripts/controllers/docs.js"></script>
 	<script src="scripts/controllers/admin.js"></script>