071bb653b8
Merged r12277 ( #15344 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/2.3-stable@12279 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-15 20:32:26 +00:00
7632d173e3
Merged r12245 ( #15235 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/2.3-stable@12259 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-10 09:49:47 +00:00
0a25ee385f
Merged r12138, r12149, r12156 and r12157 from trunk to 2.3-stable ( #14931 )
...
scm: fix annotate error with non ASCII author on Ruby 1.9 and Ruby 2.0.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12160 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-19 03:53:31 +00:00
79f90dfba5
Merged r12143 from trunk to 2.3-stable ( #14931 )
...
scm: git: use "--encoding=UTF-8" for blame.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12159 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-19 03:25:38 +00:00
2b53422d1d
Merged r12155 from trunk to 2.3-stable ( #14931 )
...
scm: bazaar: update test repository for non ASCII author.
* run "bzr branch --no-tree branch00 author_non_ascii"
* add revision to this branch
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12158 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 23:16:20 +00:00
77ad962132
Merged r12153 from trunk to 2.3-stable ( #14931 )
...
scm: git: fix indents of non ASCII path annotate test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12154 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 13:26:32 +00:00
7bfb4759e7
Merged r12150 from trunk to 2.3-stable ( #14931 )
...
use assert_select instead of assert_tag in Git non ASCII path annotate test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12152 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 13:03:49 +00:00
9d3377c92c
Merged r12146, r12147 and r12148 from trunk to 2.3-stable ( #14931 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12151 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 11:15:08 +00:00
55a1869b86
Merged r12142 from trunk to 2.3-stable ( #14931 )
...
scm: git: change non ASCII user name variable to instance variable.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12145 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 08:10:10 +00:00
bcae879091
Merged r12139, r12140 and r12141 from trunk to 2.3-stable ( #14931 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12144 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 08:09:59 +00:00
d259dd2dd5
Merged r12131 and r12132 ( #14798 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12134 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-13 17:53:35 +00:00
ddc016d81d
Merged r12126 from trunk ( #13008 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12127 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-10 17:40:34 +00:00
e7c82e3934
Backported r12079 from trunk ( #14584 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12125 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-10 17:08:53 +00:00
e503f41f6f
Reverts r12123 ( #14584 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12124 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-10 16:52:25 +00:00
cd67243de5
Merged r12079 from trunk ( #14584 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12123 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-10 16:43:54 +00:00
d155392b3c
Merged r12070 from trunk to 2.3-stable
...
not use assert_not_nil in Errors#[].
r7593 etc. replaced Rails2 Errors#on.
Rails3 Errors#[] always return array.
So, Rails3 Errors#[] is always not nil.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12071 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-30 09:38:00 +00:00
dc98cec17f
Merged r12060 from trunk ( #14369 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12066 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 20:49:41 +00:00
e1e006f09e
Merged r12017 and r12027 from trunk ( #14422 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12065 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 20:48:52 +00:00
e8757fec2b
Merged r12056 from trunk ( #14447 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12064 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 20:46:53 +00:00
591922c365
Merged r12057 from trunk ( #14415 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12063 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 20:46:04 +00:00
5eeca35317
Merged r12058 from trunk ( #14401 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12062 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 20:45:16 +00:00
bbf3ffe0aa
Merged r12046 from trunk to 2.3-stable ( #14562 )
...
fix diff of CJK (Chinese/Japanese/Korean) is broken on Ruby 1.8.
Contributed by Jun NAITOH.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12054 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 12:53:51 +00:00
493119e795
Merged r12042 from trunk ( #14366 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12043 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 10:00:35 +00:00
a13acb7851
Merged r11869 from trunk ( #12888 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11999 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-11 18:36:02 +00:00
01887f1e67
Merged r11915 from trunk ( #14186 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11998 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-11 18:33:54 +00:00
3d9f274140
Merged r11839 from trunk ( #14020 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11997 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-11 18:33:07 +00:00
7375dff6d6
Merged r11827 to r11833 from trunk ( #14015 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11996 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-11 18:28:54 +00:00
9874a61ec3
Merged r11854 from trunk ( #13783 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11995 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-11 17:51:19 +00:00
cc23ab9652
Merged r11850 from trunk ( #14051 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11872 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-18 19:35:26 +00:00
a8c27df9fe
Merged r11843 from trunk ( #13910 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11870 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-18 19:33:27 +00:00
af632568e3
Merged r11760 from trunk ( #13850 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11837 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-12 09:45:52 +00:00
2a6dadf787
Merged r11762 and r11763 from trunk ( #13783 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11835 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-12 09:43:59 +00:00
aa4fc1b58a
Merged r11696 from trunk ( #13618 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11745 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-01 12:15:49 +00:00
655c50849d
Merged r11706 and r11707 from trunk to 2.3-stable ( #13644 )
...
fix diff error in case of line_left out of range.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11709 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-04-05 09:56:14 +00:00
ca39b05420
Merged r11692 from trunk ( #13586 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11697 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-04-03 17:04:40 +00:00
c1d853d957
Merged r11686 from trunk to 2.3-stable ( #13584 )
...
add missing Portuguese jQuery UI date picker.
jquery.ui.datepicker-pt.js is from
https://raw.github.com/jquery/jquery-ui/49f9b849b9c5023f13/ui/i18n/jquery.ui.datepicker-pt.js
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11690 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-25 14:51:06 +00:00
225f99377a
Merged r11682 and r11685 from trunk to 2.3-stable ( #13579 )
...
fix that datepicker uses Simplified Chinese in Traditional Chinese locale.
Contributed by Chage Juan.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11689 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-25 14:50:55 +00:00
4b5fa08f66
Merged r11671, r11672 and r11674 from trunk to 2.3-stable ( #13405 )
...
Fixed commit link title escaping.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11678 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-22 01:04:22 +00:00
5745a2a2e3
Merged r11641 and r11642 from trunk ( #8794 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11656 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-19 18:40:26 +00:00
f98f9b9ae1
Merged r11640 from trunk ( #12968 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11655 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-19 18:37:33 +00:00
cfdd85173f
Merged r11526 and r11590 from trunk ( #13341 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11591 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-11 18:00:39 +00:00
23c28c1ef7
Merged r11582 from trunk ( #13337 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11583 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-10 13:16:09 +00:00
974863e8f4
Merged r11525 from trunk ( #11498 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11581 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-10 12:36:44 +00:00
58af20746b
Merged r11522 from trunk ( #13340 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11580 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-10 12:35:20 +00:00
8a97dfdeab
Merged r11507 from trunk ( #13329 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11576 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-09 11:01:28 +00:00
f4def66c58
Merged r11518 from trunk ( #8529 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11570 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-09 10:19:39 +00:00
4413e0e52e
Merged r11519 and r11520 from trunk ( #13335 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11569 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-09 10:17:26 +00:00
8245eaa9f3
Merged r11474 from trunk ( #10277 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11566 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-09 09:17:37 +00:00
83430dacd9
Merged r11471 from trunk ( #5329 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11565 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-09 09:15:42 +00:00
998a29cbaf
Merged r11473 from trunk ( #3676 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11564 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-09 09:14:22 +00:00
Jean-Philippe Lang
Toshi MARUYAMA