Commit Graph

10263 Commits

Author SHA1 Message Date
Jean-Philippe Lang e9e0ffb6dd Merged r12941 (#16161).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12943 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-28 12:53:34 +00:00
Jean-Philippe Lang 40abbfa82d Backported r12938 (#16169).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12940 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-28 11:40:02 +00:00
Toshi MARUYAMA 8d7fd10f90 Merged r12935 from trunk to 2.4-stable (#16177)
use Python getattr instead of hasattr.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12937 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-26 16:55:12 +00:00
Toshi MARUYAMA dac4f38eb4 Merged r12930 from trunk to 2.4-stable (#16177)
Mercurial 2.9 compatibility.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12934 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-26 13:06:02 +00:00
Toshi MARUYAMA 5e031bce47 Merged r12929 from trunk to 2.4-stable (#16177)
scm: mercurial: add one "closed" branch to test repository.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12933 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-26 13:05:45 +00:00
Toshi MARUYAMA dc431edbc8 Merged r12906 from trunk to 2.4-stable
update Rails to 3.2.17

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12908 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-19 10:19:06 +00:00
Jean-Philippe Lang 8980f7a01a Merged r12861, updates for 2.4.3 release.
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12862 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-08 08:01:44 +00:00
Jean-Philippe Lang c47aacd6b0 Merged r12736 (#15977).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12860 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-08 07:58:49 +00:00
Jean-Philippe Lang 287bcacd81 Merged r12848 (#16032).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12853 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-07 08:09:36 +00:00
Jean-Philippe Lang d6b718b43c Merged r12844 (#16038).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12852 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-07 08:06:38 +00:00
Jean-Philippe Lang b8ffc995c1 Merged r12745 (#15870).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12847 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-06 18:00:37 +00:00
Jean-Philippe Lang f52253c2ef Merged r12652 (#15664).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12846 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-06 17:59:08 +00:00
Jean-Philippe Lang a11aec0d4c Merged r12660 (#13544).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12845 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-06 17:58:24 +00:00
Toshi MARUYAMA a9f44b323f Merged r12695 from trunk to 2.4-stable (#15960)
pt-BR translation for 2.4-stable updated by Leandro Gehlen.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12697 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-25 05:11:54 +00:00
Toshi MARUYAMA fbeba062cf Merged r12456 from trunk to 2.4-stable (#15756)
change requirement in bazaar lib as same with other scm libs.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12458 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-24 07:17:01 +00:00
Toshi MARUYAMA 37a07789d1 backport r12453 AbstractAdapter change to 2.4-stable (#15756)
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12454 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-24 05:00:26 +00:00
Jean-Philippe Lang 742ab6f6b3 Merged r12447 for 2.4.2 release.
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12448 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-23 08:47:47 +00:00
Jean-Philippe Lang aacaa9da8e Merged r12438 (#15735).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12444 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-22 14:48:46 +00:00
Jean-Philippe Lang 9ebcb1e734 Merged r12435 (#15741).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12436 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-21 11:35:02 +00:00
Jean-Philippe Lang 36c35080b2 Merged r12419.
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12434 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-21 11:26:01 +00:00
Jean-Philippe Lang beed3c5746 Merged r12420 (#15684).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12433 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-21 11:25:25 +00:00
Jean-Philippe Lang fa2b39bf73 Merged r12415 (#15677).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12432 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-21 11:24:41 +00:00
Jean-Philippe Lang c295f67329 Merged r12414 (#15623).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12431 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-21 11:23:58 +00:00
Jean-Philippe Lang 624b0071ad Merged r12349 (#15523).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12430 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-21 11:23:12 +00:00
Jean-Philippe Lang 8ea273d427 Merged r12309 (#15398).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12429 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-21 11:21:59 +00:00
Toshi MARUYAMA d05042fbb5 Merged r12424 from trunk to 2.4-stable.
fix svn raw diff failure on svn version 1.6.17 (revision 1128011).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12425 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-20 17:46:11 +00:00
Toshi MARUYAMA 00ff3361d6 Merged r12408 from trunk to 2.4-stable (#15696)
Russian translation updated by Alex Stein.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12411 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-15 05:30:32 +00:00
Toshi MARUYAMA 4f937b42ac Merged r12407 from trunk to 2.4-stable (#15688)
Spanish translation updated by Borja Campina.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12410 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-15 05:30:15 +00:00
Toshi MARUYAMA 64a72f2ea2 Merged r12273 from trunk to 2.4-stable.
Fixed uninitialized constant Redmine::Scm::Adapters::CommandFailed error when reloading in development mode.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12389 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-09 05:44:08 +00:00
Toshi MARUYAMA 260d6d2c78 Merged r12387 from trunk to 2.4-stable.
fix disable to run test environment.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12388 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-09 04:55:22 +00:00
Toshi MARUYAMA 5b1073095a Merged r12367 and r12368 from trunk to 2.4-stable
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12369 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-07 03:51:26 +00:00
Toshi MARUYAMA 6d33524888 Merged r12365 from trunk to 2.4-stable
prevent i18n deprecated warning

i18n 0.6.4 on Rails 3.2.16 changes behavior.
3b6e56e06f

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12366 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-07 02:06:53 +00:00
Toshi MARUYAMA b8a93cd445 Merged r12358 from trunk to 2.4-stable (#15601)
Turkish translation updated by Mert Salih Kaplan.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12359 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-05 03:26:03 +00:00
Toshi MARUYAMA 3c0114f020 Merged r12355 from trunk to 2.4-stable.
update Rails version 3.2.16.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12357 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-04 08:33:22 +00:00
Toshi MARUYAMA cfe0ff70fb Merged r12340 from trunk to 2.4-stable.
use escaping html in wiki_syntax_detailed.html.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12342 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-25 05:46:19 +00:00
Toshi MARUYAMA afab881b01 Merged r12339 from trunk to 2.4-stable (#15524)
Japanese translation updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12341 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-25 05:45:43 +00:00
Toshi MARUYAMA f9d083a94b Merged r12331 from trunk to 2.4-stable (#9442)
use escaping html in Russian wiki_syntax.html.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12332 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-23 23:42:55 +00:00
Toshi MARUYAMA 5ae3de8c06 Merged r12326 from trunk to 2.4-stable (#9442)
Russian wiki syntax help translations by Denis Savitsky.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12327 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-23 18:52:09 +00:00
Jean-Philippe Lang 931c198de4 Merged r12314.
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12315 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-23 08:27:16 +00:00
Jean-Philippe Lang bf3d9f0851 Merged r12310 (#15414).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12313 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-23 08:24:00 +00:00
Jean-Philippe Lang a74ffeff07 Merged r12311 (#15427).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12312 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-22 23:28:12 +00:00
Toshi MARUYAMA 1cf93f6e32 Merged r12302 from trunk to 2.4-stable (#15391, #15401)
Fix wiki syntax "bold italic".

Contributed by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12307 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-19 13:22:50 +00:00
Toshi MARUYAMA cd13c5e6d1 Merged r12301 from trunk to 2.4-stable (#15391, #15400)
Czech Wiki syntax traslation updated by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12306 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-19 13:22:11 +00:00
Toshi MARUYAMA 9bae5a7695 Merged r12300 from trunk to 2.4-stable (#15395)
German translation updated by Daniel Felix.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12305 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-19 13:21:59 +00:00
Toshi MARUYAMA 496abc8ee3 Merged r12299 from trunk to 2.4-stable (#15391, #15402)
Czech traslation for 2.4-stable updated by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12304 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-19 13:21:48 +00:00
Toshi MARUYAMA caed8500a3 Merged r12296 from trunk to 2.4-stable (#15376)
Traditional Chinese translation updated by ChunChang Lo.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12297 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-18 08:24:02 +00:00
Jean-Philippe Lang 80aa5f4058 Merged r12292.
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12293 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-17 11:23:12 +00:00
Jean-Philippe Lang 6ff53935a2 Merged r12288 (#15369).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12289 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-16 08:48:17 +00:00
Jean-Philippe Lang b5a605c808 Fixed UI tests.
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12286 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-16 08:45:02 +00:00
Jean-Philippe Lang 4710cd8e6f Merged r12265, r12268, r12272 (#15307).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12282 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-16 07:48:27 +00:00