Permalink
Browse files

Merge tag 'v5.0.13' into stable/5

  • Loading branch information...
2 parents be6816e + 4fe4c82 commit a0fad1bef5ac3e3d716e25af852ca93b088a7e2d @crohr crohr committed Jan 29, 2016
Showing with 462 additions and 252 deletions.
  1. +21 −21 Gemfile.lock
  2. +5 −1 app/assets/stylesheets/content/_forms.sass
  3. +16 −8 app/views/custom_fields/_form.html.erb
  4. +7 −9 app/views/projects/settings/_versions.html.erb
  5. +13 −9 app/views/timelines/_custom_fields.html.erb
  6. +3 −3 app/views/work_packages/bulk/edit.html.erb
  7. +3 −3 app/views/work_packages/moves/new.html.erb
  8. +36 −0 db/migrate/20160125143638_index_member_roles_inherited_from.rb
  9. +131 −70 doc/operation_guides/packager/installation-guide.md
  10. +0 −38 features/work_packages/update.feature
  11. +3 −1 frontend/app/components/work-packages/work-package-comment/work-package-comment.directive.js
  12. +1 −0 frontend/app/templates/work_packages/activities/_user.html
  13. +3 −1 lib/open_project/version.rb
  14. +21 −18 lib/tasks/packager.rake
  15. +1 −1 spec/features/work_packages/details/activity_comments_spec.rb
  16. +21 −3 spec/features/work_packages/details/inplace_editor/work_package_field.rb
  17. +78 −15 spec/features/work_packages/edit_work_package_spec.rb
  18. +39 −0 spec/support/pages/abstract_work_package.rb
  19. +1 −1 spec/support/pages/full_work_package.rb
  20. +4 −0 spec/support/pages/page.rb
  21. +1 −1 spec/support/pages/split_work_package.rb
  22. +1 −1 vendored-plugins/openproject-announcements/lib/open_project/announcements/version.rb
  23. +1 −1 vendored-plugins/openproject-auth_plugins/lib/open_project/auth_plugins/version.rb
  24. +22 −15 vendored-plugins/openproject-backlogs/app/assets/stylesheets/backlogs/master_backlog.css.sass
  25. +1 −1 vendored-plugins/openproject-backlogs/app/helpers/rb_master_backlogs_helper.rb
  26. +10 −12 vendored-plugins/openproject-backlogs/app/views/projects/settings/_versions.html.erb
  27. +2 −2 vendored-plugins/openproject-backlogs/app/views/rb_master_backlogs/_backlog.html.erb
  28. +1 −1 vendored-plugins/openproject-backlogs/lib/open_project/backlogs/version.rb
  29. +1 −1 vendored-plugins/openproject-costs/lib/open_project/costs/version.rb
  30. +1 −1 vendored-plugins/openproject-documents/lib/open_project/documents/version.rb
  31. +1 −1 vendored-plugins/openproject-github_integration/lib/open_project/github_integration/version.rb
  32. +1 −1 vendored-plugins/openproject-global_roles/lib/open_project/global_roles/version.rb
  33. +1 −1 vendored-plugins/openproject-help_link/lib/open_project/help_link/version.rb
  34. +1 −1 vendored-plugins/openproject-local_avatars/lib/open_project/local_avatars/version.rb
  35. +1 −1 vendored-plugins/openproject-meeting/app/views/meeting_contents/diff.html.erb
  36. +1 −1 vendored-plugins/openproject-meeting/lib/open_project/meeting/version.rb
  37. +1 −1 vendored-plugins/openproject-my_project_page/lib/open_project/my_project_page/version.rb
  38. +1 −1 vendored-plugins/openproject-openid_connect/lib/open_project/openid_connect/version.rb
  39. +1 −1 vendored-plugins/openproject-pdf_export/lib/open_project/pdf_export/version.rb
  40. +1 −1 vendored-plugins/openproject-reporting/lib/open_project/reporting/version.rb
  41. +1 −1 vendored-plugins/openproject-themes-dark/lib/open_project/themes/dark/version.rb
  42. +1 −1 vendored-plugins/openproject-webhooks/lib/open_project/webhooks/version.rb
  43. +1 −1 vendored-plugins/openproject-xls_export/lib/open_project/xls_export/version.rb
  44. +1 −1 vendored-plugins/reporting_engine/lib/reporting_engine/version.rb
View
@@ -63,10 +63,10 @@ GIT
GIT
remote: https://github.com/opf/openproject-translations.git
- revision: af582697e5732ce0c6e96d00e8d845ff95c8063b
+ revision: 46bfcac8b31a745586c35e3feca3dccec4838842
branch: stable/5
specs:
- openproject-translations (5.0.11)
+ openproject-translations (5.0.13)
crowdin-api (~> 0.4.0)
mixlib-shellout (~> 2.1.0)
rails (~> 4.2.3)
@@ -98,78 +98,78 @@ GIT
PATH
remote: vendored-plugins/openproject-announcements
specs:
- openproject-announcements (5.0.11)
+ openproject-announcements (5.0.13)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-auth_plugins
specs:
- openproject-auth_plugins (5.0.11)
+ openproject-auth_plugins (5.0.13)
omniauth (~> 1.0)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-backlogs
specs:
- openproject-backlogs (5.0.11)
+ openproject-backlogs (5.0.13)
acts_as_silent_list (~> 2.0.0)
openproject-pdf_export
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-costs
specs:
- openproject-costs (5.0.11)
+ openproject-costs (5.0.13)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-documents
specs:
- openproject-documents (5.0.11)
+ openproject-documents (5.0.13)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-github_integration
specs:
- openproject-github_integration (5.0.11)
+ openproject-github_integration (5.0.13)
openproject-webhooks (~> 5.0.1)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-global_roles
specs:
- openproject-global_roles (5.0.11)
+ openproject-global_roles (5.0.13)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-help_link
specs:
- openproject-help_link (5.0.11)
+ openproject-help_link (5.0.13)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-local_avatars
specs:
- openproject-local_avatars (5.0.11)
+ openproject-local_avatars (5.0.13)
rails (~> 4.2.4)
rmagick (~> 2.15.4)
PATH
remote: vendored-plugins/openproject-meeting
specs:
- openproject-meeting (5.0.11)
+ openproject-meeting (5.0.13)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-my_project_page
specs:
- openproject-my_project_page (5.0.11)
+ openproject-my_project_page (5.0.13)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-openid_connect
specs:
- openproject-openid_connect (5.0.11)
+ openproject-openid_connect (5.0.13)
lobby_boy (~> 0.1)
omniauth-openid_connect-providers (~> 0.1)
openproject-auth_plugins (~> 5.0.1)
@@ -178,41 +178,41 @@ PATH
PATH
remote: vendored-plugins/openproject-pdf_export
specs:
- openproject-pdf_export (5.0.11)
+ openproject-pdf_export (5.0.13)
prawn (~> 0.14.0)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-reporting
specs:
- openproject-reporting (5.0.11)
+ openproject-reporting (5.0.13)
openproject-costs (>= 5.0.1)
rails (~> 4.2.4)
reporting_engine (>= 1.1.0)
PATH
remote: vendored-plugins/openproject-themes-dark
specs:
- openproject-themes-dark (5.0.11)
+ openproject-themes-dark (5.0.13)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-webhooks
specs:
- openproject-webhooks (5.0.11)
+ openproject-webhooks (5.0.13)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-xls_export
specs:
- openproject-xls_export (5.0.11)
+ openproject-xls_export (5.0.13)
rails (~> 4.2.4)
spreadsheet (~> 0.8.9)
PATH
remote: vendored-plugins/reporting_engine
specs:
- reporting_engine (5.0.11)
+ reporting_engine (5.0.13)
json
rails (~> 4.2.4)
@@ -356,7 +356,7 @@ GEM
disposable (0.0.9)
representable (~> 2.0)
uber
- domain_name (0.5.25)
+ domain_name (0.5.20160128)
unf (>= 0.0.5, < 1.0.0)
equalizer (0.0.11)
equivalent-xml (0.5.1)
@@ -659,11 +659,15 @@ input[readonly].-clickable
display: block
clear: both
line-height: $base-line-height
+ padding: 0 2rem 0 0
& > .form--check-box-container
display: block
float: left
- padding: 0.125rem 0.5rem 0 0
+ padding-right: 0.5rem
+
+ input[type="checkbox"]
+ vertical-align: middle
.form--field-affix
flex: 0 0 auto
@@ -100,14 +100,22 @@ See doc/COPYRIGHT.rdoc for more details.
when "WorkPackageCustomField" %>
<fieldset class="form--fieldset">
<legend class="form--fieldset-legend"><%=l(:label_type_plural)%></legend>
- <% for type in @types %>
- <%= check_box_tag "custom_field[type_ids][]", type.id, (@custom_field.types.include? type),
- id: "custom_field_type_ids_#{type.id}",
- class: 'form--checkbox' %>
- <%= content_tag :label, (type.is_standard) ? l(:label_custom_field_default_type) : h(type),
- class: "no-css",
- for: "custom_field_type_ids_#{type.id}" %>
- <% end %>
+ <div class="form--field">
+ <div class="form--field-container">
+ <% for type in @types %>
+ <%= content_tag :label, '',
+ class: "form--label-with-check-box",
+ for: "custom_field_type_ids_#{type.id}" do %>
+ <div class="form--check-box-container">
+ <%= check_box_tag "custom_field[type_ids][]", type.id, (@custom_field.types.include? type),
+ id: "custom_field_type_ids_#{type.id}",
+ class: 'form--check-box' %>
+ </div>
+ <%= (type.is_standard) ? l(:label_custom_field_default_type) : h(type) %>
+ <% end %>
+ <% end %>
+ </div>
+ </div>
<%= hidden_field_tag "custom_field[type_ids][]", '' %>
</fieldset>
&nbsp;
@@ -150,15 +150,13 @@ See doc/COPYRIGHT.rdoc for more details.
<div class="generic-table--header-background"></div>
</div>
</div>
- <% if @project.versions.any? %>
- <div class="generic-table--action-buttons">
- <%= link_to_if_authorized({ controller: '/versions', action: 'new', project_id: @project },
- class: 'button -alt-highlight') do %>
- <i class="button--icon icon-add"></i>
- <span class="button--text"><%= l(:label_version_new) %></span>
- <% end %>
- </div>
- <% end %>
+ <div class="generic-table--action-buttons">
+ <%= link_to_if_authorized({ controller: '/versions', action: 'new', project_id: @project },
+ class: 'button -alt-highlight') do %>
+ <i class="button--icon icon-add"></i>
+ <span class="button--text"><%= l(:label_version_new) %></span>
+ <% end %>
+ </div>
<% else %>
<%= no_results_box(action_url: new_project_version_path(@project), display_action: authorize_for('versions', 'new')) %>
<% end %>
@@ -46,17 +46,21 @@ custom_fields.each do |custom_field|
[l('timelines.filter.noneElement'), '-1'],
[l('general_text_Yes'), '1'],
[l('general_text_No'), '0']
- ], timeline.custom_fields_filter[custom_field.id.to_s]),
- class: "cf_boolean_select"
+ ],
+ timeline.custom_fields_filter[custom_field.id.to_s]),
+ class: "cf_boolean_select",
+ container_class: '-wide'
%>
<% elsif custom_field.field_format == 'list' %>
- <%= hidden_field_tag("timeline[options][custom_fields][#{custom_field.id.to_s}][]",
- timeline.custom_field_list_value(custom_field.id.to_s),
- {
- :"data-values" => list_to_select_object_with_none(custom_field.possible_values).to_json,
- class: "cf_list_select"
- }
- ) %>
+ <span class="form--select-container -wide">
+ <%= hidden_field_tag("timeline[options][custom_fields][#{custom_field.id.to_s}][]",
+ timeline.custom_field_list_value(custom_field.id.to_s),
+ {
+ :"data-values" => list_to_select_object_with_none(custom_field.possible_values).to_json,
+ class: "cf_list_select"
+ }
+ ) %>
+ </span>
<% end %>
</div>
<%
@@ -29,13 +29,13 @@ See doc/COPYRIGHT.rdoc for more details.
<h2><%= l(:label_bulk_edit_selected_work_packages) %></h2>
<ul><%= @work_packages.collect {|i| content_tag('li', link_to(h("#{i.type} ##{i.id}"), work_package_path(i)) + h(": #{i.subject}")) }.join("\n").html_safe %></ul>
<%= styled_form_tag(url_for(controller: '/work_packages/bulk', action: :update),
- method: :put) do %>
+ method: :put, class: '-wide-labels') do %>
<%= @work_packages.collect {|i| hidden_field_tag('ids[]', i.id)}.join.html_safe %>
<section class="form--section">
<fieldset class="form--fieldset">
<legend class="form--fieldset-legend"><%= l(:label_change_properties) %></legend>
<div class="grid-block">
- <div class="grid-content">
+ <div class="grid-content medium-6">
<div class="form--field">
<label class="form--label" for="work_package_type_id"><%= WorkPackage.human_attribute_name(:type) %></label>
<div class="form--field-container">
@@ -103,7 +103,7 @@ See doc/COPYRIGHT.rdoc for more details.
<% end %>
<%= call_hook(:view_work_packages_bulk_edit_details_bottom, { work_packages: @work_packages }) %>
</div>
- <div class="grid-content">
+ <div class="grid-content medium-6">
<% if @project && User.current.allowed_to?(:manage_subtasks, @project) %>
<div class="form--field">
<label class="form--label" for='work_package_parent_id'><%= WorkPackage.human_attribute_name(:parent) %></label>
@@ -33,13 +33,13 @@ See doc/COPYRIGHT.rdoc for more details.
<li><%= link_to_work_package work_package %></li>
<% end -%>
</ul>
-<%= styled_form_tag({action: 'create'}, id: 'move_form') do %>
+<%= styled_form_tag({action: 'create'}, id: 'move_form', class: '-wide-labels') do %>
<%= @work_packages.collect {|i| hidden_field_tag('ids[]', i.id)}.join.html_safe %>
<section class="form--section">
<fieldset class="form--fieldset">
<legend class="form--fieldset-legend"><%= l(:label_change_properties) %></legend>
<div class="grid-block">
- <div class="grid-content">
+ <div class="grid-content medium-6">
<div class="form--field">
<label class="form--label" for="new_project_id"><%= WorkPackage.human_attribute_name(:project) %>:</label>
<div class="form--field-container">
@@ -94,7 +94,7 @@ See doc/COPYRIGHT.rdoc for more details.
</div>
</div>
</div>
- <div class="grid-content">
+ <div class="grid-content medium-6">
<div class="form--field">
<label class="form--label" for='start_date'><%= WorkPackage.human_attribute_name(:start_date) %></label>
<div class="form--field-container">
@@ -0,0 +1,36 @@
+#-- encoding: UTF-8
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+class IndexMemberRolesInheritedFrom < ActiveRecord::Migration
+ def change
+ # The index is required for member/member_role deletion when a user
+ # leaves a group.
+ add_index :member_roles, :inherited_from
+ end
+end
Oops, something went wrong.

0 comments on commit a0fad1b

Please sign in to comment.