##// END OF EJS Templates
jro_apps » redmine
RSS
fix British English version 'field_effective_date' (#14680, #22315)...
fix British English version 'field_effective_date' (#14680, #22315) r15406 has inconsistent in en-GB.yml and en.yml. git-svn-id: http://svn.redmine.org/redmine/trunk@15410 e93f8b46-1217-0410-a6f0-8f06a7374b81
Jean-Philippe Lang - - Load All Authors

File last commit:

r14689:c860d352a214
r15028:84e4bae59a9a
Show More
_conflict.html.erb
28 lines | 1.2 KiB | text/plain | TextLexer
/ app / views / issues / _conflict.html.erb
History | Source | Raw |Copy content |Copy permalink
Jean-Philippe Lang
Better handling of issue update conflicts (#8691)....
 r8654 <div class="conflict">
Toshi MARUYAMA
replace tabs to spaces at app/views/issues/_conflict.html.erb...
 r8671 <%= l(:notice_issue_update_conflict) %>
Jean-Philippe Lang
Better handling of issue update conflicts (#8691)....
 r8654 <% if @conflict_journals.present? %>
Toshi MARUYAMA
replace tabs to spaces at app/views/issues/_conflict.html.erb...
 r8671 <div class="conflict-details">
Jean-Philippe Lang
Better handling of issue update conflicts (#8691)....
 r8654 <% @conflict_journals.sort_by(&:id).each do |journal| %>
Toshi MARUYAMA
replace tabs to spaces at app/views/issues/_conflict.html.erb...
 r8671 <p><%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></p>
<% if journal.details.any? %>
<ul class="details">
<% details_to_strings(journal.details).each do |string| %>
<li><%= string %></li>
<% end %>
</ul>
<% end %>
Jean-Philippe Lang
Wrap textilizable with DIV containing wiki class (#21663)....
 r14689 <div class="wiki">
<%= textilizable(journal, :notes) unless journal.notes.blank? %>
</div>
Jean-Philippe Lang
Better handling of issue update conflicts (#8691)....
 r8654 <% end %>
Toshi MARUYAMA
replace tabs to spaces at app/views/issues/_conflict.html.erb...
 r8671 </div>
Jean-Philippe Lang
Better handling of issue update conflicts (#8691)....
 r8654 <% end %>
</div>
<p>
<label><%= radio_button_tag 'conflict_resolution', 'overwrite' %> <%= l(:text_issue_conflict_resolution_overwrite) %></label><br />
Jean-Philippe Lang
Private issue notes (#1554)....
 r10336 <% if @issue.notes.present? %>
Jean-Philippe Lang
Better handling of issue update conflicts (#8691)....
 r8654 <label><%= radio_button_tag 'conflict_resolution', 'add_notes' %> <%= l(:text_issue_conflict_resolution_add_notes) %></label><br />
<% end %>
Jean-Philippe Lang
Fixed: escaped link in conflict resolution form (#11341)....
 r9742 <label><%= radio_button_tag 'conflict_resolution', 'cancel' %> <%= l(:text_issue_conflict_resolution_cancel, :link => link_to_issue(@issue, :subject => false)).html_safe %></label>
Jean-Philippe Lang
Better handling of issue update conflicts (#8691)....
 r8654 </p>
<p><%= submit_tag l(:button_submit) %></p>