bb4c530ba2
Merged r10865 and r10866 from trunk ( #12431 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10873 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-23 22:31:02 +00:00
e3958ef577
Merged r10838 from trunk ( #12274 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10872 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-23 22:29:45 +00:00
c5f2dadb2c
Merged r10836 from trunk ( #12298 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10871 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-23 22:28:37 +00:00
af8dcccb7b
Merged r10837 from trunk ( #12332 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10870 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-23 22:25:40 +00:00
c0742ed9e6
Merged r10862 from trunk to 2.1-stable ( #12409 )
...
scm: git: change extra_report_last_commit type at unit test to string.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10863 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-22 01:10:50 +00:00
8c7ae20402
Merged r10850 from trunk ( #12396 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10861 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-21 20:44:19 +00:00
06b68f1948
Merged r10856 and r10857 from trunk to 2.1-stable ( #12409 )
...
scm: git: fix changesets aren't read after clear_changesets call.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10858 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-21 09:55:48 +00:00
b51203bc83
Merged r10853 from trunk ( #12399 )
...
svn propset svn:eol-style native to fixtures.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10855 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-21 07:19:57 +00:00
f578a5c4f6
Merged r10852 from trunk ( #12399 )
...
fix non ASCII attachment filename encoding broken (MOJIBAKE) in receiving mail on Ruby 1.8.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10854 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-21 07:14:30 +00:00
17d1907747
Merged r10840 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10848 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-18 20:37:28 +00:00
0e241bb857
Updates for 2.1.3 release.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10832 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-17 12:49:43 +00:00
9dcde53dab
Merged r10829 from trunk ( #12358 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10830 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-17 12:18:40 +00:00
a44521527a
Merged r10745 from trunk ( #12231 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10824 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-17 09:24:19 +00:00
f12590fa5c
Merged r10806 from trunk ( #12195 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10823 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-17 09:02:07 +00:00
a1c6f710aa
Backported r10792 and r10793 from trunk ( #12310 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10822 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-17 08:58:26 +00:00
3ad82e4665
Merged r10810 from trunk ( #12359 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10821 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-17 08:52:51 +00:00
eef3b5b5ca
Merged r10790 from trunk ( #12294 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10820 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-17 08:51:17 +00:00
ab69845ea2
Merged r10801 from trunk ( #12349 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10819 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-17 08:50:19 +00:00
af51a68b34
Merged r10813 from trunk ( #12375 )
...
svn propset svn:eol-style native to fixtures.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10817 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-16 07:57:10 +00:00
d5c08680f6
Merged r10812 from trunk ( #12375 )
...
fix receiving mail subject broken which does not begin with encoding name.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10816 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-16 07:52:05 +00:00
9b82b948e3
Merged r10811 from trunk ( #12375 )
...
add test of receiving mail subject begins with encoding name.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10815 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-16 07:51:53 +00:00
1c8510bc80
Merged r10763 from trunk ( #12237 )
...
German Translation updated by Daniel Felix.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10764 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-29 16:03:23 +00:00
23861c7cc1
Merged from r10758 trunk ( #12237 )
...
German Translation updated by Daniel Felix.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10760 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-29 13:08:12 +00:00
6550343cb9
Merged r10733 from trunk ( #12232 , #12235 )
...
German translation for 2.1-stable updated by Daniel Felix.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10738 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-28 01:59:00 +00:00
a70cf2f833
Merged r10715 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10724 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-26 03:16:15 +00:00
0f219b973a
Merged r10714 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10723 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-26 03:15:21 +00:00
d02e5e54a8
Merged r10580 and r10581 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10722 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-26 03:13:34 +00:00
c050028102
Merged r10709 from trunk to 2.1-stable ( #12196 )
...
fix "Page not found" on OK button in SCM "View all revisions" page.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10710 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-24 10:22:17 +00:00
012ffdf9e8
Merged r10702 from trunk to 2.1-stable ( #12189 )
...
add tmp/pdf directory.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10703 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-23 10:56:43 +00:00
9e3aeeef88
Merged r10699 from trunk ( #12188 )
...
Simplified Chinese translation for 2.1-stable updated by Steven Wong.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10701 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-23 07:57:06 +00:00
21b162a624
Merged r10689 from trunk to 2.1-stable
...
Partial backout r10263.
Backout replacing shoulda context of test/unit/helpers/issues_helper_test.rb.
Test methods in shoulda context do not run on Ruby 1.8.7-p370.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10691 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-22 03:24:01 +00:00
b7e999d1aa
Merged r10688 from trunk to 2.1-stable
...
Backout r10253.
Backout replacing shoulda context of test/unit/helpers/issues_helper_test.rb.
Test methods in shoulda context do not run on Ruby 1.8.7-p370.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10690 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-22 03:23:28 +00:00
284d03e1f8
Merged r10596 from trunk to 2.1-stable ( #9732 )
...
German translation updated by Raphael Kallensee.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10600 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-11 03:47:22 +00:00
3b4126e14f
Merged r10572 from trunk
...
add missing fixtures to test/unit/issue_relation_test.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10577 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-09 11:56:45 +00:00
46a76ecb6e
Merged r10571 from trunk
...
add missing fixture to test/integration/api_test/issues_test.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10576 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-09 11:56:31 +00:00
5a74edef89
Merged r10563 from trunk ( #12021 )
...
Russian translation for 2.1-stable updated.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10565 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-04 23:47:53 +00:00
2f9c2e6bd3
Merged r10535 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10536 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-30 10:42:57 +00:00
2df7c0ff3a
Merged r10465 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10534 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-30 08:33:25 +00:00
f5d5077d2b
Merged r10531 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10532 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-30 08:07:17 +00:00
94a1eb21a4
Merged r10527 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10528 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-29 17:13:15 +00:00
1f80a4b0d9
Merged r10433, r10437 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10526 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-29 16:38:53 +00:00
55220950d2
Merged r10412 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10525 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-29 16:34:30 +00:00
daea57a37c
Merged r10438 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10524 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-29 16:32:11 +00:00
fe61739108
Merged r10494 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10523 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-29 16:31:13 +00:00
a4cd96e8b0
Merged r10436 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10522 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-29 16:28:40 +00:00
804302ce61
Merged r10413 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10521 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-29 16:27:03 +00:00
89ecbe9cdc
Merged r10439 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10520 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-29 16:26:08 +00:00
aac3e1e51c
Merged r10503 from trunk to 2.1-stable ( #11982 , #11966 )
...
add functional test of sub repository diff path.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10511 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-28 06:38:50 +00:00
595fef0d68
Merged r10502 from trunk to 2.1-stable ( #11982 , #11966 )
...
add functional test of main repository diff path.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10510 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-28 06:38:23 +00:00
65a6e3985e
Merged r10490 from trunk to 2.1-stable ( #11982 , #11966 )
...
explicitly define route at scm diff view.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10509 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-28 06:37:48 +00:00
Jean-Philippe Lang
Toshi MARUYAMA