summaryrefslogtreecommitdiffstats
path: root/app/views/issues/_conflict.html.erb
Commit message (Collapse)AuthorAgeFilesLines
* Private issue notes (#1554).Jean-Philippe Lang2012-10-031-1/+1
| | | | | | Adds 2 new permissions for viewing/adding private comments to issues. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10547 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed: escaped link in conflict resolution form (#11341).Jean-Philippe Lang2012-07-071-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9925 e93f8b46-1217-0410-a6f0-8f06a7374b81
* replace tabs to spaces at app/views/issues/_conflict.html.erbToshi MARUYAMA2012-02-051-13/+13
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8791 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Better handling of issue update conflicts (#8691).Jean-Philippe Lang2012-02-041-0/+26
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8774 e93f8b46-1217-0410-a6f0-8f06a7374b81