build fixes and proper build

modess · Jun 15, 2014 · dfba227 · dfba227
1 parent f6f4218
commit dfba227
Show file tree

Hide file tree

Showing 13 changed files with 1,315 additions and 1,435 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -185,6 +185,7 @@ module.exports = function (grunt) {
             '.htaccess',
             '*.html',
             'bower_components/**/*',
+            '!bower_components/highcharts/js/.htaccess',
             'images/{,*/}*.{webp}',
             'fonts/*'
           ]

diff --git a/app/assets/index.html b/app/assets/index.html
@@ -49,7 +49,7 @@
 
         <!-- build:js({.tmp,app}) scripts/scripts.js -->
         <script src="scripts/app.js"></script>
-        <script src="scripts/controllers/main.js"></script>
+        <script src="scripts/controllers/repositories.js"></script>
         <script src="scripts/controllers/repository.js"></script>
         <script src="scripts/directives/statistics.js"></script>
         <script src="scripts/directives/commits_by_date_chart.js"></script>

diff --git a/app/assets/scripts/app.coffee b/app/assets/scripts/app.coffee
@@ -21,7 +21,7 @@ angular.module('gitPrettyStats', [
       .state 'repositories',
         url: '/repositories'
         templateUrl: 'views/main.html'
-        controller: 'MainController'
+        controller: 'RepositoriesController'
         resolve:
           repositories: (Repository) ->
             Repository.all()

diff --git a/app/views/index.php b/app/views/index.php
@@ -49,7 +49,7 @@
 
         <!-- build:js({.tmp,app}) scripts/scripts.js -->
         <script src="scripts/app.js"></script>
-        <script src="scripts/controllers/main.js"></script>
+        <script src="scripts/controllers/repositories.js"></script>
         <script src="scripts/controllers/repository.js"></script>
         <script src="scripts/directives/statistics.js"></script>
         <script src="scripts/directives/commits_by_date_chart.js"></script>

diff --git a/public/bower_components/highcharts/js/.htaccess b/public/bower_components/highcharts/js/.htaccess
diff --git a/public/scripts/app.js b/public/scripts/app.js
diff --git a/public/scripts/app.js.map b/public/scripts/app.js.map
diff --git a/public/scripts/controllers/main.js b/public/scripts/controllers/main.js
diff --git a/public/scripts/controllers/main.js.map b/public/scripts/controllers/main.js.map