Commit Graph

9740 Commits

Author SHA1 Message Date
Jean-Philippe Lang 3ee363a5cb Updates for 2.3.4 release.
git-svn-id: http://svn.redmine.org/redmine/branches/2.3-stable@12291 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-17 11:17:59 +00:00
Jean-Philippe Lang 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
Toshi MARUYAMA d291012b29 Merged r12274 from trunk to 2.3-stable (#13348)
fix repository tree can't handle two loading at once.

Contributed by Vadim Pushtaev.

git-svn-id: http://svn.redmine.org/redmine/branches/2.3-stable@12275 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-13 10:14:37 +00:00
Jean-Philippe Lang b1c45796fc Merged r12234 (#15190).
git-svn-id: http://svn.redmine.org/redmine/branches/2.3-stable@12260 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-10 09:52:25 +00:00
Jean-Philippe Lang 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
Toshi MARUYAMA e774b8a600 Merged r12243 from trunk to 2.3-stable
Gemfile: remove "i18n".

activesupport 3.2.13 requires i18n 0.6.1 explicitly.
197b9f4d61

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12244 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-29 06:31:48 +00:00
Toshi MARUYAMA 5ce399b0fb Merged r12229 from trunk to 2.3-stable (#15185)
Simplified Chinese translation for 2.3-stable updated.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12233 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-24 06:35:11 +00:00
Toshi MARUYAMA e143f01e84 2.3-stable: Gemfile: pin selenium-webdriver version 2.35.1.
selenium-webdriver requires rubyzip 1.0.0.
rubyzip 1.0.0 requires Ruby version >= 1.9.2.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12227 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-20 10:47:19 +00:00
Jean-Philippe Lang 75e90593e0 Merged r12202 (#14977).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12214 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-13 08:28:26 +00:00
Jean-Philippe Lang daf2d54f27 Merged r12162 from trunk (#14902).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12213 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-13 08:27:02 +00:00
Jean-Philippe Lang 8849727bd9 Merged r12164 from trunk (#14592).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12212 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-13 08:26:18 +00:00
Jean-Philippe Lang c4eb7c380e Merged r12163 from trunk (#14590, #14592).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12211 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-13 08:24:48 +00:00
Toshi MARUYAMA 4deca5976e Merged r12189 from trunk to 2.3-stable (#13632)
pdf: fix empty page attached when exporting.

Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12191 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-30 12:22:26 +00:00
Toshi MARUYAMA 8a046027e5 Merged r12180 from trunk to 2.3-stable (#14886)
Norwegian translation updated by Lennart Nordgreen.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12183 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-30 06:20:47 +00:00
Toshi MARUYAMA 711a8aa09b Merged r12173 from trunk to 2.3-stable (#14919)
Gemfile: update ruby-openid version above 2.3.0.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12178 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-30 03:19:44 +00:00
Toshi MARUYAMA 7ec18933e0 Merged r12172 from trunk to 2.3-stable (#14883)
Gemfile: update jdbc adapter version above 1.2.6.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12174 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-30 00:36:44 +00:00
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Jean-Philippe Lang 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
Toshi MARUYAMA 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Jean-Philippe Lang 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