]>
source.dussan.org Git - redmine.git/log
Toshi MARUYAMA [Thu, 7 Dec 2017 12:22:22 +0000 (12:22 +0000)]
Merged r17060 from trunk to 3.2-stable (#27516)
mercurial: reject malicious command argument
We've got a security report from the Phabricator team, which basically says
--config and --debugger arguments can be injected anywhere to lead to an
arbitrary command execution.
https://secure.phabricator.com/rPa7921a4448093d00defa8bd18f35b8c8f8bf3314
This is a fundamental issue of the argument parsing rules in Mercurial, which
allows extensions to populate their parsing rules and such extensions can be
loaded by "--config extensions.<name>=". There's a chicken and egg problem.
We're working on hardening the parsing rules, but which won't come in by
default as it would be a behavior change.
This patch adds a verification to reject malicious command arguments as a
last ditch. The subsequent patches will fix the problem in more appropriate
way.
Contributed by Yuya Nishihara.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@17074
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Thu, 7 Dec 2017 12:22:11 +0000 (12:22 +0000)]
Merged r16421 from trunk to 3.2-stable.
set "warning = false" for "rake test:scm:units" and "rake test:scm:functionals"
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@17073
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 5 Nov 2017 19:42:42 +0000 (19:42 +0000)]
Merged r17019 from trunk to 3.2-stable
Gemfile: pin mail gem version to prevent failure of MailHandlerTest#test_add_issue_with_localized_attributes
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@17022
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Thu, 19 Oct 2017 15:53:33 +0000 (15:53 +0000)]
3.2-stable: Gemfile: pin public_suffix if ruby < 2.0 (#27229)
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@17016
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Tue, 17 Oct 2017 15:09:09 +0000 (15:09 +0000)]
3.2-stable: Gemfile: pin public_suffix if ruby < 2.1
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@17013
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 15 Oct 2017 19:53:13 +0000 (19:53 +0000)]
Updates for 3.2.8 release.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@17007
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 15 Oct 2017 11:15:54 +0000 (11:15 +0000)]
Merged r16983 to r16985 (#27186).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16988
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Thu, 12 Oct 2017 17:40:06 +0000 (17:40 +0000)]
Merged r16971 (#27186).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16974
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 2 Jul 2017 11:55:14 +0000 (11:55 +0000)]
Updates for 3.2.7 release.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16745
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 2 Jul 2017 11:52:05 +0000 (11:52 +0000)]
Fix changelog markup (#25616).
Patch by Mischa The Evil.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16743
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Mon, 26 Jun 2017 13:12:08 +0000 (13:12 +0000)]
Merged r16708 from trunk to 3.2-stable (#26261, #26263)
Simplified Chinese translation for 3.2-stable updated by Steven Wong.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16717
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 25 Jun 2017 08:37:20 +0000 (08:37 +0000)]
Merged r16676 (#26183).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16684
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 7 Jun 2017 19:36:48 +0000 (19:36 +0000)]
Merged r16626 (#25212).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16633
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 7 Jun 2017 19:35:35 +0000 (19:35 +0000)]
Merged r16622 to r16625 (#26055).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16631
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 7 Jun 2017 19:34:01 +0000 (19:34 +0000)]
Merged r16619 (#26072).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16629
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Tue, 6 Jun 2017 21:17:16 +0000 (21:17 +0000)]
Merged r16574 (#25760).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16621
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Tue, 6 Jun 2017 20:56:47 +0000 (20:56 +0000)]
Merged r16572 (#25861).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16618
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Tue, 6 Jun 2017 05:16:49 +0000 (05:16 +0000)]
Merged r16611 from trunk to 3.2-stable.
Gemfile: ping roadie version 3.2 to prevent decadency failure on CI server Ruby 2.1.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16614
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 27 May 2017 08:36:13 +0000 (08:36 +0000)]
Merged r16568 (#25634).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16571
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 27 May 2017 07:40:24 +0000 (07:40 +0000)]
Merged r16557 (#25713).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16567
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 27 May 2017 07:36:01 +0000 (07:36 +0000)]
Merged r16556 (#25745).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16565
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 27 May 2017 07:34:42 +0000 (07:34 +0000)]
Merged r16554 and r16555 (#25653).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16563
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 27 May 2017 07:33:09 +0000 (07:33 +0000)]
Merged r16553 (#25829).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16561
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Wed, 10 May 2017 12:27:57 +0000 (12:27 +0000)]
Merged r16546 from trunk to 3.2-stable (#25807)
Gemfile: pin roadie-rails version 1.1.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16548
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 9 Apr 2017 08:30:16 +0000 (08:30 +0000)]
Updates for 3.2.6 release.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16534
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 9 Apr 2017 08:15:02 +0000 (08:15 +0000)]
Merged r16520 (#22335, #24271).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16531
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 8 Apr 2017 07:47:09 +0000 (07:47 +0000)]
Merged r16500 to r16503 (#25503).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16524
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 8 Apr 2017 07:39:30 +0000 (07:39 +0000)]
Merged r16504 (#25478).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16522
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Fri, 7 Apr 2017 08:24:47 +0000 (08:24 +0000)]
Merged r16515 and r16516 from trunk to 3.2-stable
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16519
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Thu, 6 Apr 2017 20:07:00 +0000 (20:07 +0000)]
Merged r16507 from trunk to 3.2-stable (#22335, #24271)
Gemfile: use rbpdf 1.19.0.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16513
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Thu, 6 Apr 2017 18:07:54 +0000 (18:07 +0000)]
total_spent_hours not returned in 3.2 (#25526).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16510
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 5 Apr 2017 16:12:51 +0000 (16:12 +0000)]
Merged r16492 (#25526).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16496
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 5 Apr 2017 16:12:04 +0000 (16:12 +0000)]
Merged r16491 (#25526).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16494
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Wed, 5 Apr 2017 11:05:40 +0000 (11:05 +0000)]
Merged r16485 from trunk to 3.2-stable (#22335, #24271)
Gemfile: explicitly use rbpdf 1.19.1.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16487
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Mon, 3 Apr 2017 16:44:15 +0000 (16:44 +0000)]
Merged r16470 from trunk to 3.2-stable (#25349, #25505)
Russian translation for 3.2-stable updated by Kirill Bezrukov.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16472
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Wed, 29 Mar 2017 05:56:03 +0000 (05:56 +0000)]
Merged r16438 from trunk to 3.2-stable (#25204, #25458)
Portuguese translation for 3.2-stable updated by Rui Rebelo.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16440
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Wed, 29 Mar 2017 05:24:19 +0000 (05:24 +0000)]
Merged r16433 from trunk to 3.2-stable (#25204, #25458)
Portuguese translation for 3.2-stable updated by Rui Rebelo.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16437
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Fri, 24 Mar 2017 16:18:29 +0000 (16:18 +0000)]
Merged r16428 from trunk to 3.2-stable (#25371)
git: use '--no-renames' option in 'show' command.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16430
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
projects / redmine.git / log