Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-25 22:00:43 +01:00
Code Issues Packages Projects Releases Activity
11,834 Commits 35 Branches 228 Tags
3.1.2
Commit Graph

2101 Commits

Author SHA1 Message Date
Jean-Philippe Lang
bff6ff9273 Merged r14795 and r14796 (#21150). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14837 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-08 08:54:15 +00:00
Jean-Philippe Lang
53a6e66da6 Merged r14758 (#21071). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14802 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-07 08:18:10 +00:00
Jean-Philippe Lang
d5dcab376e Merged r14670 (#20677). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14799 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-07 08:10:23 +00:00
Jean-Philippe Lang
6f885a5b04 Merged r14618 (#20360). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14651 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-10-09 06:41:39 +00:00
Jean-Philippe Lang
46b877296a Merged r14619 (#20282). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14649 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-10-09 06:36:58 +00:00
Jean-Philippe Lang
c6de5a58da Merged r14602 (#20733). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14603 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-19 07:31:55 +00:00
Jean-Philippe Lang
d5bb0e8593 Merged r14554 (#20688). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14558 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-12 14:53:28 +00:00
Jean-Philippe Lang
637ec7e883 Merged r14508 (#20512). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14556 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-12 12:48:51 +00:00
Jean-Philippe Lang
d3a2485467 Merged r14550 (#20490). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14551 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-12 11:12:18 +00:00
Jean-Philippe Lang
2103844571 Merged r14499 (#20454). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14548 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-12 10:58:28 +00:00
Jean-Philippe Lang
1dbb256293 Merged r14473 (#20278). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14543 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-12 10:51:25 +00:00
Toshi MARUYAMA
7cc8aa756d Merged r14409 from trunk to 3.1-stable (#11253, #20456) 
Fixes methods comments.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14536 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-31 03:38:44 +00:00
Toshi MARUYAMA
8e84df24ea Merged r14408 from trunk to 3.1-stable (#11253, #20456) 
Limit queries to given issues only.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14535 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-31 03:38:34 +00:00
Toshi MARUYAMA
925db0c28f Merged r14407 from trunk to 3.1-stable (#11253, #20456) 
Preload total spent time on the issue list with 1 query.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14534 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-31 03:38:23 +00:00
Toshi MARUYAMA
74be675c94 Merged r14406 from trunk to 3.1-stable (#11253, #20456) 
Adds "Total spent hours" column available on the issue list.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14533 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-31 03:38:12 +00:00
Jean-Philippe Lang
bffee57744 Merged r14450 (#20206). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14453 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-25 08:54:25 +00:00
Jean-Philippe Lang
b54924d48b Merged r14388 (#19842). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14403 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-05 10:34:02 +00:00
Jean-Philippe Lang
818e3fe01d Fixed group sorted scope order (#20066). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14380 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-28 08:39:31 +00:00
Jean-Philippe Lang
bc9ca5fcfd Disallow users to delete a version referenced by a custom field (#20159). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14376 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-27 09:02:24 +00:00
Jean-Philippe Lang
0dd95cdbc5 Fixed test failure introduced by r14366. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14368 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-21 19:28:38 +00:00
Jean-Philippe Lang
89edc4dd39 Sort members on all their roles. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14366 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-21 18:43:12 +00:00
Jean-Philippe Lang
3036eaba52 Replace tabs with spaces and remove trailing tabs in several files (#20140). 
Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@14365 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-21 16:38:29 +00:00
Jean-Philippe Lang
3811ff5d95 Deprecates Project#member_principals. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14332 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-18 19:12:17 +00:00
Jean-Philippe Lang
ba61b13008 Prevent roles loading on each call to User#managed_roles for admins. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14328 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-17 18:36:38 +00:00
Toshi MARUYAMA
f8971eb567 remove trailing white spaces from app/models/principal.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@14322 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-17 11:38:48 +00:00
Jean-Philippe Lang
76536474b0 Strip leading spaces to prevent lines from being rendered as pre tags. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14318 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-16 18:42:52 +00:00
Jean-Philippe Lang
3ae42cb326 Better handle html-only emails (#16962). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14313 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-15 21:16:42 +00:00
Jean-Philippe Lang
98f2b30ac5 Adds issue filters on parent/subtasks (#6118). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14304 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-13 10:56:44 +00:00
Jean-Philippe Lang
836ac7f537 Code formatting (#19982). 
Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@14298 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-06 07:22:05 +00:00
Jean-Philippe Lang
ed9f00178c Ability to limit member management to certain roles (#19707). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14293 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-31 07:16:23 +00:00
Jean-Philippe Lang
48d40a8c88 Fixed that project activity without parent hides system activities and removed duplicated code. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14292 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-30 10:05:43 +00:00
Jean-Philippe Lang
62bed8b93f Validates that activity belongs to project activities (#19656). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14288 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-30 08:46:41 +00:00
Jean-Philippe Lang
b688214ce0 Column 'address' in where clause may be ambiguous (#19485). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14284 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-30 08:23:03 +00:00
Jean-Philippe Lang
6659aad3ef Adds a role setting that viewing all or own time entries (#8929). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14275 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-30 07:40:57 +00:00
Jean-Philippe Lang
5e28f0b1b6 Code cleanup. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14274 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-25 12:09:01 +00:00
Jean-Philippe Lang
481f70d125 Don't store total estimated hours on parent issues (#16092). 
Parent can now have its own estimate that is summed up with children estimates.

git-svn-id: http://svn.redmine.org/redmine/trunk@14272 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-25 11:37:12 +00:00
Jean-Philippe Lang
b22105f34a Adds a setting to control done ratio on parent tasks (#5490). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14270 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-25 10:03:42 +00:00
Jean-Philippe Lang
0ad09e3aef Adds settings to control start/due dates and priority on parent tasks (#5490). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14269 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-25 09:53:05 +00:00
Jean-Philippe Lang
24d6211f4e Missing validation for description size of versions (#19840). 
Patch by Bruno Orcha García.

git-svn-id: http://svn.redmine.org/redmine/trunk@14267 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-23 06:52:31 +00:00
Jean-Philippe Lang
738ecf1365 Test broken by r14265 (#19458). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14266 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-10 12:57:16 +00:00
Jean-Philippe Lang
c8fb0956d1 Code cleanup (#19458). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14265 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-10 10:30:10 +00:00
Jean-Philippe Lang
51f7060aa8 Add the ability to expire passwords after a configurable number of days (#19458). 
Patch by Holger Just and Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@14264 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-10 10:26:55 +00:00
Jean-Philippe Lang
d640f7b249 Adds private issue option to receiving emails (#8424). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14262 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-10 09:07:36 +00:00
Jean-Philippe Lang
f8a9a78ecf Raises 60-character limit for document titles to 255 (#12312). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14261 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-10 08:45:56 +00:00
Jean-Philippe Lang
6b11840b42 Fixed that issue validation fails if % done field is deactivated (#19731). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14241 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-09 09:48:11 +00:00
Jean-Philippe Lang
cf7704f314 Use accessor method. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14229 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-26 14:55:59 +00:00
Jean-Philippe Lang
efe67602c6 Don't use a class variable for mail handler options. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14228 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-26 14:55:18 +00:00
Jean-Philippe Lang
0397dcf7fb Removed invalid sanitizer in MailHandler (#19537). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14219 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 08:26:27 +00:00
Jean-Philippe Lang
9415eff064 When changing tracker, clear the attributes that are disabled for the new tracker (#17527). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14180 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-14 17:16:52 +00:00
Jean-Philippe Lang
a9f052532e Fixed workflow rules when user has duplicated role by inheritance (#19569). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14179 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-14 17:01:23 +00:00