]>
source.dussan.org Git - redmine.git/log
Go MAEDA [Sat, 10 Nov 2018 23:02:47 +0000 (23:02 +0000)]
Merged r17625 from trunk to 3.4-stable (#8317).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17627
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Wed, 31 Oct 2018 07:39:54 +0000 (07:39 +0000)]
Merged r17614 from trunk to 3.4-stable (#29791).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17615
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sun, 28 Oct 2018 11:04:15 +0000 (11:04 +0000)]
Merged r17603 from trunk to 3.4-stable (#29756).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17604
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sat, 6 Oct 2018 07:03:19 +0000 (07:03 +0000)]
Galician translation update for 3.4-stable (#29736).
Patch by Guillermo ML.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17581
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sat, 6 Oct 2018 06:13:49 +0000 (06:13 +0000)]
Merged r17577 from trunk to 3.4-stable (#29735).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17578
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sat, 6 Oct 2018 00:17:11 +0000 (00:17 +0000)]
Merged r17574 from trunk to 3.4-stable (#28565).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17575
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Tue, 2 Oct 2018 23:27:32 +0000 (23:27 +0000)]
Brazilian translation update for 3.4-stable (#29718, #29698).
Patch by Patrick Kaminski.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17562
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Mon, 1 Oct 2018 09:54:49 +0000 (09:54 +0000)]
Brazilian wiki help translation update for 3.4-stable (#29702).
Patch by Patrick Kaminski.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17556
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Mon, 1 Oct 2018 03:54:03 +0000 (03:54 +0000)]
Merged r17552 from trunk to 3.4-stable (#29703).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17553
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Mon, 24 Sep 2018 22:26:15 +0000 (22:26 +0000)]
Update Rails to 4.2.10 (#29667).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17518
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 15 Sep 2018 09:08:35 +0000 (09:08 +0000)]
Merged r17488 to 3.4-stable (#28925).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17489
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 15 Sep 2018 06:47:03 +0000 (06:47 +0000)]
Merged r17484 to 3.4-stable (#28925).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17485
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sat, 25 Aug 2018 09:33:01 +0000 (09:33 +0000)]
Merged r17474 from trunk to 3.4-stable (#29413).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17475
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Thu, 2 Aug 2018 08:46:16 +0000 (08:46 +0000)]
Merged r17459 from trunk to 3.4-stable (#29308).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17460
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sat, 21 Jul 2018 00:17:51 +0000 (00:17 +0000)]
Merged r17450 from trunk to 3.4-stable (#29247).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17451
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Mon, 16 Jul 2018 02:03:19 +0000 (02:03 +0000)]
Merged r17447 from trunk to 3.4-stable (#24309).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17448
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sun, 8 Jul 2018 07:26:11 +0000 (07:26 +0000)]
Merged r17436 from trunk to 3.4-stable (#29133).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17437
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Fri, 6 Jul 2018 01:38:33 +0000 (01:38 +0000)]
Merged r17432 from trunk to 3.4-stable (#29191).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17433
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Mon, 2 Jul 2018 03:03:12 +0000 (03:03 +0000)]
Merged r17428 from trunk to 3.4-stable (#29038).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17429
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Mon, 25 Jun 2018 08:55:06 +0000 (08:55 +0000)]
Merged r17414 from trunk to 3.4-stable (#28125).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17415
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Fri, 22 Jun 2018 08:08:37 +0000 (08:08 +0000)]
Merged r17405 from trunk to 3.4-stable (#28125).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17408
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sun, 17 Jun 2018 01:07:38 +0000 (01:07 +0000)]
Merged r17390 from trunk to 3.4-stable (#28946).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17391
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 10 Jun 2018 18:00:42 +0000 (18:00 +0000)]
Use capybara 2 for ruby2.2
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17382
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 10 Jun 2018 06:14:52 +0000 (06:14 +0000)]
Merged r17377 to 3.4-stable.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17378
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 10 Jun 2018 06:00:18 +0000 (06:00 +0000)]
Merged r17373 to 3.4-stable (#28649).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17374
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Thu, 7 Jun 2018 00:37:12 +0000 (00:37 +0000)]
Merged r17368 from trunk to 3.4-stable (#27863).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17369
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sun, 3 Jun 2018 05:00:25 +0000 (05:00 +0000)]
Merged r17231 from trunk to 3.4-stable (#27090).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17364
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sun, 3 Jun 2018 03:45:06 +0000 (03:45 +0000)]
merged r17362 from trunk to 3.4-stable (#28693).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17363
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sun, 3 Jun 2018 01:30:33 +0000 (01:30 +0000)]
Merged r17359 and r17360 from trunk to 3.4-stable (#28693).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17361
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Mon, 28 May 2018 11:43:07 +0000 (11:43 +0000)]
Merged r17351 from trunk to 3.4-stable (#28725).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17352
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Fri, 25 May 2018 11:15:57 +0000 (11:15 +0000)]
Merged r17348 from trunk to 3.4-stable (#28881).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17349
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sat, 19 May 2018 01:31:35 +0000 (01:31 +0000)]
Merged r17342 from trunk to 3.4-stable (#28765).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17343
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Tue, 15 May 2018 00:22:18 +0000 (00:22 +0000)]
Merged r17337 from trunk to 3.4-stable (#22023).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17338
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Wed, 2 May 2018 02:29:40 +0000 (02:29 +0000)]
Merged r17322 from trunk to 3.4-stable (#28469).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17323
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sat, 28 Apr 2018 23:52:00 +0000 (23:52 +0000)]
Merged r17316 from trunk to 3.4-stable (#27122).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17317
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Thu, 12 Apr 2018 00:50:38 +0000 (00:50 +0000)]
Merged r17296 from trunk to 3.4-stable (#28523).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17297
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 7 Apr 2018 12:26:31 +0000 (12:26 +0000)]
Merged r17286.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17287
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 7 Apr 2018 09:30:21 +0000 (09:30 +0000)]
Merged r17280 into 3.4-stable (#27884).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17281
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 7 Apr 2018 08:20:43 +0000 (08:20 +0000)]
Merged r17277 into 3.4-stable.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17278
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 7 Apr 2018 08:15:17 +0000 (08:15 +0000)]
Merged test from r17263 into 3.4-stable (#28208).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17275
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 7 Apr 2018 08:08:04 +0000 (08:08 +0000)]
Merged r17272 into 3.4-stable (#26857).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17273
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 7 Apr 2018 07:50:30 +0000 (07:50 +0000)]
Merged r17269 into 3.4-stable (#28302).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17270
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 7 Apr 2018 07:43:22 +0000 (07:43 +0000)]
Merged r17266 into 3.4-stable (#25299).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17267
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 7 Apr 2018 07:29:25 +0000 (07:29 +0000)]
Merged r17263 into 3.4-stable (#28208).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17264
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 7 Apr 2018 07:02:22 +0000 (07:02 +0000)]
Merged r17260 into 3.4-stable (#27884).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17261
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sat, 7 Apr 2018 00:31:57 +0000 (00:31 +0000)]
Merged r17257 from trunk to 3.4-stable (#28180).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17258
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sat, 31 Mar 2018 05:31:27 +0000 (05:31 +0000)]
Merged r17198 to 3.4-stable (#28119).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17247
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Wed, 28 Mar 2018 09:13:33 +0000 (09:13 +0000)]
Merged r17241 from trunk to 3.4-stable (#28331).
Patch by Mizuki ISHIKAWA.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17242
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sun, 25 Mar 2018 09:52:23 +0000 (09:52 +0000)]
Merged r17237 from trunk to 3.4-stable (#28393).
Patch by Gregor Schmidt.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17238
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Fri, 2 Mar 2018 08:29:18 +0000 (08:29 +0000)]
Merged r17223 from trunk to 3.4-stable (#28192).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17224
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Fri, 2 Mar 2018 04:36:07 +0000 (04:36 +0000)]
Merged r17219 from trunk to 3.4-stable (#28259).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17220
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Fri, 23 Feb 2018 08:23:36 +0000 (08:23 +0000)]
Merged r17209 from trunk to 3.4-stable (#28079).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17210
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Thu, 22 Feb 2018 00:05:57 +0000 (00:05 +0000)]
Merged r17207 from trunk to 3.4-stable (#28079).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17208
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sun, 18 Feb 2018 12:25:26 +0000 (12:25 +0000)]
Merged r17204 from trunk to 3.4-stable (#28168).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17205
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sun, 18 Feb 2018 05:21:22 +0000 (05:21 +0000)]
3.4-stable: Too large avatar breaks gantt when assignee is a group (#28204).
Patch by Go MAEDA.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17202
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sun, 18 Feb 2018 04:33:30 +0000 (04:33 +0000)]
Merged r17199 from trunk to 3.4-stable (#28110).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17200
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sun, 11 Feb 2018 04:54:25 +0000 (04:54 +0000)]
Merged r17195 from trunk to 3.4-stable (#28113).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17196
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Thu, 1 Feb 2018 06:56:26 +0000 (06:56 +0000)]
Merged r17192 from trunk to 3.4-stable (#28102).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17193
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Wed, 31 Jan 2018 18:34:51 +0000 (18:34 +0000)]
Merged r17188 from trunk to 3.4-stable (#28109)
fix interpolation in Swedish locale.
Contributed by Felix Schäfer.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17190
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Fri, 19 Jan 2018 05:09:50 +0000 (05:09 +0000)]
Merged r17181 from trunk to 3.4-stable (#27862).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17182
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Wed, 17 Jan 2018 02:52:28 +0000 (02:52 +0000)]
Merged r17177 from trunk to 3.4-stable (#27994).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17178
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Wed, 10 Jan 2018 08:40:14 +0000 (08:40 +0000)]
Merged r17170 from trunk to 3.4-stable (#27963).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17171
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Mon, 8 Jan 2018 17:59:06 +0000 (17:59 +0000)]
Merged r17162 to 3.4-stable.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17163
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Mon, 8 Jan 2018 17:54:28 +0000 (17:54 +0000)]
Merged r17160 to 3.4-stable (#20513).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17161
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Mon, 8 Jan 2018 17:52:19 +0000 (17:52 +0000)]
Merged r17158 to 3.4-stable (#26705).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17159
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 7 Jan 2018 22:29:24 +0000 (22:29 +0000)]
Merged r17155 and r17156 to 3.4-stable (#27153).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17157
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 7 Jan 2018 22:21:32 +0000 (22:21 +0000)]
Merged r17153 to 3.4-stable (#26880).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17154
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 7 Jan 2018 22:05:47 +0000 (22:05 +0000)]
Merged r17150 to 3.4-stable (#26699).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17151
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 7 Jan 2018 21:47:48 +0000 (21:47 +0000)]
Merged r17147 to 3.4-stable (#27885).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17148
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 7 Jan 2018 21:43:04 +0000 (21:43 +0000)]
Merged r17144 to 3.4-stable (#27881).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17145
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sun, 7 Jan 2018 01:30:21 +0000 (01:30 +0000)]
Merged r17141 from trunk to 3.4-stable (#27695).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17142
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Tue, 26 Dec 2017 07:09:42 +0000 (07:09 +0000)]
Merged r17129 to 3.4-stable (#27533).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17130
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Thu, 21 Dec 2017 16:26:44 +0000 (16:26 +0000)]
Merged r17123 from trunk to 3.4-stable (#27620)
Brazilian translation for 3.4-stable update by Patrick Kaminski.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17125
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Thu, 21 Dec 2017 16:26:30 +0000 (16:26 +0000)]
Merged r17122 from trunk to 3.4-stable (#27620, #27835)
Brazilian translation for 3.3-stable update by Patrick Kaminski.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17124
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 17 Dec 2017 06:23:36 +0000 (06:23 +0000)]
Merged r17116 from trunk to 3.4-stable (#27691)
Gemfile: relax mail gem version.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17117
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Wed, 13 Dec 2017 14:07:15 +0000 (14:07 +0000)]
Merged r17113 to 3.4-stable (#22532).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17114
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Mon, 11 Dec 2017 17:46:55 +0000 (17:46 +0000)]
3.4-stable: Gemfile: use nokogiri 1.8 for Ruby >= 2.1 (#27505)
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17112
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Mon, 11 Dec 2017 03:15:57 +0000 (03:15 +0000)]
Merged r17108 to 3.4-stable (#19578).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17109
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sun, 10 Dec 2017 15:44:02 +0000 (15:44 +0000)]
iMerged r17105 to 3.4-stable (#27333).
Patch by Mizuki ISHIKAWA.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17106
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sat, 9 Dec 2017 18:52:06 +0000 (18:52 +0000)]
Merged r17089 from trunk to 3.4-stable (#27507, #27767)
Czech help files translation for 3.4-stable updated by Karel Pičman.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17097
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sat, 9 Dec 2017 18:51:55 +0000 (18:51 +0000)]
Merged r17088 from trunk to 3.4-stable
Czech help files html clean up
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17096
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sat, 9 Dec 2017 18:51:41 +0000 (18:51 +0000)]
Merged r17087 from trunk to 3.4-stable (#27507, #27766)
Czech help files translation for 3.3-stable updated by Karel Pičman.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17095
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sat, 9 Dec 2017 18:51:28 +0000 (18:51 +0000)]
Merged r17086 from trunk to 3.4-stable (#20452)
fix public/help/cs/wiki_syntax_detailed_markdown.html broken by r14519.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17094
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sat, 9 Dec 2017 18:51:17 +0000 (18:51 +0000)]
Merged r17084 from trunk to 3.4-stable (#27506, #27767)
Czech translation for 3.4-stable updated by Karel Pičman.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17093
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sat, 9 Dec 2017 18:51:07 +0000 (18:51 +0000)]
Merged r17083 from trunk to 3.4-stable (#27506, #27766)
Czech translation for 3.3-stable updated by Karel Pičman.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17092
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sat, 9 Dec 2017 18:50:56 +0000 (18:50 +0000)]
Merged r17082 from trunk to 3.4-stable (#27502)
Lithuanian translation for 3.4-stable updated by Marius Žilėnas.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17091
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sat, 9 Dec 2017 18:50:46 +0000 (18:50 +0000)]
Merged r17081 from trunk to 3.4-stable (#27502, #27765)
Lithuanian translation for 3.3-stable updated by Marius Žilėnas.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17090
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sat, 9 Dec 2017 02:43:09 +0000 (02:43 +0000)]
Merged r17078 to 3.4-stable (#27754).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17079
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Thu, 7 Dec 2017 12:16:07 +0000 (12:16 +0000)]
Merged r17062 from trunk to 3.4-stable (#27516)
mercurial: work around faulty parsing of early command options
Use -sVALUE and --long=VALUE instead of "-s VALUE" and "--long VALUE"
respectively.
Contributed by Yuya Nishihara.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17068
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Thu, 7 Dec 2017 12:15:56 +0000 (12:15 +0000)]
Merged r17061 from trunk to 3.4-stable (#27516)
mercurial: separate command options and positional arguments with "--"
We don't have much problems here thanks to hgtarget(path) and CGI.escape(),
which prepends a repository path and encodes "=" character respectively, but
it's better to not rely on the side effect of these functions.
Contributed by Yuya Nishihara.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17067
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Thu, 7 Dec 2017 12:15:45 +0000 (12:15 +0000)]
Merged r17060 from trunk to 3.4-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.4-stable@17066
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Wed, 6 Dec 2017 13:23:52 +0000 (13:23 +0000)]
Merged r17056 to 3.4-stable (#27663).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17057
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Mon, 27 Nov 2017 15:21:35 +0000 (15:21 +0000)]
Merged r17045 to 3.4-stable (#27649).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17046
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Mon, 27 Nov 2017 14:57:34 +0000 (14:57 +0000)]
Merged r17042 to 3.4-stale (#27642).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17043
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Mon, 27 Nov 2017 13:05:20 +0000 (13:05 +0000)]
Merged r17039 to 3.4-stable (#27139).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17040
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sun, 26 Nov 2017 02:26:33 +0000 (02:26 +0000)]
Merged r17032 to 3.4-stable (#27110).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17033
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sat, 25 Nov 2017 15:35:32 +0000 (15:35 +0000)]
Merged r17027 to 3.4-stable (#26410).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17028
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Go MAEDA [Sat, 25 Nov 2017 12:54:44 +0000 (12:54 +0000)]
Merged r17023 to 3.4-stable (#27586).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17024
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 5 Nov 2017 19:39:12 +0000 (19:39 +0000)]
Merged r17019 from trunk to 3.4-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.4-stable@17020
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Thu, 19 Oct 2017 15:50:51 +0000 (15:50 +0000)]
3.4-stable: Gemfile: pin public_suffix if ruby < 2.0 (#27229)
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17014
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
projects / redmine.git / log