Merge branch 'dev-angular' of github.com:opf/openproject into dev-angular

.bowerrc

@@ -1,8 +1,3 @@
 {
-  "directory": "vendor/assets/components",
+  "directory": "vendor/assets/components"
-  "storage": {
-      "packages": ".bower-cache",
-      "registry": ".bower-registry"
-  },
-  "tmp": ".bower-tmp"
 }

.travis.yml

@@ -50,7 +50,7 @@ script: "bundle exec rake $TEST_SUITE"
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
-  - "nvm use 0.10 && npm -g install bower && npm install"
+  - "nvm use 0.10 && npm install && npm -g install knalli/bower#26950e5a4f6ca2c3afe38e00691655f9cc9ee6e6"
 before_script:
   - "RAILS_ENV=production bundle exec rake ci:travis:prepare"
 notifications:

app/controllers/work_packages_controller.rb

@@ -200,6 +200,8 @@ class WorkPackagesController < ApplicationController
   end
 
   def index
+    load_work_packages unless request.format.html?
+
     respond_to do |format|
       format.html do
         render :index, :locals => { :query => @query,
@@ -207,7 +209,6 @@ class WorkPackagesController < ApplicationController
                        :layout => !request.xhr?
       end
       format.csv do
-        load_work_packages
         serialized_work_packages = WorkPackage::Exporter.csv(@work_packages, @project)
         charset = "charset=#{l(:general_csv_encoding).downcase}"
 
@@ -215,7 +216,6 @@ class WorkPackagesController < ApplicationController
                                             :filename => 'export.csv')
       end
       format.pdf do
-        load_work_packages
         serialized_work_packages = WorkPackage::Exporter.pdf(@work_packages,
                                                              @project,
                                                              @query,
@@ -227,7 +227,6 @@ class WorkPackagesController < ApplicationController
                   :filename => 'export.pdf')
       end
       format.atom do
-        load_work_packages
         render_feed(@work_packages,
                     :title => "#{@project || Setting.app_title}: #{l(:label_work_package_plural)}")
       end

package.json

@@ -2,7 +2,7 @@
   "name": "OpenProject",
   "version": "0.1.0",
   "devDependencies": {
-    "bower": "~1.3.1",
+    "bower": "knalli/bower#26950e5a4f6ca2c3afe38e00691655f9cc9ee6e6",
     "grunt": "~0.4.2",
     "grunt-contrib-jshint": "~0.8.0",
     "mocha-phantomjs": "~3.1.6",