1
0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-24 09:21:12 +00:00

16991 Commits

Author SHA1 Message Date
Marius Balteanu
d92b75d49e Fixed Layout/HeredocIndentation: Use 2 spaces for indentation in a heredoc by using <<~ instead of <<- (#32424).
git-svn-id: http://svn.redmine.org/redmine/trunk@21163 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-11 21:50:52 +00:00
Marius Balteanu
5b0a10cc1a Replace deprecated Sanitize keywords (#32424).
Patch by Martin Cizek.

git-svn-id: http://svn.redmine.org/redmine/trunk@21162 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-11 21:50:16 +00:00
Marius Balteanu
e8c911577f Relax allowed protocols in links by denying specific protocols for CommonMark text formatting (#32424).
Patch by Martin Cizek.

git-svn-id: http://svn.redmine.org/redmine/trunk@21161 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-11 21:49:27 +00:00
Marius Balteanu
46ecdcec4d Mark CommonMark Markdown (GitHub Flavored) as experimental (#32424).
git-svn-id: http://svn.redmine.org/redmine/trunk@21160 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-11 21:48:18 +00:00
Marius Balteanu
18982a9de7 Pin sanitize to 5.2 (#32424).
git-svn-id: http://svn.redmine.org/redmine/trunk@21159 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-11 21:47:29 +00:00
Marius Balteanu
2b31672864 Pin html-pipeline to 2.13.2 (#32424).
git-svn-id: http://svn.redmine.org/redmine/trunk@21158 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-11 21:46:59 +00:00
Marius Balteanu
3417191bc7 Pin commonmarker to 0.22 if Ruby version is greater than 2.5 (#32424).
git-svn-id: http://svn.redmine.org/redmine/trunk@21157 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-11 21:45:07 +00:00
Marius Balteanu
9af2ba2c13 Adds CommonMark Markdown (GitHub Flavored) as third text formatting option (#32424).
Patch by Jens Krämer.

git-svn-id: http://svn.redmine.org/redmine/trunk@21156 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-11 21:40:56 +00:00
Marius Balteanu
fe4d0d93da Fixed "Layout/IndentationWidth: Use 2 (not 4) spaces for indentation." introduced by r21141 (#35634).
git-svn-id: http://svn.redmine.org/redmine/trunk@21152 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-10 20:26:23 +00:00
Marius Balteanu
420781e931 Remove wrapper2 and wrapper3 wrapping containers (#30448).
git-svn-id: http://svn.redmine.org/redmine/trunk@21151 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-10 19:59:00 +00:00
Marius Balteanu
3bae6bfac3 Fixed create duplicate follow relation fails with 500 internal error (#35655).
git-svn-id: http://svn.redmine.org/redmine/trunk@21150 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-10 19:35:53 +00:00
Go MAEDA
68eede7e75 Add missing fixtures to Redmine::ProjectJumpBoxTest (#35727).
Patch by Yuichi HARADA.


git-svn-id: http://svn.redmine.org/redmine/trunk@21147 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-10 12:30:14 +00:00
Marius Balteanu
f31a1e2bbb Fixed attachments deletable by user without edit issue permission on tracker (#35634).
git-svn-id: http://svn.redmine.org/redmine/trunk@21142 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-05 23:50:11 +00:00
Marius Balteanu
1146831b3d Adds tests for issue attachment edit by user without edit issue permission on tracker (#35634).
git-svn-id: http://svn.redmine.org/redmine/trunk@21141 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-05 23:48:47 +00:00
Marius Balteanu
16b8d3c0be Fix typo (#33521).
git-svn-id: http://svn.redmine.org/redmine/trunk@21140 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-05 23:46:17 +00:00
Marius Balteanu
7e2f3352db Fix that updating an issue from context menu to a none value do not set the field to blank (#33521).
Patch by Mizuki ISHIKAWA.

git-svn-id: http://svn.redmine.org/redmine/trunk@21139 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-05 23:41:01 +00:00
Go MAEDA
764228370c Update Nokogiri to 1.12 (#35691).
git-svn-id: http://svn.redmine.org/redmine/trunk@21138 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-05 23:26:04 +00:00
Go MAEDA
2c644004c0 Long text custom field values are not aligned with their labels (#35642).
Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@21137 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-05 21:51:15 +00:00
Go MAEDA
14b06abd69 Mongolian translation update for "Notes", "Totals", and "% Done" (#35662).
Patch by Munkh B.


git-svn-id: http://svn.redmine.org/redmine/trunk@21135 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-04 13:38:31 +00:00
Go MAEDA
75aaedfff3 Avoid executing the same SQL statement multiple times to get the default custom query (#7360).
git-svn-id: http://svn.redmine.org/redmine/trunk@21134 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-04 12:48:54 +00:00
Marius Balteanu
633a6fae2a Update custom field path on the context menu (#33521).
Patch by Mizuki ISHIKAWA.

git-svn-id: http://svn.redmine.org/redmine/trunk@21133 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-03 20:25:20 +00:00
Marius Balteanu
63e4dcf60a Fix update status path on the context menu (#33521).
Patch by Mizuki ISHIKAWA.

git-svn-id: http://svn.redmine.org/redmine/trunk@21132 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-03 20:21:41 +00:00
Marius Balteanu
8ade9596a9 Remove 'setting_bcc_recipients' from locales (##30820).
git-svn-id: http://svn.redmine.org/redmine/trunk@21131 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-01 17:38:53 +00:00
Marius Balteanu
805b36cbfb Remove unused setting 'Blind carbon copy recipients (bcc)' (#30820).
git-svn-id: http://svn.redmine.org/redmine/trunk@21130 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-01 17:25:13 +00:00
Marius Balteanu
c6933b6203 Updates for 4.2.2 release.
git-svn-id: http://svn.redmine.org/redmine/trunk@21125 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-01 07:07:48 +00:00
Go MAEDA
f5a3a0cfee Japanese translation update (#35646).
Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@21122 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-31 07:06:48 +00:00
Go MAEDA
1e74c41aa3 Lithuanian translation update for 4.2-stable (jstoolbar-lt.js) (#35110).
Patch by Mindaugas Muckus.


git-svn-id: http://svn.redmine.org/redmine/trunk@21119 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-31 06:53:40 +00:00
Go MAEDA
10d3b28e31 Lithuanian translation update for 4.2-stable (#35110).
Patch by Mindaugas Muckus.


git-svn-id: http://svn.redmine.org/redmine/trunk@21118 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-31 06:50:24 +00:00
Go MAEDA
0c8fcd1a51 Progress bar for a shared version on gantt disappears when the tree is collapsed and then expanded (#34694).
Patch by Yuichi HARADA.


git-svn-id: http://svn.redmine.org/redmine/trunk@21115 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-31 06:21:35 +00:00
Go MAEDA
cb467fee8e Link to the profile page from users on the group page (#12795).
git-svn-id: http://svn.redmine.org/redmine/trunk@21114 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-31 05:33:33 +00:00
Go MAEDA
f479070c39 GroupsController#show should only display visible users (#12795).
git-svn-id: http://svn.redmine.org/redmine/trunk@21113 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-31 00:53:08 +00:00
Go MAEDA
bef39fdbb4 Traditional Chinese translation update (#35643).
Patch by ChunChang Lo.


git-svn-id: http://svn.redmine.org/redmine/trunk@21112 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-30 09:26:38 +00:00
Go MAEDA
fd9cca76c1 Update locales (#35562).
git-svn-id: http://svn.redmine.org/redmine/trunk@21111 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-30 03:52:48 +00:00
Go MAEDA
a6a8ef728c Show warning in admin/info when there are pending migrations (#35562).
Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@21110 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-30 03:51:19 +00:00
Go MAEDA
5bec58c1f6 Bulgarian translation update (#35628).
Patch by Ivan Cenov.


git-svn-id: http://svn.redmine.org/redmine/trunk@21109 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-29 01:29:48 +00:00
Marius Balteanu
2be231b982 Removes unused column trackers.is_in_chlog (#31132).
git-svn-id: http://svn.redmine.org/redmine/trunk@21106 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-28 16:26:22 +00:00
Marius Balteanu
5c600cd492 Removes unused wikis/edit.js.erb view (#35610).
git-svn-id: http://svn.redmine.org/redmine/trunk@21105 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-28 16:12:46 +00:00
Marius Balteanu
14e7b1a8e6 Adds test for #35417.
git-svn-id: http://svn.redmine.org/redmine/trunk@21104 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-28 15:59:03 +00:00
Go MAEDA
f5ac84a516 Inline image in Textile is not displayed if the image URL contains ampersands (#35441).
Contributed by Yuichi HARADA.


git-svn-id: http://svn.redmine.org/redmine/trunk@21101 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-28 08:25:15 +00:00
Go MAEDA
e32b37c7fb Remove unnecessary comments (#35606).
git-svn-id: http://svn.redmine.org/redmine/trunk@21099 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-28 05:40:46 +00:00
Go MAEDA
0916de721c Bundler fails to install globalid when using Ruby < 2.6.0 (#35621).
git-svn-id: http://svn.redmine.org/redmine/trunk@21096 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-28 03:21:47 +00:00
Go MAEDA
da4303a961 Locked users should not be displayed in the members box of the project overview page (#35606).
Patch by Mizuki ISHIKAWA.


git-svn-id: http://svn.redmine.org/redmine/trunk@21090 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-27 04:55:08 +00:00
Marius Balteanu
7534775306 Use issue path instead of bulk update issues path when only one issue is selected in the context menu (#33521).
git-svn-id: http://svn.redmine.org/redmine/trunk@21089 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-26 21:46:43 +00:00
Marius Balteanu
05452a7b9a Set :wiki menu_item for WikisController#destroy (#35610).
This action is executed inside the project wiki scope after r16916,
thus we can better set the menu_item accordingly.

Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@21088 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-26 21:28:36 +00:00
Marius Balteanu
ad9526ed27 Redirect_to project_path after WikisController#destroy (#35610).
* Project settings 'wiki' tab is removed by r16917 & r17017.
* This action is executed outside the project settings scope after r16916,
  thus we can better redirect to project_path.

Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@21087 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-26 21:27:23 +00:00
Marius Balteanu
f1dc9d9b4d Remove 'edit' action from :manage_wiki permission definition in Redmine::AccessControl. Wikis#edit is removed by r17018. (#35610).
Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@21086 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-26 21:26:01 +00:00
Marius Balteanu
0765042d64 Total spent time from issue page should link to global time entries if the issue has subtasks and the subtasks can be on projects that are not descendants of the current project (#35134).
git-svn-id: http://svn.redmine.org/redmine/trunk@21085 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-26 20:55:09 +00:00
Marius Balteanu
2045128a6f Revert r21082 (#35134).
git-svn-id: http://svn.redmine.org/redmine/trunk@21084 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-26 20:51:36 +00:00
Marius Balteanu
08108b8ebe Revert r21082 (#35134).
git-svn-id: http://svn.redmine.org/redmine/trunk@21083 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-26 20:49:01 +00:00
Marius Balteanu
158d21b75c Link total spent time to global time entries page when cross_project_issue_relations are allowed in order to include time entries from other projects (#35134).
git-svn-id: http://svn.redmine.org/redmine/trunk@21082 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-07-26 20:28:21 +00:00