]> source.dussan.org Git - redmine.git/log
redmine.git
7 years agoMerged r16422 from trunk to 3.2-stable (#25371)
Toshi MARUYAMA [Mon, 20 Mar 2017 18:05:10 +0000 (18:05 +0000)]
Merged r16422 from trunk to 3.2-stable (#25371)

Git 2.9 compatibility.

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

7 years agoMerged r16329 from trunk to 3.2-stable (#24999)
Toshi MARUYAMA [Sun, 5 Feb 2017 05:55:03 +0000 (05:55 +0000)]
Merged r16329 from trunk to 3.2-stable (#24999)

Mercurial 4.1 compatibility.

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

7 years agoMerged r16324 from trunk to 3.2-stable.
Toshi MARUYAMA [Thu, 2 Feb 2017 07:28:56 +0000 (07:28 +0000)]
Merged r16324 from trunk to 3.2-stable.

Gemfile: pin i18n version 0.7.0.

i18n 0.8.0 causes error.

<pre>
Redmine::I18nTest#test_languages_options_should_ignore_locales_without_general_lang_name_key:
I18n::InvalidLocale: "foo" is not a valid locale
    lib/redmine/i18n.rb:58:in `ll'
    lib/redmine/i18n.rb:122:in `block in languages_options'
    lib/redmine/i18n.rb:122:in `map'
    lib/redmine/i18n.rb:122:in `languages_options'
    test/unit/lib/redmine/i18n_test.rb:203:in `test_languages_options_should_ignore_locales_without_general_lang_name_key'
</pre>

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

7 years agoBackported r16293 (#24875).
Jean-Philippe Lang [Mon, 30 Jan 2017 17:54:08 +0000 (17:54 +0000)]
Backported r16293 (#24875).

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

7 years agoMerged r16292 (#20661).
Jean-Philippe Lang [Mon, 30 Jan 2017 17:47:39 +0000 (17:47 +0000)]
Merged r16292 (#20661).

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

7 years agoTest failure introduced in r16295 (#24199).
Jean-Philippe Lang [Mon, 30 Jan 2017 17:36:49 +0000 (17:36 +0000)]
Test failure introduced in r16295 (#24199).

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

7 years agoMerged r16284 (#23803).
Jean-Philippe Lang [Sun, 29 Jan 2017 10:46:15 +0000 (10:46 +0000)]
Merged r16284 (#23803).

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

7 years agoMerged r16283 (#23793).
Jean-Philippe Lang [Sun, 29 Jan 2017 10:44:51 +0000 (10:44 +0000)]
Merged r16283 (#23793).

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

7 years agoMerged r16287 to r16289 (#24416).
Jean-Philippe Lang [Sun, 29 Jan 2017 10:42:58 +0000 (10:42 +0000)]
Merged r16287 to r16289 (#24416).

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

7 years agoMerged r16286 (#24307).
Jean-Philippe Lang [Sun, 29 Jan 2017 10:41:33 +0000 (10:41 +0000)]
Merged r16286 (#24307).

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

7 years agoBackported r16285 (#24199).
Jean-Philippe Lang [Sun, 29 Jan 2017 10:39:50 +0000 (10:39 +0000)]
Backported r16285 (#24199).

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

7 years agoMerged r16227 (#24869).
Jean-Philippe Lang [Sun, 29 Jan 2017 10:25:36 +0000 (10:25 +0000)]
Merged r16227 (#24869).

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

7 years agoMerged r16277 from trunk to 3.2-stable (#24949, #24923)
Toshi MARUYAMA [Sat, 28 Jan 2017 14:33:46 +0000 (14:33 +0000)]
Merged r16277 from trunk to 3.2-stable (#24949, #24923)

Bulgarian translation for 3.2-stable updated by Ivan Cenov.

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

7 years agoMerged r16235 from trunk to 3.2-stable (#24751, #24886)
Toshi MARUYAMA [Fri, 20 Jan 2017 14:01:16 +0000 (14:01 +0000)]
Merged r16235 from trunk to 3.2-stable (#24751, #24886)

Japanese translation for 3.2-stable updated by Go MAEDA.

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

7 years agoMerged r16212 from trunk to 3.2-stable (#24824)
Toshi MARUYAMA [Tue, 17 Jan 2017 05:30:45 +0000 (05:30 +0000)]
Merged r16212 from trunk to 3.2-stable (#24824)

Traditional Chinese translation for 3.2-stable updated by ChunChang Lo.

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

7 years agoMerged r16167 from trunk to 3.2-stable.
Toshi MARUYAMA [Mon, 9 Jan 2017 16:42:20 +0000 (16:42 +0000)]
Merged r16167 from trunk to 3.2-stable.

Gemfile: pin nokogiri version 1.6.

nokogiri 1.7.0.1 requires Ruby version >= 2.1.0.

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

7 years agoMerged r16092.
Jean-Philippe Lang [Sat, 7 Jan 2017 08:40:49 +0000 (08:40 +0000)]
Merged r16092.

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

7 years agoUpdates for 3.2.5 release.
Jean-Philippe Lang [Sat, 7 Jan 2017 08:39:03 +0000 (08:39 +0000)]
Updates for 3.2.5 release.

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

7 years agoMerged r16138 (#14658).
Jean-Philippe Lang [Sat, 7 Jan 2017 07:52:30 +0000 (07:52 +0000)]
Merged r16138 (#14658).

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

7 years agoMerged r16134 (#24283).
Jean-Philippe Lang [Wed, 4 Jan 2017 20:56:28 +0000 (20:56 +0000)]
Merged r16134 (#24283).

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

7 years agoMerged r16118 to r16122 (#24693, #24718, #24722).
Jean-Philippe Lang [Wed, 4 Jan 2017 20:50:27 +0000 (20:50 +0000)]
Merged r16118 to r16122 (#24693, #24718, #24722).

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

7 years agoMerged r16114 (#24646).
Jean-Philippe Lang [Wed, 4 Jan 2017 19:52:54 +0000 (19:52 +0000)]
Merged r16114 (#24646).

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

7 years agoMerged r16116 (#22034).
Jean-Philippe Lang [Wed, 4 Jan 2017 19:48:11 +0000 (19:48 +0000)]
Merged r16116 (#22034).

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

7 years agoMerged r16125.
Jean-Philippe Lang [Wed, 4 Jan 2017 18:00:43 +0000 (18:00 +0000)]
Merged r16125.

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

7 years agoMerged r16059, r16060, r16064, r16072.
Jean-Philippe Lang [Tue, 20 Dec 2016 16:09:28 +0000 (16:09 +0000)]
Merged r16059, r16060, r16064, r16072.

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

7 years agoFix test in 3.2-stable (#14817).
Jean-Philippe Lang [Tue, 20 Dec 2016 15:49:23 +0000 (15:49 +0000)]
Fix test in 3.2-stable (#14817).

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

7 years agoMerged r16071 (#24595).
Jean-Philippe Lang [Tue, 20 Dec 2016 09:05:31 +0000 (09:05 +0000)]
Merged r16071 (#24595).

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

7 years agoMerged r16056 (#14817).
Jean-Philippe Lang [Tue, 20 Dec 2016 09:02:14 +0000 (09:02 +0000)]
Merged r16056 (#14817).

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

7 years agoMerged r16057 (#13622).
Jean-Philippe Lang [Tue, 20 Dec 2016 09:01:08 +0000 (09:01 +0000)]
Merged r16057 (#13622).

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

7 years agoMerged r16049 (#24156).
Jean-Philippe Lang [Tue, 20 Dec 2016 08:59:58 +0000 (08:59 +0000)]
Merged r16049 (#24156).

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

7 years agoMerged r15958 (#24296).
Jean-Philippe Lang [Sat, 26 Nov 2016 09:05:57 +0000 (09:05 +0000)]
Merged r15958 (#24296).

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

7 years agoMerged r15989 and r15991 (#24283).
Jean-Philippe Lang [Sat, 26 Nov 2016 09:04:49 +0000 (09:04 +0000)]
Merged r15989 and r15991 (#24283).

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

7 years agoMerged r15950 (#24348).
Jean-Philippe Lang [Sat, 26 Nov 2016 09:02:52 +0000 (09:02 +0000)]
Merged r15950 (#24348).

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

7 years agoMerged r15955 and r15956 (#24297).
Jean-Philippe Lang [Sat, 26 Nov 2016 09:01:20 +0000 (09:01 +0000)]
Merged r15955 and r15956 (#24297).

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

8 years agoGemfile: merge r15915, r15916, r15944, and r15945 from trunk to 3.2-stable (#24092)
Toshi MARUYAMA [Sat, 5 Nov 2016 18:10:41 +0000 (18:10 +0000)]
Gemfile: merge r15915, r15916, r15944, and r15945 from trunk to 3.2-stable (#24092)

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

8 years agoUpdates for 3.2.4.
Jean-Philippe Lang [Mon, 10 Oct 2016 07:46:12 +0000 (07:46 +0000)]
Updates for 3.2.4.

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

8 years agoMerged r15849 (#23883).
Jean-Philippe Lang [Sun, 2 Oct 2016 10:20:19 +0000 (10:20 +0000)]
Merged r15849 (#23883).

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

8 years agoMerged r15848 (#23764).
Jean-Philippe Lang [Sun, 2 Oct 2016 10:19:12 +0000 (10:19 +0000)]
Merged r15848 (#23764).

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

8 years agoMerged r15846 (#23841).
Jean-Philippe Lang [Sun, 2 Oct 2016 10:12:56 +0000 (10:12 +0000)]
Merged r15846 (#23841).

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

8 years agoMerged r15852 and r15863 (#23839).
Jean-Philippe Lang [Sun, 2 Oct 2016 10:10:11 +0000 (10:10 +0000)]
Merged r15852 and r15863 (#23839).

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

8 years agoMerged r15843 (#23829).
Jean-Philippe Lang [Sat, 1 Oct 2016 07:16:23 +0000 (07:16 +0000)]
Merged r15843 (#23829).

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

8 years agoMerged r15827 from trunk to 3.2-stable (#23387)
Toshi MARUYAMA [Thu, 8 Sep 2016 15:15:35 +0000 (15:15 +0000)]
Merged r15827 from trunk to 3.2-stable (#23387)

Traditional Chinese "issue" translation change.

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

8 years agoMerged r15826 from trunk to 3.2-stable (#23387)
Toshi MARUYAMA [Thu, 8 Sep 2016 15:15:24 +0000 (15:15 +0000)]
Merged r15826 from trunk to 3.2-stable (#23387)

Traditional Chinese textile and markdown detailed help translation for 3.2-stable by ChunChang Lo.

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

8 years agoMerged r15825 from trunk to 3.2-stable (#23387)
Toshi MARUYAMA [Thu, 8 Sep 2016 15:15:13 +0000 (15:15 +0000)]
Merged r15825 from trunk to 3.2-stable (#23387)

Traditional Chinese textile and markdown detailed help translation for 3.1-stable by ChunChang Lo.

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

8 years agoMerged r15820 (#23758).
Jean-Philippe Lang [Mon, 5 Sep 2016 17:16:21 +0000 (17:16 +0000)]
Merged r15820 (#23758).

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

8 years agoMerged r15816 (#23758).
Jean-Philippe Lang [Sun, 4 Sep 2016 17:12:11 +0000 (17:12 +0000)]
Merged r15816 (#23758).

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

8 years agoMerged r15800 from trunk to 3.2-stable (#23388, #23744)
Toshi MARUYAMA [Thu, 1 Sep 2016 18:36:24 +0000 (18:36 +0000)]
Merged r15800 from trunk to 3.2-stable (#23388, #23744)

German translation for 3.1-stable updated by JW Fuchs.

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

8 years agoMerged r15791 from trunk to 3.2-stable (#23497, #23737)
Toshi MARUYAMA [Thu, 1 Sep 2016 10:34:23 +0000 (10:34 +0000)]
Merged r15791 from trunk to 3.2-stable (#23497, #23737)

Russian translation for 3.2-stable updated by Alexander Ryabinovskiy.

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

8 years agoMerged r15786 from trunk to 3.2-stable (#23497, #23736)
Toshi MARUYAMA [Thu, 1 Sep 2016 04:31:56 +0000 (04:31 +0000)]
Merged r15786 from trunk to 3.2-stable (#23497, #23736)

Russian translation for 3.1-stable updated by Alexander Ryabinovskiy.

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

8 years agoMerged r15781 (#23708).
Jean-Philippe Lang [Wed, 31 Aug 2016 17:14:36 +0000 (17:14 +0000)]
Merged r15781 (#23708).

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

8 years agoMerged r15778 (#23389).
Jean-Philippe Lang [Wed, 31 Aug 2016 17:12:19 +0000 (17:12 +0000)]
Merged r15778 (#23389).

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

8 years agoMerged r15750 (#23655).
Jean-Philippe Lang [Wed, 31 Aug 2016 16:52:01 +0000 (16:52 +0000)]
Merged r15750 (#23655).

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

8 years agoMerged r15645 (#23269).
Jean-Philippe Lang [Sat, 20 Aug 2016 11:54:41 +0000 (11:54 +0000)]
Merged r15645 (#23269).

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

8 years ago3.2-stable: upgrade Rails to 4.2.7.1
Toshi MARUYAMA [Fri, 12 Aug 2016 04:49:44 +0000 (04:49 +0000)]
3.2-stable: upgrade Rails to 4.2.7.1

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

8 years agoMerged r15717 from trunk to 3.2-stable (#23117, #23374) 70/head
Toshi MARUYAMA [Wed, 20 Jul 2016 05:33:09 +0000 (05:33 +0000)]
Merged r15717 from trunk to 3.2-stable (#23117, #23374)

Traditional Chinese "issue" translation in r15716 change.

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

8 years agoMerged r15716 from trunk to 3.2-stable (#23117)
Toshi MARUYAMA [Wed, 20 Jul 2016 05:32:57 +0000 (05:32 +0000)]
Merged r15716 from trunk to 3.2-stable (#23117)

Traditional Chinese textile and markdown help translation updated by ChunChang Lo.

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

8 years agoMerged r15704 from trunk to 3.2-stable (#23375, #23171)
Toshi MARUYAMA [Tue, 19 Jul 2016 17:00:26 +0000 (17:00 +0000)]
Merged r15704 from trunk to 3.2-stable (#23375, #23171)

Simplified Chinese translation for 3.1-stable updated by Tigergm Wu.

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

8 years agoMerged r15703 from trunk to 3.2-stable (#20720, #23171, #23373, #23374)
Toshi MARUYAMA [Tue, 19 Jul 2016 17:00:15 +0000 (17:00 +0000)]
Merged r15703 from trunk to 3.2-stable (#20720, #23171, #23373, #23374)

Traditional Chinese "issue" translation in r15702 change.

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

8 years agoMerged r15702 from trunk to 3.2-stable (#23171, #23373, #23374)
Toshi MARUYAMA [Tue, 19 Jul 2016 17:00:05 +0000 (17:00 +0000)]
Merged r15702 from trunk to 3.2-stable (#23171, #23373, #23374)

Traditional Chinese translation updated by Tigergm Wu.

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

8 years agoMerged r15609 (#23278).
Jean-Philippe Lang [Mon, 11 Jul 2016 18:10:01 +0000 (18:10 +0000)]
Merged r15609 (#23278).

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

8 years agoMerged r15607 (#23246).
Jean-Philippe Lang [Sun, 10 Jul 2016 07:47:07 +0000 (07:47 +0000)]
Merged r15607 (#23246).

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

8 years agoMerged r15608 (#23206).
Jean-Philippe Lang [Sun, 10 Jul 2016 07:45:54 +0000 (07:45 +0000)]
Merged r15608 (#23206).

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

8 years agoMerged r15539 and r15550 (#23067).
Jean-Philippe Lang [Sat, 18 Jun 2016 10:16:51 +0000 (10:16 +0000)]
Merged r15539 and r15550 (#23067).

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

8 years agoMerged r15532 and r15533 (#23054).
Jean-Philippe Lang [Sat, 18 Jun 2016 06:02:32 +0000 (06:02 +0000)]
Merged r15532 and r15533 (#23054).

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

8 years agoMerged r15510 (#22123).
Jean-Philippe Lang [Sun, 12 Jun 2016 06:03:40 +0000 (06:03 +0000)]
Merged r15510 (#22123).

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

8 years agoMerged r15484 from trunk to 3.2-stable (#23000, #23003)
Toshi MARUYAMA [Tue, 7 Jun 2016 13:05:14 +0000 (13:05 +0000)]
Merged r15484 from trunk to 3.2-stable (#23000, #23003)

Bulgarian translation for 3.1-stable updated by Ivan Cenov.

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

8 years agoMerged r15448 from trunk to 3.2-stable (#22974, #22988)
Toshi MARUYAMA [Mon, 6 Jun 2016 04:28:59 +0000 (04:28 +0000)]
Merged r15448 from trunk to 3.2-stable (#22974, #22988)

Czech translation updated Karel Pičman.

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

8 years agoMerged r15459.
Jean-Philippe Lang [Sun, 5 Jun 2016 07:21:40 +0000 (07:21 +0000)]
Merged r15459.

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

8 years agoUpdates for 3.2.3 release.
Jean-Philippe Lang [Sun, 5 Jun 2016 07:18:08 +0000 (07:18 +0000)]
Updates for 3.2.3 release.

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

8 years agoMerged r15452 (#22932).
Jean-Philippe Lang [Sun, 5 Jun 2016 07:07:47 +0000 (07:07 +0000)]
Merged r15452 (#22932).

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

8 years agoMerged r15442 (#22898).
Jean-Philippe Lang [Sat, 4 Jun 2016 09:56:53 +0000 (09:56 +0000)]
Merged r15442 (#22898).

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

8 years agoMerged r15431 to r15435 (#22924, #22925, #22926).
Jean-Philippe Lang [Sat, 4 Jun 2016 07:25:12 +0000 (07:25 +0000)]
Merged r15431 to r15435 (#22924, #22925, #22926).

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

8 years agoMerged r15429 (#22911).
Jean-Philippe Lang [Sat, 4 Jun 2016 07:19:27 +0000 (07:19 +0000)]
Merged r15429 (#22911).

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

8 years agoMerged r15428 (#22912).
Jean-Philippe Lang [Sat, 4 Jun 2016 07:18:07 +0000 (07:18 +0000)]
Merged r15428 (#22912).

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

8 years agoMerged r15416 (#22808).
Jean-Philippe Lang [Sat, 21 May 2016 06:50:25 +0000 (06:50 +0000)]
Merged r15416 (#22808).

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

8 years agoMerged r15385 from trunk to 3.2-stable (#22506, #22761)
Toshi MARUYAMA [Sat, 7 May 2016 14:05:01 +0000 (14:05 +0000)]
Merged r15385 from trunk to 3.2-stable (#22506, #22761)

Korean translation for 3.2-stable updated by Yonghwan SO.

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

8 years agoMerged r15384 from trunk to 3.2-stable (#22506, #22760)
Toshi MARUYAMA [Sat, 7 May 2016 14:04:51 +0000 (14:04 +0000)]
Merged r15384 from trunk to 3.2-stable (#22506, #22760)

Korean translation for 3.1-stable updated by Yonghwan SO.

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

8 years agoMerged r15376 from trunk to 3.2-stable (#22427)
Toshi MARUYAMA [Sat, 7 May 2016 10:57:33 +0000 (10:57 +0000)]
Merged r15376 from trunk to 3.2-stable (#22427)

Updates pt-BR translation.

Patch by Luiz Moura.

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

8 years agoMerged r15365.
Jean-Philippe Lang [Thu, 5 May 2016 18:28:26 +0000 (18:28 +0000)]
Merged r15365.

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

8 years agoMerged r15362 (#22721).
Jean-Philippe Lang [Thu, 5 May 2016 18:25:57 +0000 (18:25 +0000)]
Merged r15362 (#22721).

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

8 years agoMerged r15357 (#22583).
Jean-Philippe Lang [Sun, 24 Apr 2016 15:14:39 +0000 (15:14 +0000)]
Merged r15357 (#22583).

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

8 years agoMerged r15318 and r15319 (#22342).
Jean-Philippe Lang [Tue, 12 Apr 2016 16:55:30 +0000 (16:55 +0000)]
Merged r15318 and r15319 (#22342).

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

8 years agoMerged r15298 (#22354).
Jean-Philippe Lang [Sat, 9 Apr 2016 05:55:26 +0000 (05:55 +0000)]
Merged r15298 (#22354).

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

8 years agoMerged r15292 (#22134).
Jean-Philippe Lang [Sat, 9 Apr 2016 05:54:45 +0000 (05:54 +0000)]
Merged r15292 (#22134).

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

8 years agoMerged r15290 (#5156).
Jean-Philippe Lang [Sat, 9 Apr 2016 05:53:40 +0000 (05:53 +0000)]
Merged r15290 (#5156).

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

8 years agoMerged r15293 (#22305).
Jean-Philippe Lang [Sat, 9 Apr 2016 05:52:15 +0000 (05:52 +0000)]
Merged r15293 (#22305).

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

8 years agoMerged r15303 (#22336).
Jean-Philippe Lang [Sun, 3 Apr 2016 12:34:05 +0000 (12:34 +0000)]
Merged r15303 (#22336).

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

8 years agoMerged r15301 (#22296).
Jean-Philippe Lang [Sun, 3 Apr 2016 12:31:53 +0000 (12:31 +0000)]
Merged r15301 (#22296).

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

8 years agoMerged r15299 (#22278).
Jean-Philippe Lang [Sun, 3 Apr 2016 12:29:42 +0000 (12:29 +0000)]
Merged r15299 (#22278).

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

8 years agoMerged r15296 (#22196).
Jean-Philippe Lang [Sun, 3 Apr 2016 12:08:54 +0000 (12:08 +0000)]
Merged r15296 (#22196).

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

8 years agoMerged r15294 (#22105).
Jean-Philippe Lang [Sun, 3 Apr 2016 12:05:29 +0000 (12:05 +0000)]
Merged r15294 (#22105).

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

8 years agoMerged r15282 from trunk to 3.2-stable (#22319, #22134)
Toshi MARUYAMA [Sat, 26 Mar 2016 04:53:40 +0000 (04:53 +0000)]
Merged r15282 from trunk to 3.2-stable (#22319, #22134)

German "error_invalid_csv_file_or_settings" typo fixed by Jens Krämer.

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

8 years agoMerged r15252 from trunk to 3.2-stable
Toshi MARUYAMA [Thu, 24 Mar 2016 06:38:05 +0000 (06:38 +0000)]
Merged r15252 from trunk to 3.2-stable

NameError: uninitialized constant Redmine::ApiTest::GroupsTest::MultiJson

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

8 years agoMerged r15274 from trunk to 3.2-stable
Toshi MARUYAMA [Thu, 24 Mar 2016 05:53:32 +0000 (05:53 +0000)]
Merged r15274 from trunk to 3.2-stable

Gemfile: switch mime-types version by Ruby >= 2.0 or not

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

8 years agoMerged r15238.
Jean-Philippe Lang [Sun, 13 Mar 2016 10:41:37 +0000 (10:41 +0000)]
Merged r15238.

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

8 years agoMerged r15236.
Jean-Philippe Lang [Sun, 13 Mar 2016 10:16:54 +0000 (10:16 +0000)]
Merged r15236.

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

8 years agoMerged r15223 and r15225 (#22127).
Jean-Philippe Lang [Sun, 13 Mar 2016 08:20:37 +0000 (08:20 +0000)]
Merged r15223 and r15225 (#22127).

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

8 years agoMerged r15228 (#21487).
Jean-Philippe Lang [Sun, 13 Mar 2016 08:14:07 +0000 (08:14 +0000)]
Merged r15228 (#21487).

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

8 years agoMerged r15224 (#22178).
Jean-Philippe Lang [Sun, 13 Mar 2016 08:03:08 +0000 (08:03 +0000)]
Merged r15224 (#22178).

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

8 years agoMerged r15202 (#22108).
Jean-Philippe Lang [Sun, 13 Mar 2016 08:01:55 +0000 (08:01 +0000)]
Merged r15202 (#22108).

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