Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-29 16:50:54 +02:00
Code Issues Packages Projects Releases Activity
15,268 Commits 35 Branches 228 Tags
e7e100c52f4dced9748e511641d8ab44c9e2762b
Commit Graph

15268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Go MAEDA
e7e100c52f Merged r19375 from trunk to 4.1-stable (#32652). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19376 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-12-18 07:39:50 +00:00
Go MAEDA
555796fa47 Merged r19355 from trunk to 4.1-stable (#32599). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19374 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-12-17 07:35:01 +00:00
Go MAEDA
c7fea8d816 Merged r19371 from trunk to 4.1-stable (#32469, #3816). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19372 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-12-13 09:06:55 +00:00
Go MAEDA
30fc2db8cb Merged r19364 from trunk to 4.1-stable (#32546). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19370 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-12-13 00:36:35 +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
a5e6be4d70 Merged r19358 from trunk to 4.1-stable (#32592). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19359 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-12-11 14:01:43 +00:00
Go MAEDA
50b1809d8c Merged r19356 from trunk to 4.1-stable (#3816, #32552, #32596). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19357 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-12-11 09:19:59 +00:00
Go MAEDA
501654bc6d Merged r19345 from trunk to 4.1-stable (#32526). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19352 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-12-10 04:03:07 +00:00
Go MAEDA
5835778a58 Merged r19344 from trunk to 4.1-stable (#32526, #32525). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19351 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-12-10 04:00:27 +00:00
Go MAEDA
e30cbbba3c Merged r19346 from trunk to 4.1-stable (#32422). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19349 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-12-10 01:34:56 +00:00
Jean-Philippe Lang
083f716184 Merged r19347 to 4.1-stable (#32529). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19348 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-12-09 12:39:33 +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
c039dc4596 Merged r19339 from trunk to 4.1-stable (#31169, #32552). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19340 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-12-05 23:36:32 +00:00
Toshi MARUYAMA
4a6804087e Merged r19333 from trunk to 4.1-stable (#25742) 
Filter all possibly class values on code tags in Textile.

Contributed by Holger Just from Planio.

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19334 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-12-05 12:03:28 +00:00
Go MAEDA
433154d357 Merged r19221 from trunk to 4.1-stable (#32450, #31989). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19331 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-12-03 09:15:29 +00:00
Go MAEDA
97779eb0b2 Merged r19088 from trunk to 4.1-stable (#32478, #30346). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19330 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-12-03 06:14:27 +00:00
Go MAEDA
ac254c89f2 Merged r19071 from trunk to 4.1-stable (#32444, #29489). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19329 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-12-03 06:11:30 +00:00
Go MAEDA
cb0f95c338 Merged r19327 from trunk to 4.1-stable ( #32540, #31954, #23997). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19328 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-12-03 06:08:16 +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
Toshi MARUYAMA
9bf69021e2 Merged r19154 from trunk to 4.1-stable 
add missing fixture to test/system/issues_test.rb

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19155 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-22 11:23:32 +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
Go MAEDA
e88dfda424 Merged r19089 from trunk to 4.1-stable (#32469, #3816). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19090 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-19 02:36:08 +00:00
Toshi MARUYAMA
a59f8813ab Merged r19083 from trunk to 4.1-stable (#32470) 
regenerate .rubocop_todo.yml.

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19084 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-16 12:49:24 +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
Go MAEDA
6cea1fa267 Merged r19068 from trunk to 4.1-stable (#16904). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19070 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-13 13:25:22 +00:00
Go MAEDA
804b0416ac Merged r19067 from trunk to 4.1-stable (#16904). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19069 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-13 13:24:28 +00:00
Go MAEDA
b5ce1b9cff Fix a Rubocop offense caused by r19065 (#16904). 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@19068 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-13 13:22:05 +00:00
Go MAEDA
30fd23b917 Fix that QueriesControllerTest fails due to r19065 (#16904). 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@19067 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-13 09:49:52 +00:00
Jean-Philippe Lang
98ab77e84b Merged r19065 to 4.1-stable (#16904). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19066 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-10 07:59:35 +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
2ec3da2f25 Merged r19063 to 4.1-stable (#32436). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19064 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-10 07:57:41 +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
09b7186b91 Merged r19061 to 4.1-stable (#32431). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19062 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-10 07:55:29 +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
Jean-Philippe Lang
5df4855046 Added 4.1-stable branch. 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19060 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-10 07:45:35 +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
e7121752c2 rubocop: enable Layout/AlignArguments 
git-svn-id: http://svn.redmine.org/redmine/trunk@19058 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-09 18:17:25 +00:00
Toshi MARUYAMA
eb18ef819f cleanup: rubocop: fix Layout/AlignArguments in ApplicationHelperTest#test_principals_options_for_select_with_users_and_groups 
git-svn-id: http://svn.redmine.org/redmine/trunk@19057 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-09 18:17:12 +00:00
Toshi MARUYAMA
6ea5d0c3c6 cleanup: rubocop: fix Layout/AlignArguments in ApplicationHelperTest#test_principals_options_for_select_with_selected 
git-svn-id: http://svn.redmine.org/redmine/trunk@19056 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-09 18:17:01 +00:00
Toshi MARUYAMA
0d6015be56 cleanup: rubocop: fix Layout/AlignArguments in ApplicationHelperTest#test_principals_options_for_select_with_users 
git-svn-id: http://svn.redmine.org/redmine/trunk@19055 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-09 18:16:50 +00:00
Toshi MARUYAMA
28ae34b68f cleanup: rubocop: fix Layout/AlignArguments in ApplicationHelperTest#test_thumbnail_tag 
git-svn-id: http://svn.redmine.org/redmine/trunk@19054 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-09 18:16:38 +00:00
Toshi MARUYAMA
22bce3517b cleanup: rubocop: fix Layout/AlignArguments in ApplicationHelperTest#test_link_to_attachment 
git-svn-id: http://svn.redmine.org/redmine/trunk@19053 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-09 18:16:27 +00:00
Toshi MARUYAMA
8e6014a9f8 cleanup: rubocop: fix Layout/AlignArguments in ApplicationHelperTest#test_section_edit_links 
git-svn-id: http://svn.redmine.org/redmine/trunk@19052 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-09 18:16:15 +00:00
Toshi MARUYAMA
a3246bf5fa cleanup: rubocop: fix Layout/AlignArguments in test/integration/attachments_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@19051 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-09 17:57:36 +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
3dff73502a cleanup: rubocop: fix Layout/EmptyLinesAroundAccessModifier in lib/redmine/syntax_highlighting.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@19048 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-09 17:57:11 +00:00