1
0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-11 11:43:08 +00:00

2458 Commits

Author SHA1 Message Date
Go MAEDA
6a47de207f Merged r17933 from trunk to 4.0-stable (#30367).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17941 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-13 15:25:14 +00:00
Go MAEDA
1f0a1f65ca Merged r17786 and r17787 from trunk to 3.4-stable (#30412).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17789 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-01-12 01:34:18 +00:00
Jean-Philippe Lang
1b8d448b82 Merged r17658 and r17659 to 3.4-stable (#30001).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17664 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-11-29 19:12:53 +00:00
Go MAEDA
fad54d02b8 Merged r17630 from trunk to 3.4-stable (#28576).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17631 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-11-24 11:20:00 +00:00
Go MAEDA
53f6578b5a 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
2018-07-08 07:26:11 +00:00
Go MAEDA
c999dacf0c 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
2018-07-06 01:38:33 +00:00
Go MAEDA
a3570ff62b 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
2018-07-02 03:03:12 +00:00
Go MAEDA
f2843a26d0 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
2018-06-17 01:07:38 +00:00
Jean-Philippe Lang
92bc4919eb 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
2018-06-10 06:00:18 +00:00
Go MAEDA
c103a59465 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
2018-06-07 00:37:12 +00:00
Go MAEDA
929d8b27b2 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
2018-05-19 01:31:35 +00:00
Go MAEDA
20d16fdba0 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
2018-04-28 23:52:00 +00:00
Jean-Philippe Lang
578a9e67d3 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
2018-04-07 07:50:30 +00:00
Go MAEDA
220a961dd4 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
2018-04-07 00:31:57 +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
Jean-Philippe Lang
19fdcd7a1f 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
2018-01-07 21:47:48 +00:00
Jean-Philippe Lang
e8bc1dbaa8 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
2018-01-07 21:43:04 +00:00
Go MAEDA
d0ec0508ad 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
2017-12-13 14:07:15 +00:00
Go MAEDA
2e8d269c05 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
2017-12-06 13:23:52 +00:00
Jean-Philippe Lang
4254148986 Editing issues no longer sends notifications to previous assignee (#26627).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17002 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-10-15 16:43:19 +00:00
Jean-Philippe Lang
80cf4fd5db Merged r16999 and r17000 (#26667).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17001 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-10-15 11:56:05 +00:00
Jean-Philippe Lang
f793340077 Merged r16997 (#26667).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16998 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-10-15 11:42:32 +00:00
Jean-Philippe Lang
32714d5305 Merged r16990 (#26780).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16991 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-10-15 11:24:34 +00:00
Jean-Philippe Lang
9e16fcf3f3 Merged r16924 and r16925 (#26520).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16989 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-10-15 11:17:33 +00:00
Jean-Philippe Lang
e8237a8bc7 Merged r16839 (#26471).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16845 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-22 07:11:26 +00:00
Jean-Philippe Lang
e57b5ddbcc Merged r16808 (#26387).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16818 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-16 11:48:44 +00:00
Jean-Philippe Lang
66f6bf0e8d Merged r16766 to r16768 (#26376).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16771 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-08 12:56:27 +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
261292445f Set inverse_of on project boards association.
git-svn-id: http://svn.redmine.org/redmine/trunk@16659 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-10 23:47:15 +00:00
Jean-Philippe Lang
8a3c24762d Preview files by default instead of downloading them (#25988).
Patch by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/trunk@16651 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-10 10:30:59 +00:00
Jean-Philippe Lang
b997f03211 Set default assignee before validation (#26072).
git-svn-id: http://svn.redmine.org/redmine/trunk@16619 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-06 21:11:37 +00:00
Jean-Philippe Lang
ee0e821cc4 Fixes typo in safe attributes declaration (#25724).
Patch by Jens Kraemer.

git-svn-id: http://svn.redmine.org/redmine/trunk@16615 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-06 20:48:30 +00:00
Toshi MARUYAMA
8c03f2a6db allow unicode whitespace after mail handler body delimiters (#17718)
Contributed by Holger Just and Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@16609 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-06 01:34:52 +00:00
Jean-Philippe Lang
5b61d56943 Using #joins is needed here with Rails 5.
git-svn-id: http://svn.redmine.org/redmine/trunk@16608 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-03 09:22:41 +00:00
Jean-Philippe Lang
6ca3e4f75f Use strong params for CustomFieldEnumeration.
git-svn-id: http://svn.redmine.org/redmine/trunk@16603 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-03 08:43:04 +00:00
Jean-Philippe Lang
99a714e39b Prevent clash with Rails 5.1 Mailer class.
git-svn-id: http://svn.redmine.org/redmine/trunk@16600 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-03 08:20:20 +00:00
Jean-Philippe Lang
1870a2e4fb Make sure that the journal is not created if issue is saved.
git-svn-id: http://svn.redmine.org/redmine/trunk@16599 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-03 08:10:20 +00:00
Jean-Philippe Lang
58dc4455cb AR uniq deprecated in Rails 5.
git-svn-id: http://svn.redmine.org/redmine/trunk@16598 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-03 08:07:47 +00:00
Jean-Philippe Lang
44c748f968 Use regular instance methods instead of association extensions.
Rails 5.1 seems to mess things up in this particular case (role.workflow_rules.copy calls the extension declare in Tracker model).

git-svn-id: http://svn.redmine.org/redmine/trunk@16597 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-03 08:04:13 +00:00
Jean-Philippe Lang
d9418864b6 Show the same trackers and statuses on time entry queries (#5385).
git-svn-id: http://svn.redmine.org/redmine/trunk@16577 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-05-27 09:19:14 +00:00
Jean-Philippe Lang
d6b0fca902 Statuses of subprojects should be showed too (#5385).
git-svn-id: http://svn.redmine.org/redmine/trunk@16576 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-05-27 09:13:35 +00:00
Jean-Philippe Lang
ba37a2c476 Show statuses of project trackers only (#5385).
Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@16575 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-05-27 09:12:42 +00:00
Jean-Philippe Lang
9439cae70f Send journal notification after commit (#25794).
git-svn-id: http://svn.redmine.org/redmine/trunk@16573 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-05-27 08:44:24 +00:00
Jean-Philippe Lang
86fa4e66c9 Check tracker permissions when copying an issue (#25791).
git-svn-id: http://svn.redmine.org/redmine/trunk@16569 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-05-27 08:34:41 +00:00
Jean-Philippe Lang
0f09f161f6 Send reminders about visible issues only (#25713).
Patch by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@16557 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-05-13 09:38:05 +00:00
Toshi MARUYAMA
f2b891d912 remove trailing white-space from app/models/time_entry_query.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@16545 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-04-25 17:44:08 +00:00
Toshi MARUYAMA
e45e29eb96 remove trailing white-space from app/models/user.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@16544 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-04-25 17:04:41 +00:00
Jean-Philippe Lang
4d5ddb0072 Prevent deadlocks by only locking the exact records we need to have locked (#25590).
Patch by Jens Kraemer.

git-svn-id: http://svn.redmine.org/redmine/trunk@16541 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-04-13 12:10:03 +00:00
Jean-Philippe Lang
2f77bfde91 Option to set a default assignee on each project (#482).
Patch by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@16525 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-04-08 08:02:06 +00:00
Jean-Philippe Lang
9506ff1f40 Fixed that watchers list is not updated when changing project on the new issue form (#17762).
git-svn-id: http://svn.redmine.org/redmine/trunk@16511 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-04-06 19:57:00 +00:00