Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-02-23 15:11:21 +01:00
Code Issues Packages Projects Releases Activity
13,574 Commits 35 Branches 225 Tags
bc4cc0a14a21ee05ab38e240559f1601dba90381
Commit Graph

546 Commits

Author SHA1 Message Date
Go MAEDA
bc4cc0a14a Merged r17761 from trunk to 3.4-stable (#32022). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18433 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-09-05 07:00:36 +00:00
Go MAEDA
0dd2493e79 Merged r17889 from trunk to 3.4-stable (#30811). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18130 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-05-05 02:03:34 +00:00
Go MAEDA
55ef1f4585 Merged r17764 from trunk to 3.4-stable (#30171). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17768 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-12-17 23:48:58 +00:00
Jean-Philippe Lang
8be3e7878d Merged r17645 to 3.4-stable (#29674). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17654 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-29 15:44:21 +00:00
Jean-Philippe Lang
3644d67fb8 Merged r17643 to 3.4-stable (#20788). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17650 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-29 15:40:53 +00:00
Go MAEDA
a7f6830a8e Merged r17636 from trunk to 3.4-stable (#8395). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17637 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-26 04:56:19 +00:00
Go MAEDA
042dd66527 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
 2018-10-28 11:04:15 +00:00
Go MAEDA
375c7adfe4 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
 2018-07-21 00:17:51 +00:00
Go MAEDA
941eb22e99 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
 2018-05-02 02:29:40 +00:00
Jean-Philippe Lang
7d0cbd0d9b 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
 2018-04-07 07:43:22 +00:00
Go MAEDA
12a420b8c9 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
 2018-03-31 05:31:27 +00:00
Jean-Philippe Lang
cffc5d7026 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
 2018-01-08 17:52:19 +00:00
Toshi MARUYAMA
f093d591f1 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
 2017-12-07 12:16:07 +00:00
Toshi MARUYAMA
76dd10bd78 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
 2017-12-07 12:15:45 +00:00
Jean-Philippe Lang
7fd04e1f8d Update copyright. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16685 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-25 08:40:31 +00:00
Jean-Philippe Lang
24c2416ffe Tests for Redmine::SyntaxHighlighting::CodeRay.retrieve_supported_languages (#26055). 
Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@16625 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-06 21:56:56 +00:00
Jean-Philippe Lang
4f2c5a9945 Filter arbitrary class names and ids in rendered HTML output (#25503). 
* Disallow setting arbitrary classes and ids via Textile syntax
* Only allow valid/supported languages for syntax highlighted code blocks

Patch by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/trunk@16502 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-06 16:41:52 +00:00
Jean-Philippe Lang
99fa41011f Add kbd to ALLOWED_TAGS (#25503). 
Patch by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/trunk@16500 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-06 16:34:52 +00:00
Toshi MARUYAMA
6139e0033a spelling fixes (#25495) 
git-svn-id: http://svn.redmine.org/redmine/trunk@16445 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-02 03:34:44 +00:00
Jean-Philippe Lang
f338fe9075 Allow to set multiple values in emails for list custom fields (#16549). 
git-svn-id: http://svn.redmine.org/redmine/trunk@16380 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-08 19:55:56 +00:00
Jean-Philippe Lang
3faa3693d1 Test failures. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16359 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-03 17:17:50 +00:00
Toshi MARUYAMA
b2c0ea2c3e do not replace all invalid utf8 (#24616) 
git-svn-id: http://svn.redmine.org/redmine/trunk@16273 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-28 06:24:51 +00:00
Toshi MARUYAMA
3e2d20ad91 add more tests (#24616) 
git-svn-id: http://svn.redmine.org/redmine/trunk@16271 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-28 05:43:22 +00:00
Jean-Philippe Lang
9206d077d4 Group versions by status in version custom field filter (#23265). 
git-svn-id: http://svn.redmine.org/redmine/trunk@16194 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-14 11:30:00 +00:00
Jean-Philippe Lang
309c6cec86 Don't preload custom field filter values (#24787). 
git-svn-id: http://svn.redmine.org/redmine/trunk@16173 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-12 20:19:45 +00:00
Jean-Philippe Lang
5a77904a91 Don't use assert_equal nil. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16072 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-13 20:12:34 +00:00
Jean-Philippe Lang
3186130966 Don't use assert_equal nil. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16064 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-12 21:36:14 +00:00
Jean-Philippe Lang
bf5dade8df Use assert_nil instead of assert_equal. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16060 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-11 15:26:41 +00:00
Jean-Philippe Lang
af29408e83 Add "Table of contents" heading to toc macro (#23179). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15992 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-11-19 13:50:30 +00:00
Jean-Philippe Lang
cbe5e02203 Adds tests for #hours_field (#23996). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15974 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-11-18 16:00:27 +00:00
Jean-Philippe Lang
ef45304817 Adds file custom field format (#6719). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15917 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-23 09:16:14 +00:00
Jean-Philippe Lang
7abb92d813 Encode values, not full URL (#23841). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15846 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-01 07:39:53 +00:00
Jean-Philippe Lang
ff50094d3e Include url helpers in helper tests. 
git-svn-id: http://svn.redmine.org/redmine/trunk@15686 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-16 16:17:14 +00:00
Jean-Philippe Lang
91517ec67c Passing arguments to assert_nothing_raised is deprecated in Rails 5. 
git-svn-id: http://svn.redmine.org/redmine/trunk@15680 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-16 11:05:34 +00:00
Jean-Philippe Lang
4c2fcb0865 Fixed that empty Markdown image tag raises en error (#23246). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15607 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-06 18:18:27 +00:00
Jean-Philippe Lang
bbd24fe350 Custom field List Link values to URL breaks on entries with spaces (#23067). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15539 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-18 06:17:34 +00:00
Jean-Philippe Lang
adb9980728 Allow global versions to be shown outside of a project for version custom fields (#23083). 
Patch by Holger Just.

git-svn-id: http://svn.redmine.org/redmine/trunk@15536 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-18 05:59:20 +00:00
Jean-Philippe Lang
53710d80fc Introduce virtual MenuNodes (#15880). 
They are characterized by having a blank url. they will only be rendered if the user is authorized to see at least one of its children. they render as links which do nothing when clicked.
 
Patch by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/trunk@15501 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-11 06:21:52 +00:00
Jean-Philippe Lang
91e991e951 Limits the schemes that custom field URL patterns can use (#22925). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15435 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-01 19:27:09 +00:00
Jean-Philippe Lang
fad71f8b4b NoMethodError: undefined method `id' error on EnumerationFormat#value_from_keyword (#22911). 
Patch by Haihan Ji.

git-svn-id: http://svn.redmine.org/redmine/trunk@15429 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-05-28 11:37:28 +00:00
Jean-Philippe Lang
8cbfeddeb0 Child nodes should only be rendered if the user is actually authorized to see them (#15880). 
Patch by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/trunk@15393 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-05-08 06:48:36 +00:00
Jean-Philippe Lang
dcc569fa34 Removed the "New issue" menu item (#6204). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15344 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-04-19 18:37:52 +00:00
Jean-Philippe Lang
64afa24a7f Replaces acts_as_list with an implementation that handles #position= (#12909). 
Objects are reordered using the regular attribute writer #position= and AR callbacks.

git-svn-id: http://svn.redmine.org/redmine/trunk@15335 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-04-17 06:57:20 +00:00
Jean-Philippe Lang
25eb92c0dc Text in the "removed" part of a diff is double-escaped (#22115). 
Patch by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@15287 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-03-26 10:20:10 +00:00
Jean-Philippe Lang
cda9c63d9c Updates copyright for 2016. 
git-svn-id: http://svn.redmine.org/redmine/trunk@15238 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-03-13 10:30:10 +00:00
Toshi MARUYAMA
c9730d077b output what language fails at test_number_to_human_size_for_each_language 
git-svn-id: http://svn.redmine.org/redmine/trunk@15187 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-03-04 15:32:21 +00:00
Jean-Philippe Lang
cb38ee0e35 Adds a test for #21202 (#6969). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14867 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-11 07:39:09 +00:00
Jean-Philippe Lang
868d949f47 Reverts r14812 (#6969). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14863 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-11 07:34:15 +00:00
Jean-Philippe Lang
c6283d7ce5 Fixed that less-than sign is not escaped by textile formatter (#6969). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14812 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-07 10:20:57 +00:00
Jean-Philippe Lang
f29aa17f1b Fixed that #l_hours_short shows 2 h (#21069). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14766 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-10-30 08:56:19 +00:00