Merged opf/openproject/release/5.0 into opf/openproject-ce/release/5.0

opf · Mar 7, 2016 · 1cd0816 · 1cd0816
2 parents 0e5013b + e720958
commit 1cd0816
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 18 deletions.
diff --git a/config/configuration.yml.example b/config/configuration.yml.example
@@ -274,6 +274,7 @@ default:
   #     manages: /opt/repositories/git
   #   subversion:
   #     client_command: /usr/local/bin/svn
+  #     trustedssl: true
   #     disabled_types:
   #       - :existing
   #     manages: /opt/repositories/svn

diff --git a/lib/open_project/scm/adapters/subversion.rb b/lib/open_project/scm/adapters/subversion.rb
@@ -102,8 +102,10 @@ def check_availability!
 
             return if doc.at_xpath('/info/entry/repository/uuid')
 
-            raise Exceptions::ScmUnauthorized.new if io_include?(stderr,
-                                                                 'E215004: Authentication failed')
+            stderr.each_line do |l|
+              Rails.logger.error("SVN access error: #{l}") if l =~ /E\d+:/
+              raise Exceptions::ScmUnauthorized.new if l.include?('E215004: Authentication failed')
+            end
           end
 
           raise Exceptions::ScmUnavailable
@@ -226,6 +228,10 @@ def build_svn_cmd(args)
             args.push('--password', @password) if @password.present?
           end
 
+          if self.class.config[:trustedssl]
+            args.push('--trust-server-cert')
+          end
+
           args.push('--no-auth-cache', '--non-interactive')
         end
 

diff --git a/vendored-plugins/openproject-costs/app/assets/stylesheets/costs/costs_legacy.css b/vendored-plugins/openproject-costs/app/assets/stylesheets/costs/costs_legacy.css
@@ -98,10 +98,6 @@ td.comment input {
   cursor: pointer;
 }
 
-.budget-table--fieldset{
-  margin: 8px 2px;
-}
-
 .cost_entry td{
   vertical-align: top;
   padding: 6px 6px;

diff --git a/vendored-plugins/openproject-costs/app/views/cost_objects/_form.html.erb b/vendored-plugins/openproject-costs/app/views/cost_objects/_form.html.erb
@@ -44,8 +44,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   //]]>
 </script>
 
-<fieldset id="material_budget_items_fieldset" class="budget-table--fieldset">
-  <legend><%= VariableCostObject.human_attribute_name(:material_budget) %></legend>
+<fieldset id="material_budget_items_fieldset" class="form--fieldset -collapsible">
+  <legend class="form--fieldset-legend" onclick="toggleFieldset(this);"><%= VariableCostObject.human_attribute_name(:material_budget) %></legend>
     <div class="generic-table--container">
       <div class="generic-table--results-container">
         <table interactive-table class="generic-table" id="material_budget_items">
@@ -87,6 +87,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </div>
               </div>
             </th>
+            <th>
+              <div class="generic-table--sort-header-outer">
+                <div class="generic-table--sort-header">
+                  <span>
+                    <%= MaterialBudgetItem.human_attribute_name(:description) %>
+                  </span>
+                </div>
+              </div>
+            </th>
             <% if User.current.allowed_to?(:view_cost_rates, @project)%>
               <th class="currency" id="material_budget_items_price">
                 <div class="generic-table--sort-header-outer">
@@ -98,7 +107,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </div>
               </th>
             <%end%>
-            <th></th>
             <th class="-short"></th>
           </tr>
         </thead>
@@ -112,12 +120,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     </div>
   </div>
   <div class="generic-table--action-buttons">
-    <%= link_to_function l(:button_add_budget_item), "materialBudgetItemsForm.add()", {class: "button -with-icon icon-context icon-add"} %>
+    <%= link_to_function l(:button_add_budget_item), "materialBudgetItemsForm.add()", {class: "button -alt-highlight -with-icon icon-context icon-add"} %>
   </div>
 </fieldset>
 
-<fieldset id="labor_budget_items_fieldset" class="budget-table--fieldset">
-  <legend><%= VariableCostObject.human_attribute_name(:labor_budget) %></legend>
+<fieldset id="labor_budget_items_fieldset" class="form--fieldset -collapsible">
+  <legend class="form--fieldset-legend" onclick="toggleFieldset(this);"><%= VariableCostObject.human_attribute_name(:labor_budget) %></legend>
   <div class="generic-table--container">
     <div class="generic-table--results-container">
       <table interactive-table class="generic-table" id="labor_budget_items">
@@ -183,7 +191,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     </div>
   </div>
   <div class="generic-table--action-buttons">
-    <%= link_to_function l(:button_add_budget_item), "laborBudgetItemsForm.add()", {class: "button -with-icon icon-context icon-add"} %>
+    <%= link_to_function l(:button_add_budget_item), "laborBudgetItemsForm.add()", {class: "button -alt-highlight -with-icon icon-context icon-add"} %>
   </div>
 </fieldset>
 

diff --git a/vendored-plugins/openproject-documents/app/assets/stylesheets/documents/documents.css.erb b/vendored-plugins/openproject-documents/app/assets/stylesheets/documents/documents.css.erb
@@ -33,3 +33,7 @@ See doc/COPYRIGHT.rdoc for more details.
 dt.document:before {
   content: "\e006";
 }
+
+.sidebar--document-sort label:last-of-type {
+  margin-bottom: 2rem;
+}
diff --git a/vendored-plugins/openproject-documents/app/views/documents/index.html.erb b/vendored-plugins/openproject-documents/app/views/documents/index.html.erb
@@ -30,6 +30,8 @@ See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
 
+<%= stylesheet_link_tag 'documents/documents.css' %>
+
 <%= toolbar title: l(:label_document_plural) do %>
   <% if authorize_for(:documents, :new) %>
     <li class="toolbar-item">
@@ -51,7 +53,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 <% content_for :sidebar do %>
   <h3><%= l(:label_sort_by, '') %></h3>
-  <%= form_tag({}, :method => :get) do %>
+  <%= form_tag({}, :method => :get, class: 'sidebar--document-sort') do %>
     <label>
       <%= radio_button_tag 'sort_by', 'category', (@sort_by == 'category'), :onclick => 'this.form.submit();' %>
       <%= Document.human_attribute_name(:category) %>

diff --git a/vendored-plugins/openproject-meeting/app/assets/stylesheets/meeting/meeting.css.erb b/vendored-plugins/openproject-meeting/app/assets/stylesheets/meeting/meeting.css.erb
@@ -24,6 +24,22 @@ div.meeting_content {padding-bottom: 2em;}
 div.meetings_by_date {padding: 1em 0 1em 2em;}
 dl.meetings p, div#activity dl.meetings dd, div#activity dl.meetings dt {padding: 0;}
 dl.meetings {margin-bottom: 2em;}
+dt.meeting {margin-bottom: 1.5em;}
+dl.meetings p {margin-bottom: 0.75em;}
+
+.meeting.details p {
+  margin: 0;
+}
+
+.meeting.details .block--author {
+  display: flex;
+  align-items: flex-start;
+  margin-bottom: 1rem;
+}
+
+.meeting.details .block--author .author {
+  margin-left: 10px;
+}
 
 div.tabular > div { margin: 0;
   padding: 5px 0 8px 0;

diff --git a/vendored-plugins/openproject-meeting/app/views/meetings/index.html.erb b/vendored-plugins/openproject-meeting/app/views/meetings/index.html.erb
@@ -42,12 +42,11 @@ See doc/COPYRIGHT.md for more details.
     <h3 id="<%= date.strftime("%m-%d-%Y") %>" class="date"><%= format_activity_day(date) %></h3>
     <dl class="meetings">
     <% meetings.each do |meeting| -%>
-      <dt class="meeting icon-context" id="meeting-<%= meeting.id %>">
-        <%= avatar meeting.author, :size => "24" %>
-        <span class="time"><%= format_time meeting.start_time, false %>-<%= format_time meeting.end_time, false %></span>
+      <dt class="meeting" id="meeting-<%= meeting.id %>">
         <%= link_to h(meeting.title), :controller => '/meetings', :action => 'show', :id => meeting %>
       </dt>
       <dd class="meeting" id="meeting-<%= meeting.id %>">
+        <p><strong><%= Meeting.human_attribute_name(:time) %></strong>: <%= format_time meeting.start_time, false %>-<%= format_time meeting.end_time, false %></p>
         <p><strong><%= Meeting.human_attribute_name(:location) %></strong>: <%=h meeting.location %></p>
         <p><strong><%= Meeting.human_attribute_name(:participants_invited) %></strong> (<%= meeting.participants.select(&:invited).count %>): <%= format_participant_list meeting.participants.select(&:invited) %></p>
         <p><strong><%= Meeting.human_attribute_name(:participants_attended) %></strong> (<%= meeting.participants.select(&:attended).count %>): <%= format_participant_list meeting.participants.select(&:attended) %></p>

diff --git a/vendored-plugins/openproject-meeting/app/views/meetings/show.html.erb b/vendored-plugins/openproject-meeting/app/views/meetings/show.html.erb
@@ -58,7 +58,7 @@ See doc/COPYRIGHT.md for more details.
 
 <div class="meeting details box">
   <div class="grid-block wrap">
-    <div class="grid-content small-12">
+    <div class="grid-content small-12 block--author">
       <%= avatar(@meeting.author) %>
       <p class="author"><%= authoring @meeting.created_at, @meeting.author %></p>
     </div>