source.dussan.org Git - redmine.git/log

]> source.dussan.org Git - redmine.git/log

Jean-Philippe Lang [Sun, 6 Jul 2014 10:33:47 +0000 (10:33 +0000)]

Merged r13213 (#16530).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13226 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 5 Jul 2014 09:06:15 +0000 (09:06 +0000)]

Backported r13190 (#17206).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13215 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Fri, 4 Jul 2014 02:23:16 +0000 (02:23 +0000)]

Merge .travis.yml related revisions from trunk to 2.4-stable

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13212 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Fri, 4 Jul 2014 00:24:53 +0000 (00:24 +0000)]

Merged r13208 from trunk to 2.4-stable

Gemfile: update Rails 3.2.19

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13211 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 1 Jul 2014 05:28:14 +0000 (05:28 +0000)]

Merged r13199 from trunk to 2.4-stable (#17151)

Fix file upload broken on Chrome 36.

Contributed by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13203 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 1 Jul 2014 05:27:57 +0000 (05:27 +0000)]

Merged r13198 from trunk to 2.4-stable (#17235)

Prevent "can't modify frozen String" exception when mail sending error.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13202 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Wed, 25 Jun 2014 17:42:34 +0000 (17:42 +0000)]

Merged r13184 from trunk to 2.4-stable (#13932)

Fix file upload does not work with Safari.

Contributed by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13189 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 9 Jun 2014 00:11:03 +0000 (00:11 +0000)]

Merged r13177 from trunk to 2.4-stable (#5706)

fix Ruby Logger doc link.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13179 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Wed, 7 May 2014 08:43:55 +0000 (08:43 +0000)]

Merged r13130 from trunk to 2.4-stable

Gemfile: update Rails 3.2.18

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13134 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Thu, 1 May 2014 13:39:22 +0000 (13:39 +0000)]

2.4-stable: revert r13114 (#16685)

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13121 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Thu, 1 May 2014 12:28:59 +0000 (12:28 +0000)]

Merged r13117 from trunk to 2.4-stable (#16685)

Gemfile: upgrade mocha version.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13119 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Thu, 1 May 2014 01:55:03 +0000 (01:55 +0000)]

Merged r13110 and r13112 from trunk to 2.4-stable (#16685)

introduce request_store to ensure that the current user doesn't leak across request boundaries.

Contributed by Holger Just.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13114 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Thu, 17 Apr 2014 19:38:02 +0000 (19:38 +0000)]

Merged r13101 from trunk to 2.4-stable (#16711)

fix non-ascii attachment file name get corrupted in IE11.

Contributed by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13103 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 5 Apr 2014 14:34:53 +0000 (14:34 +0000)]

Merged r13041 (#16511).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13047 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 5 Apr 2014 14:33:32 +0000 (14:33 +0000)]

Merged r13040 (#16467).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13045 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sat, 5 Apr 2014 00:27:53 +0000 (00:27 +0000)]

Merged r13037 from trunk to 2.4-stable

replace mail options reference URL at configuration.yml.example.

wiki.rubyonrails.org seems dead.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13039 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 29 Mar 2014 16:06:51 +0000 (16:06 +0000)]

Updates for 2.4.5 release.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13031 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 29 Mar 2014 14:54:06 +0000 (14:54 +0000)]

Merged r13018 (#16466).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13028 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 25 Mar 2014 08:40:28 +0000 (08:40 +0000)]

Merged r13004 from trunk to 2.4-stable.

add ChangeLog note that #15781 was forgotten to merge to v2.4.3.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13006 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 25 Mar 2014 08:18:44 +0000 (08:18 +0000)]

Merged r13001 from trunk to 2.4-stable.

Gemfile: pin rake version 10.1.

rake 10.2.0 requires Ruby version >= 1.9.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13003 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 2 Mar 2014 09:38:40 +0000 (09:38 +0000)]

Updates for 2.4.4 release.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12949 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 2 Mar 2014 09:30:35 +0000 (09:30 +0000)]

Merged r12896 (#16081).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12946 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 28 Feb 2014 12:53:34 +0000 (12:53 +0000)]

Merged r12941 (#16161).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12943 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 28 Feb 2014 11:40:02 +0000 (11:40 +0000)]

Backported r12938 (#16169).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12940 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Wed, 26 Feb 2014 16:55:12 +0000 (16:55 +0000)]

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

commit | commitdiff | tree

Toshi MARUYAMA [Wed, 26 Feb 2014 13:06:02 +0000 (13:06 +0000)]

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

commit | commitdiff | tree

Toshi MARUYAMA [Wed, 26 Feb 2014 13:05:45 +0000 (13:05 +0000)]

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

commit | commitdiff | tree

Toshi MARUYAMA [Wed, 19 Feb 2014 10:19:06 +0000 (10:19 +0000)]

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

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 8 Feb 2014 08:01:44 +0000 (08:01 +0000)]

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

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 8 Feb 2014 07:58:49 +0000 (07:58 +0000)]

Merged r12736 (#15977).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12860 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 7 Feb 2014 08:09:36 +0000 (08:09 +0000)]

Merged r12848 (#16032).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12853 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 7 Feb 2014 08:06:38 +0000 (08:06 +0000)]

Merged r12844 (#16038).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12852 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Thu, 6 Feb 2014 18:00:37 +0000 (18:00 +0000)]

Merged r12745 (#15870).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12847 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Thu, 6 Feb 2014 17:59:08 +0000 (17:59 +0000)]

Merged r12652 (#15664).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12846 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Thu, 6 Feb 2014 17:58:24 +0000 (17:58 +0000)]

Merged r12660 (#13544).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12845 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sat, 25 Jan 2014 05:11:54 +0000 (05:11 +0000)]

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

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 24 Dec 2013 07:17:01 +0000 (07:17 +0000)]

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

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 24 Dec 2013 05:00:26 +0000 (05:00 +0000)]

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

commit | commitdiff | tree

Jean-Philippe Lang [Mon, 23 Dec 2013 08:47:47 +0000 (08:47 +0000)]

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

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 22 Dec 2013 14:48:46 +0000 (14:48 +0000)]

Merged r12438 (#15735).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12444 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 21 Dec 2013 11:35:02 +0000 (11:35 +0000)]

Merged r12435 (#15741).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12436 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 21 Dec 2013 11:26:01 +0000 (11:26 +0000)]

Merged r12419.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12434 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 21 Dec 2013 11:25:25 +0000 (11:25 +0000)]

Merged r12420 (#15684).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12433 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 21 Dec 2013 11:24:41 +0000 (11:24 +0000)]

Merged r12415 (#15677).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12432 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 21 Dec 2013 11:23:58 +0000 (11:23 +0000)]

Merged r12414 (#15623).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12431 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 21 Dec 2013 11:23:12 +0000 (11:23 +0000)]

Merged r12349 (#15523).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12430 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 21 Dec 2013 11:21:59 +0000 (11:21 +0000)]

Merged r12309 (#15398).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12429 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Fri, 20 Dec 2013 17:46:11 +0000 (17:46 +0000)]

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

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 15 Dec 2013 05:30:32 +0000 (05:30 +0000)]

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

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 15 Dec 2013 05:30:15 +0000 (05:30 +0000)]

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

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 9 Dec 2013 05:44:08 +0000 (05:44 +0000)]

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

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 9 Dec 2013 04:55:22 +0000 (04:55 +0000)]

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

commit | commitdiff | tree

Toshi MARUYAMA [Sat, 7 Dec 2013 03:51:26 +0000 (03:51 +0000)]

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

commit | commitdiff | tree

Toshi MARUYAMA [Sat, 7 Dec 2013 02:06:53 +0000 (02:06 +0000)]

Merged r12365 from trunk to 2.4-stable

prevent i18n deprecated warning

i18n 0.6.4 on Rails 3.2.16 changes behavior.
https://github.com/svenfuchs/i18n/commit/3b6e56e06fd70f6e4507996b017238505e66608c

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12366 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Thu, 5 Dec 2013 03:26:03 +0000 (03:26 +0000)]

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

commit | commitdiff | tree

Toshi MARUYAMA [Wed, 4 Dec 2013 08:33:22 +0000 (08:33 +0000)]

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

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 25 Nov 2013 05:46:19 +0000 (05:46 +0000)]

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

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 25 Nov 2013 05:45:43 +0000 (05:45 +0000)]

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

commit | commitdiff | tree

Toshi MARUYAMA [Sat, 23 Nov 2013 23:42:55 +0000 (23:42 +0000)]

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

commit | commitdiff | tree

Toshi MARUYAMA [Sat, 23 Nov 2013 18:52:09 +0000 (18:52 +0000)]

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

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 23 Nov 2013 08:27:16 +0000 (08:27 +0000)]

Merged r12314.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12315 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 23 Nov 2013 08:24:00 +0000 (08:24 +0000)]

Merged r12310 (#15414).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12313 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 22 Nov 2013 23:28:12 +0000 (23:28 +0000)]

Merged r12311 (#15427).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12312 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 19 Nov 2013 13:22:50 +0000 (13:22 +0000)]

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

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 19 Nov 2013 13:22:11 +0000 (13:22 +0000)]

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

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 19 Nov 2013 13:21:59 +0000 (13:21 +0000)]

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

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 19 Nov 2013 13:21:48 +0000 (13:21 +0000)]

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

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 18 Nov 2013 08:24:02 +0000 (08:24 +0000)]

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

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 17 Nov 2013 11:23:12 +0000 (11:23 +0000)]

Merged r12292.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12293 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 16 Nov 2013 08:48:17 +0000 (08:48 +0000)]

Merged r12288 (#15369).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12289 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 16 Nov 2013 08:45:02 +0000 (08:45 +0000)]

Fixed UI tests.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12286 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 16 Nov 2013 07:48:27 +0000 (07:48 +0000)]

Merged r12265, r12268, r12272 (#15307).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12282 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 15 Nov 2013 20:35:37 +0000 (20:35 +0000)]

Merged r12278 (#15311).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12281 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 15 Nov 2013 20:33:35 +0000 (20:33 +0000)]

Merged r12277 (#15344).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12280 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Wed, 13 Nov 2013 10:16:02 +0000 (10:16 +0000)]

Merged r12274 from trunk to 2.4-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.4-stable@12276 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Mon, 11 Nov 2013 21:41:10 +0000 (21:41 +0000)]

Merged r12267.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12271 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Mon, 11 Nov 2013 21:16:05 +0000 (21:16 +0000)]

Merged r12269.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12270 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 10 Nov 2013 11:21:50 +0000 (11:21 +0000)]

Set version to 2.4.0 stable.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12264 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 10 Nov 2013 11:11:34 +0000 (11:11 +0000)]

Added 2.4-stable branch.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12262 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 10 Nov 2013 10:33:35 +0000 (10:33 +0000)]

Fixed that rake db:create fails with JRuby (#15218).

git-svn-id: http://svn.redmine.org/redmine/trunk@12261 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 10 Nov 2013 08:17:49 +0000 (08:17 +0000)]

ci.rake: use 'jdbcsqlite3' for JRuby

git-svn-id: http://svn.redmine.org/redmine/trunk@12258 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 10 Nov 2013 08:17:40 +0000 (08:17 +0000)]

ci.rake: code format cleanup

git-svn-id: http://svn.redmine.org/redmine/trunk@12257 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 10 Nov 2013 00:19:17 +0000 (00:19 +0000)]

work around "rake db:create:all" error on JRuby SQLite3

<pre>
$ bundle exec rake ci --trace
...
rake aborted!
stack level too deep
/home/xxxx/.rvm/gems/jruby-1.7.4/gems/activerecord-3.2.15/lib/active_record/railties/databases.rake:184:in `local_database?'
/home/xxxx/.rvm/gems/jruby-1.7.4/gems/activerecord-3.2.15/lib/active_record/railties/databases.rake:52:in `(root)'
org/jruby/RubyHash.java:1375:in `each_value'
/home/xxxx/.rvm/gems/jruby-1.7.4/gems/activerecord-3.2.15/lib/active_record/railties/databases.rake:38:in `(root)'
</pre>

git-svn-id: http://svn.redmine.org/redmine/trunk@12256 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sat, 9 Nov 2013 16:47:40 +0000 (16:47 +0000)]

remove trailing white-spaces from test/unit/project_members_inheritance_test.rb

git-svn-id: http://svn.redmine.org/redmine/trunk@12255 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sat, 9 Nov 2013 16:44:44 +0000 (16:44 +0000)]

upgrade activerecord-jdbc-adapter to 1.3.2

git-svn-id: http://svn.redmine.org/redmine/trunk@12254 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sat, 9 Nov 2013 13:10:19 +0000 (13:10 +0000)]

remove trailing white-spaces from test/unit/query_test.rb

git-svn-id: http://svn.redmine.org/redmine/trunk@12253 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sat, 9 Nov 2013 12:48:19 +0000 (12:48 +0000)]

remove trailing white-spaces from test/unit/setting_test.rb

git-svn-id: http://svn.redmine.org/redmine/trunk@12252 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 9 Nov 2013 11:19:06 +0000 (11:19 +0000)]

Custom fields in issue form - splitting is incorrect (#15227).

git-svn-id: http://svn.redmine.org/redmine/trunk@12251 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 9 Nov 2013 11:09:50 +0000 (11:09 +0000)]

Accept issue id with leading sharp when adding a related issue.

git-svn-id: http://svn.redmine.org/redmine/trunk@12250 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 9 Nov 2013 09:46:55 +0000 (09:46 +0000)]

Log errors when moving attachments (#15295).

git-svn-id: http://svn.redmine.org/redmine/trunk@12249 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 9 Nov 2013 09:07:48 +0000 (09:07 +0000)]

Accept custom field format added at runtime (#15277).

Patch by Boris Bera.

git-svn-id: http://svn.redmine.org/redmine/trunk@12248 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 9 Nov 2013 08:54:45 +0000 (08:54 +0000)]

Gantt: sort versions like on the roadmap (#7335).

git-svn-id: http://svn.redmine.org/redmine/trunk@12247 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 9 Nov 2013 07:51:00 +0000 (07:51 +0000)]

Upgrade to Rails 3.2.15.

git-svn-id: http://svn.redmine.org/redmine/trunk@12246 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 9 Nov 2013 07:42:54 +0000 (07:42 +0000)]

Wiki Pages REST API with version returns wrong comments (#15235).

Patch by Yukinari TOYOTA.

git-svn-id: http://svn.redmine.org/redmine/trunk@12245 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 29 Oct 2013 06:24:28 +0000 (06:24 +0000)]

Gemfile: remove "i18n"

activesupport 3.2.13 requires i18n 0.6.1 explicitly.
https://github.com/rails/rails/commit/197b9f4d61260bea9e2a0a4883977e02164a0667

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12243 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 29 Oct 2013 05:45:44 +0000 (05:45 +0000)]

back out r12241 (back out Rails version 3.2.13)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12242 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 29 Oct 2013 05:18:06 +0000 (05:18 +0000)]

Gemfile: update Rails version 3.2.15

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12241 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 26 Oct 2013 11:50:16 +0000 (11:50 +0000)]

Fixed test failure (#15182).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12240 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 26 Oct 2013 09:03:08 +0000 (09:03 +0000)]

Return to section anchor after wiki section edit (#15182).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12239 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 26 Oct 2013 08:55:50 +0000 (08:55 +0000)]

Upgrade CodeRay to 1.1.0 (#8253).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12238 e93f8b46-1217-0410-a6f0-8f06a7374b81

Mirror of redmine code source: https://github.com/redmine/redmine

RSS Atom