Commit Graph

25 Commits

Author SHA1 Message Date
Toshi MARUYAMA 35cc911192 update copyright year (#15977)
Contributed by Daniel Felix.

git-svn-id: http://svn.redmine.org/redmine/trunk@12736 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-29 22:45:39 +00:00
Toshi MARUYAMA 670d2b6e2b fix diff of CJK(Chinese/Japanese/Korean) is broken on Ruby 1.8 (#14562)
Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12046 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 11:00:02 +00:00
Toshi MARUYAMA 6469e9a5a3 fix diff error in case of line_left out of range (#13644)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11707 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-04-05 07:30:51 +00:00
Toshi MARUYAMA 0d02931759 check integer ordinal range on only Ruby 1.8 (#13644)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11706 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-04-05 05:51:58 +00:00
Toshi MARUYAMA d3de07a17c fix that diff outputs become ??? in some non ASCII words (#12641)
Contributed by Filou Centrinov.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11549 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-07 10:36:06 +00:00
Toshi MARUYAMA 72539451aa set html encoding utf8 at Diff class (#12641)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11547 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-07 10:17:45 +00:00
Toshi MARUYAMA 0d141eef32 code cleanup (#12641)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11546 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-07 08:47:38 +00:00
Toshi MARUYAMA b19a6d06d9 move utf8 encoding from view to UnifiedDiff (#12641)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11545 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-07 08:31:58 +00:00
Toshi MARUYAMA 39b9599360 use %r{} instead of // at lib/redmine/unified_diff.rb
Syntax highlight is broken in gedit 2.28.4 on CentOS 6.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11542 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-07 04:07:09 +00:00
Jean-Philippe Lang e396a0eebe Copyright for 2013 (#12788).
Patch by Daniel Felix.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11169 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-12 09:29:31 +00:00
Toshi MARUYAMA f18edc4e1c use git diff format for all diff (#11868)
Mercurial diff uses git format.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10428 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-19 02:29:11 +00:00
Jean-Philippe Lang d277d14432 Remove trailing (revision nn) from filenames in subversion diffs.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10425 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-18 19:44:08 +00:00
Jean-Philippe Lang 12de6a177a Fixed that git diff displays deleted files as /dev/null (#11868).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10424 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-18 19:32:58 +00:00
Jean-Philippe Lang ba5a052c8c Copyright update.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9636 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-05 12:56:53 +00:00
Jean-Philippe Lang 6aae25209a Fixed that partial diffs are done against html instead of original code (#9143).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8876 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-15 17:39:47 +00:00
Toshi MARUYAMA 9957c3c98a remove trailing white-spaces from lib/redmine/unified_diff.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6938 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-01 00:44:26 +00:00
Jean-Philippe Lang 21c79827ff Highlight changes inside diff lines (#7139).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5094 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-11 20:23:29 +00:00
Toshi MARUYAMA 35f075d8ad scm: fix diffs do not handle one line new files properly (#7618).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4929 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-23 07:03:45 +00:00
Toshi MARUYAMA 7a9136f93a Ruby 1.9 compatibility of unified_diff.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4897 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-21 03:59:50 +00:00
Jean-Philippe Lang 4b83a0d848 Fixes diff parser for when lines starting with multiple dashes are removed (#4186).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3028 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-11 13:25:53 +00:00
Jean-Philippe Lang 4450e6f24b String#each removed in ruby1.9.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2914 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-10 15:19:27 +00:00
Jean-Philippe Lang fec86a9ce1 Adds a setting to limit the number of diff lines that should be displayed (default to 1500).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2112 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-12-07 15:21:40 +00:00
Jean-Philippe Lang ea603e4ea5 Use options hash in UnifiedDiff.new
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2110 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-12-07 14:40:33 +00:00
Jean-Philippe Lang 8cb75be0db Switch order of current and previous revisions in side-by-side diff (#1903).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1895 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-09-21 18:45:30 +00:00
Jean-Philippe Lang ec0525d497 Move unified diff parser out of the scm abstract adapter so it can be reused for viewing attached diffs (#1403).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1513 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-06-08 16:28:42 +00:00