Merge remote-tracking branch 'origin/release/5.0' into task/22102-apply-new-icon-styling_2

pull/6827/head
Henriette Dinger 9 years ago
commit cfe64045e2
  1. 4
      app/views/meetings/_form.html.erb
  2. 2
      lib/open_project/meeting/version.rb

@ -32,7 +32,7 @@ See doc/COPYRIGHT.md for more details.
</div> </div>
<div class="form--field"> <div class="form--field">
<label class="form--label"><%= Meeting.human_attribute_name(:start_date) %></label> <label class="form--label -required"><%= Meeting.human_attribute_name(:start_date) %></label>
<div class="form--field-container"> <div class="form--field-container">
<%= f.text_field :start_date, <%= f.text_field :start_date,
@ -50,7 +50,7 @@ See doc/COPYRIGHT.md for more details.
</div> </div>
<div class="form--field"> <div class="form--field">
<label class="form--label"><%= Meeting.human_attribute_name(:duration) %></label> <label class="form--label -required"><%= Meeting.human_attribute_name(:duration) %></label>
<div class="form--field-container"> <div class="form--field-container">
<%= f.number_field :duration, <%= f.number_field :duration,

@ -20,6 +20,6 @@
module OpenProject module OpenProject
module Meeting module Meeting
VERSION = "5.0.1" VERSION = "5.0.4"
end end
end end

Loading…
Cancel
Save