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
2c44829509
Updates for 2.3.3
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12136 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-14 06:47:11 +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
b0c3b7a574
Merged r12120 from trunk to 2.3-stable ( #14501 )
...
fix Russian "description_date_range_interval" translation misprint.
Contributed by Artem Kondratyev.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12122 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-05 11:15:41 +00:00
9a67caf248
Merged r12118 from trunk to 2.3-stable ( #14697 )
...
fix wrong Russian translation in close project message.
Contributed by Artur Gadelshin.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12119 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-08-15 14:41:26 +00:00
67ee8653bd
Merged r12115 from trunk to 2.3-stable ( #14682 , #14686 )
...
Portuguese translation for 2.3-stable updated by Lije Also.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12117 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-08-14 06:55:19 +00:00
36978279c3
Merged r12076 from trunk ( #14607 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12078 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-08-04 10:33:03 +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
2de51892ee
Merged r12059 from trunk ( #14340 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12061 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 20:44:18 +00:00
3fe5e3bb6f
2.3-stable: svn propset svn:eol-style native test fixtures ( #14562 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12055 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 12:57: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
b724eb4fec
Merged r12052 from trunk ( #14511 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12053 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 12:09:47 +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
f1b6b4ef33
Merged r12038 from trunk to 2.3-stable ( #14531 , #14521 )
...
Spanish translations for 2.3.x updated by Jorge López.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12040 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-24 11:28:35 +00:00
ce002ee3df
Merged r12034 from trunk to 2.3-stable ( #14502 , #14501 )
...
Russian translation for 2.3-stable updated by Alex Stein.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12037 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-19 16:12:18 +00:00
eb7862445c
Merged r12033 from trunk to 2.3-stable.
...
update ruby-openid version to 2.2.3.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12036 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-19 16:12:06 +00:00
b31b5328e4
Merged r12028 from trunk to 2.3-stable ( #14485 , #14458 )
...
Traditional Chinese translation for 2.3-stable updated by ChunChang Lo.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12032 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-18 10:13:38 +00:00
8efcf60319
Updates for 2.3.2 release.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12023 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-14 14:50:07 +00:00
e07bc81c5e
Add more info about the ruby version ( #14419 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12002 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-11 18:43:48 +00:00
5c6349a7ca
Merged r11905 from trunk ( #14103 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12001 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-11 18:37:47 +00:00
37fbdb1457
Merged r11906 from trunk ( #14101 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12000 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-11 18:37:00 +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
b5998b59ab
Merged r11982 from trunk to 2.3-stable ( #14346 )
...
fix Latvian "button_log_time" translation by Arnis Juraga.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11984 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-26 11:49:38 +00:00
c590cded4b
Merged r11980 from trunk to 2.3-stable ( #9996 )
...
replace "email.yml" to "configuration.yml" in pl.yml.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11981 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-15 12:55:48 +00:00
5b8af329e2
2.3-stable: pin nokogiri version < 1.6.0 ( #14245 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11953 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-10 08:24:46 +00:00
0badc79162
Merged r11942 from trunk to 2.3-stable ( #14242 )
...
fix that project auto generation fails when projects created in the same time.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11945 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-08 11:39:56 +00:00
5e57cbfdc4
Merged r11932 from trunk to 2.3-stable ( #14221 )
...
translate x_hours in many languages.
Contributed by Filou Centrinov.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11935 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-06 06:13:53 +00:00
489527ada7
Merged r11925 from trunk to 2.3-stable ( #13692 )
...
prevent coderay "warning: already initialized constant" on Ruby 1.8.7.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11929 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-05 04:06:47 +00:00
6ce685a63c
Merged r11920 and r11921 from trunk to 2.3-stable ( #14178 )
...
pdf: restore "col_id_width" parameter of issues_to_pdf_draw_borders.
Contributed by Massimo Rossello.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11924 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-04 12:42:29 +00:00
8045385990
Merged r11919 from trunk to 2.3-stable ( #14196 )
...
Italian translation for 2.3-stable by Riccardo Rocca.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11922 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-04 11:40:41 +00:00
3a4c46089f
Merged r11911 from trunk to 2.3-stable ( #14182 , #14180 )
...
pt-BR translation for 2.3-stable updated by Marcela Oliveira.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11914 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-31 11:05:39 +00:00
53d45273a9
Merged r11901 from trunk to 2.3-stable ( #14145 )
...
German translation of x_hours updated by Filou Centrinov.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11903 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-25 06:04:36 +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
ea33a66c6b
Merged r11851 from trunk ( #14023 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11871 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-18 19:34:19 +00:00
Toshi MARUYAMA
Jean-Philippe Lang