Commit Graph

7292 Commits

Author SHA1 Message Date
Jean-Philippe Lang
b50b9ec5b3 Merged r19676 to r19678 to 4.1-stable (#32774).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19679 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-04-06 10:02:27 +00:00
Jean-Philippe Lang
65103b92fb Merged r19663 to 4.1-stable (#32765).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19668 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-04-05 14:13:45 +00:00
Jean-Philippe Lang
60a37ffb20 Merged r19660 and r19661 to 4.1-stable (#32793).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19667 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-04-05 11:23:25 +00:00
Jean-Philippe Lang
9045c9b3d8 Merged r19658 and r19659 to 4.1-stable (#32889).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19666 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-04-05 11:22:08 +00:00
Jean-Philippe Lang
ae82276290 Merged r19655 to 4.1-stable (#33110).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19665 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-04-05 11:20:58 +00:00
Jean-Philippe Lang
d1360a67ab Merged r19653, r19654 and r19662 to 4.1-stable (#3800).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19664 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-04-05 11:19:53 +00:00
Jean-Philippe Lang
4b0ac7a78b Merged r19651 and r19652 to 4.1-stable (#32973).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19657 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-04-05 09:47:00 +00:00
Jean-Philippe Lang
0904708acf Merged r19530 to 4.1-stable (#32891).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19656 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-04-05 09:44:48 +00:00
Jean-Philippe Lang
69a7c3691d Merged r19646 to 4.1-stable (#33075).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19649 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-04-05 08:12:44 +00:00
Jean-Philippe Lang
882d87327b Merged r19486 to 19488 to 4.1-stable (#32850).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19647 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-04-05 08:04:27 +00:00
Go MAEDA
e1cb1c8530 Merged r19632 and r19633 from trunk to 4.1-stable (#33169).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19634 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-04-01 16:27:51 +00:00
Go MAEDA
aa60f3c8b1 Merged r19613 from trunk to 4.1-stable (#33183).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19614 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-03-24 12:59:31 +00:00
Go MAEDA
74065dc7cf Merged r19598 from trunk to 4.1-stable (#33156).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19599 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-03-20 07:06:36 +00:00
Go MAEDA
1d2ec423bb Merged r19588 and r19589 from trunk to 4.1-stable (#33085).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19590 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-03-20 02:35:40 +00:00
Go MAEDA
d9c4b9d2ec Merged r19586 from trunk to 4.1-stable (#33176).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19587 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-03-20 00:45:00 +00:00
Go MAEDA
48cfcc34da Merged r19581 from trunk to 4.1-stable (#33113).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19584 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-03-19 08:55:46 +00:00
Go MAEDA
70fe037aa1 Merged r19563 from trunk to 4.1-stable (#33083).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19564 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-03-07 07:53:23 +00:00
Go MAEDA
b03216f31a Merged r19559 from trunk to 4.1-stable (#33083).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19560 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-03-04 09:35:14 +00:00
Go MAEDA
5c1f407d82 Merged r19554 from trunk to 4.1-stable (#33052).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19557 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-03-04 07:45:36 +00:00
Go MAEDA
aff1ab714e Merged r19550 from trunk to 4.1-stable (#33068).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19551 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-03-01 02:36:04 +00:00
Go MAEDA
566a1d1f30 Merged r19537 from trunk to 4.1-stable (#32971).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19546 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-02-29 14:38:57 +00:00
Go MAEDA
e7a21a10a3 Merged r19538 from trunk to 4.1-stable (#33059).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19543 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-02-29 14:18:39 +00:00
Go MAEDA
f21681218e Merged r19527 from trunk to 4.1-stable (#33027).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19535 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-02-29 03:41:12 +00:00
Go MAEDA
f2524eb075 Merged r19531 from trunk to 4.1-stable (#32449).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19532 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-02-27 01:21:03 +00:00
Go MAEDA
40c063287f Merged r19501 from trunk to 4.1-stable (#32959).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19502 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-02-09 00:27:15 +00:00
Go MAEDA
b4ada2b5ef Merged r19469 from trunk to 4.1-stable (#32896).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19470 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-01-28 01:17:57 +00:00
Go MAEDA
6032751ad9 Merged r19421 from trunk to 4.1-stable (#32769).
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19422 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-01-12 07:04:16 +00:00
Go MAEDA
bd0909310a Merged r19419 from trunk to 4.1-stable (#32768).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19420 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-01-12 06:39:56 +00:00
Jean-Philippe Lang
80707491ab Merged r19385 to 4.1-stable.
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19389 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-12-20 08:52:56 +00:00
Jean-Philippe Lang
8dade83d1d Merged r19383 and r19384 to 4.1-stable.
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19388 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-12-20 08:52:23 +00:00
Jean-Philippe Lang
7d6fe34c52 Merged r19381 to 4.1-stable (#21766).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19387 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-12-20 08:51:01 +00:00
Jean-Philippe Lang
9db3386da4 Merged r19382 to 4.1-stable.
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19386 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-12-20 08:49:15 +00:00
Go MAEDA
42669e5300 Merged r19363 from trunk to 4.1-stable (#32546).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19369 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-12-13 00:35:27 +00:00
Go MAEDA
4e552b93e4 Merged r19365 from trunk to 4.1-stable (#20277).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19366 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-12-12 14:52:03 +00:00
Go MAEDA
044052336b Merged r19341 from trunk to 4.1-stable (#32500).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19342 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-12-06 00:26:45 +00:00
Go MAEDA
e9764d2d18 Merged r19325 from trunk to 4.1-stable (#31355, #32503).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19326 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-12-02 02:21:06 +00:00
Jean-Philippe Lang
e5d82b1fab Merged r19093 to 4.1-stable (#29482).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19101 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-11-20 16:03:33 +00:00
Jean-Philippe Lang
3e31ea7c5a Merged r19091 to 4.1-stable (#29482).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19094 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-11-20 15:54:36 +00:00
Jean-Philippe Lang
9d3f6cb3ae Merged r19079 to 4.1-stable (#32470).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19080 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-11-16 10:32:43 +00:00
Jean-Philippe Lang
131184e99a Reverts r19064 (#32436).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19078 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-11-16 10:25:45 +00:00
Jean-Philippe Lang
9746ab7e5b Add anonymous user to author list in issue/time query (#16904).
Patch by Yuichi HARADA and Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@19065 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-11-10 07:58:57 +00:00
Jean-Philippe Lang
4a447dda09 Add support for grouping by issue on timelog view (#32436).
Patch by Kouhei Sutou.

git-svn-id: http://svn.redmine.org/redmine/trunk@19063 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-11-10 07:56:47 +00:00
Jean-Philippe Lang
e23c480f22 Removed invalid association IssueCustomField#issue_custom_values (#32431).
Patch by Akira Matsuda.

git-svn-id: http://svn.redmine.org/redmine/trunk@19061 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-11-10 07:54:24 +00:00
Go MAEDA
1c533c948b Adds "Target Version" column to the list of "Available columns" in "Spent time" tab (#30346).
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@19059 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-11-10 00:42:30 +00:00
Toshi MARUYAMA
2738389fbd cleanup: rubocop: fix Layout/MultilineArrayBraceLayout in app/helpers/projects_helper.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@19050 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-11-09 17:57:35 +00:00
Toshi MARUYAMA
82c0eaadc3 cleanup: rubocop: fix Layout/IndentFirstArrayElement in app/models/project.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@19049 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-11-09 17:57:24 +00:00
Toshi MARUYAMA
02876fb1bf cleanup: rubocop: fix Layout/BlockEndNewline in app/models/message.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@19047 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-11-09 17:57:00 +00:00
Toshi MARUYAMA
05d9791e69 cleanup: rubocop: fix Layout/MultilineBlockLayout in app/controllers/auto_completes_controller.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@19045 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-11-09 17:11:06 +00:00
Toshi MARUYAMA
520fd7dd00 cleanup: rubocop: fix Layout/EmptyLinesAroundAccessModifier in app/controllers/previews_controller.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@19044 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-11-09 17:10:54 +00:00
Toshi MARUYAMA
4c8b2ea40b cleanup: rubocop: fix Layout/AlignArguments in app/helpers/email_addresses_helper.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@19034 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-11-09 16:33:33 +00:00