Merge branch 'dev' into feature/rails4

Signed-off-by: Alex Coles <alex@alexbcoles.com>

Conflicts:
	spec/legacy/functional/admin_controller_spec.rb
	spec/legacy/unit/default_data_spec.rb

app/assets/stylesheets/content/_in_place_editing.sass

@@ -257,3 +257,8 @@ a.inplace-editing--trigger-link,
     // which in textile is shown due to edit buttons on the right side
     &.edit-strategy-textarea
       margin-top: auto
+
+// this aligns the title for the WP
+.work-packages--details--title
+  margin-left: -0.375rem
+

app/views/project_associations/new.html.erb

@@ -71,8 +71,6 @@ See doc/COPYRIGHT.rdoc for more details.
     <% end %>
   </span>
 
-
-  </br>
   <%= render :partial => 'form', :locals => {:f => f, :project => @project} %>
   <hr class="form--separator">
   <%= f.button l("timelines.add_project_association"), :name => nil,

app/views/wiki_menu_items/edit.html.erb

@@ -41,7 +41,7 @@ See doc/COPYRIGHT.rdoc for more details.
       <%= form.text_field :name, :size => 20 %>
     <% end %>
   </p>
-  </br>
+  <br>
   <div style="clear: both;"></div>
   <fieldset class="form--fieldset" id="wiki_menu_item_setting">
     <legend class="form--fieldset-legend"><%=l(:menu_item_setting)%></legend>
@@ -57,7 +57,7 @@ See doc/COPYRIGHT.rdoc for more details.
       <%= form.check_box 'new_wiki_page' %>
       <%= form.label 'new_wiki_page', l(:label_wiki_show_new_page_link) %>
 
-      </br>
+      <br>
 
       <%= form.check_box 'index_page' %>
       <%= form.label 'index_page', l(:label_wiki_show_index_page_link) %>

frontend/webpack.config.js

@@ -49,6 +49,41 @@ var browsersList = JSON.stringify(_.filter(browsersListConfig.split('\n'), funct
   return entry && entry.charAt(0) !== '#';
 }));
 
+var loaders = [
+  { test: /[\/]angular\.js$/,         loader: 'exports?angular' },
+  { test: /[\/]jquery\.js$/,          loader: 'expose?jQuery' },
+  { test: /[\/]moment\.js$/,          loader: 'expose?moment' },
+  { test: /[\/]mousetrap\.js$/,       loader: 'expose?Mousetrap' },
+  { test: /[\/]vendor[\/]i18n\.js$/,  loader: 'expose?I18n' },
+  {
+    test: /\.css$/,
+    loader: ExtractTextPlugin.extract(
+      'style-loader',
+      'css-loader!autoprefixer-loader?{browsers:' + browsersList + ',cascade:false}'
+    )
+  },
+  { test: /\.png$/,                   loader: 'url-loader?limit=100000&mimetype=image/png' },
+  { test: /\.gif$/,                   loader: 'file-loader' },
+  { test: /\.jpg$/,                   loader: 'file-loader' },
+  { test: /js-[\w|-]{2,5}\.yml$/,     loader: 'json!yaml' }
+];
+
+for (var k in pathConfig.pluginNamesPaths) {
+  if (pathConfig.pluginNamesPaths.hasOwnProperty(k)) {
+    loaders.push({
+      test: new RegExp('templates/plugin-' + k.replace(/^openproject\-/, '') + '/.*\.html$'),
+      loader: 'ngtemplate?module=openproject.templates&relativeTo=' +
+        path.join(pathConfig.pluginNamesPaths[k], 'frontend', 'app') + '!html'
+    });
+  }
+}
+
+loaders.push({
+  test: /^((?!templates\/plugin).)*\.html$/,
+  loader: 'ngtemplate?module=openproject.templates&relativeTo=' +
+    path.resolve(__dirname, './app') + '!html'
+});
+
 module.exports = {
   context: __dirname + '/app',
 
@@ -64,29 +99,7 @@ module.exports = {
   },
 
   module: {
-    loaders: [
-      { test: /[\/]angular\.js$/,         loader: 'exports?angular' },
-      { test: /[\/]jquery\.js$/,          loader: 'expose?jQuery' },
-      { test: /[\/]moment\.js$/,          loader: 'expose?moment' },
-      { test: /[\/]mousetrap\.js$/,       loader: 'expose?Mousetrap' },
-      { test: /[\/]vendor[\/]i18n\.js$/,  loader: 'expose?I18n' },
-      {
-        test: /\.css$/,
-        loader: ExtractTextPlugin.extract(
-          'style-loader',
-          'css-loader!autoprefixer-loader?{browsers:' + browsersList + ',cascade:false}'
-        )
-      },
-      { test: /\.png$/,                   loader: 'url-loader?limit=100000&mimetype=image/png' },
-      { test: /\.gif$/,                   loader: 'file-loader' },
-      { test: /\.jpg$/,                   loader: 'file-loader' },
-      { test: /js-[\w|-]{2,5}\.yml$/,     loader: 'json!yaml' },
-      {
-        test: /\.html$/,
-        loader: 'ngtemplate?module=openproject.templates&relativeTo=' +
-                  path.resolve(__dirname, './app') + '!html'
-      },
-    ]
+    loaders: loaders
   },
 
   resolve: {

spec/legacy/functional/admin_controller_spec.rb

@@ -146,7 +146,7 @@ describe AdminController, type: :controller do
 
   def delete_configuration_data
     Role.delete_all('builtin = 0')
-    ::Type.delete_all('is_standard = false')
+    ::Type.delete_all(is_standard: false)
     Status.delete_all
     Enumeration.delete_all
   end

spec/legacy/unit/default_data_spec.rb

@@ -61,7 +61,7 @@ describe Redmine::DefaultData do
 
   def delete_loaded_data!
     Role.delete_all('builtin = 0')
-    ::Type.delete_all('is_standard = false')
+    ::Type.delete_all(is_standard: false)
     Status.delete_all
     Enumeration.delete_all
   end