summaryrefslogtreecommitdiffstats
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Merged r15848 (#23764).Jean-Philippe Lang2016-10-021-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15872 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15852 and r15863 (#23839).Jean-Philippe Lang2016-10-021-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15866 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15820 (#23758).Jean-Philippe Lang2016-09-051-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15823 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15816 (#23758).Jean-Philippe Lang2016-09-041-4/+8
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15819 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15750 (#23655).Jean-Philippe Lang2016-08-311-1/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15767 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15416 (#22808).Jean-Philippe Lang2016-05-211-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15420 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Updates copyright for 2016.Jean-Philippe Lang2016-03-1372-72/+72
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15240 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15223 and r15225 (#22127).Jean-Philippe Lang2016-03-131-0/+11
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15231 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15196 (#22072).Jean-Philippe Lang2016-03-121-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15208 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15130 (#21900).Jean-Philippe Lang2016-03-121-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15198 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14988 and r14988 (#21504).Jean-Philippe Lang2016-01-091-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15015 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14970 to r14972 (#21477).Jean-Philippe Lang2015-12-191-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14981 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14795 and r14796 (#21150).Jean-Philippe Lang2015-11-081-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14837 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14758 (#21071).Jean-Philippe Lang2015-11-071-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14802 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14670 (#20677).Jean-Philippe Lang2015-11-071-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14799 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14618 (#20360).Jean-Philippe Lang2015-10-091-5/+11
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14651 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14619 (#20282).Jean-Philippe Lang2015-10-091-6/+8
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14649 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14602 (#20733).Jean-Philippe Lang2015-09-191-3/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14603 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14554 (#20688).Jean-Philippe Lang2015-09-121-0/+4
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14558 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14508 (#20512).Jean-Philippe Lang2015-09-121-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14556 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14550 (#20490).Jean-Philippe Lang2015-09-121-2/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14551 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14499 (#20454).Jean-Philippe Lang2015-09-121-0/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14548 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14473 (#20278).Jean-Philippe Lang2015-09-121-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14543 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14409 from trunk to 3.1-stable (#11253, #20456)Toshi MARUYAMA2015-08-311-1/+2
| | | | | | Fixes methods comments. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14536 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14408 from trunk to 3.1-stable (#11253, #20456)Toshi MARUYAMA2015-08-311-3/+5
| | | | | | Limit queries to given issues only. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14535 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14407 from trunk to 3.1-stable (#11253, #20456)Toshi MARUYAMA2015-08-312-4/+16
| | | | | | 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
* Merged r14406 from trunk to 3.1-stable (#11253, #20456)Toshi MARUYAMA2015-08-311-0/+6
| | | | | | 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
* Merged r14450 (#20206).Jean-Philippe Lang2015-07-251-1/+5
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14453 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14388 (#19842).Jean-Philippe Lang2015-07-051-1/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14403 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed group sorted scope order (#20066).Jean-Philippe Lang2015-06-281-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14380 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Disallow users to delete a version referenced by a custom field (#20159).Jean-Philippe Lang2015-06-271-0/+9
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14376 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed test failure introduced by r14366.Jean-Philippe Lang2015-06-211-2/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14368 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Sort members on all their roles.Jean-Philippe Lang2015-06-211-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14366 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Replace tabs with spaces and remove trailing tabs in several files (#20140).Jean-Philippe Lang2015-06-211-1/+1
| | | | | | Patch by Mischa The Evil. git-svn-id: http://svn.redmine.org/redmine/trunk@14365 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Deprecates Project#member_principals.Jean-Philippe Lang2015-06-182-9/+13
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14332 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Prevent roles loading on each call to User#managed_roles for admins.Jean-Philippe Lang2015-06-171-1/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14328 e93f8b46-1217-0410-a6f0-8f06a7374b81
* remove trailing white spaces from app/models/principal.rbToshi MARUYAMA2015-06-171-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14322 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Strip leading spaces to prevent lines from being rendered as pre tags.Jean-Philippe Lang2015-06-161-1/+8
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14318 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Better handle html-only emails (#16962).Jean-Philippe Lang2015-06-151-7/+9
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14313 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds issue filters on parent/subtasks (#6118).Jean-Philippe Lang2015-06-132-1/+45
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14304 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Code formatting (#19982).Jean-Philippe Lang2015-06-061-9/+9
| | | | | | Patch by Mischa The Evil. git-svn-id: http://svn.redmine.org/redmine/trunk@14298 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Ability to limit member management to certain roles (#19707).Jean-Philippe Lang2015-05-314-11/+88
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14293 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed that project activity without parent hides system activities and ↵Jean-Philippe Lang2015-05-301-40/+10
| | | | | | removed duplicated code. git-svn-id: http://svn.redmine.org/redmine/trunk@14292 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Validates that activity belongs to project activities (#19656).Jean-Philippe Lang2015-05-301-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14288 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Column 'address' in where clause may be ambiguous (#19485).Jean-Philippe Lang2015-05-301-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14284 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds a role setting that viewing all or own time entries (#8929).Jean-Philippe Lang2015-05-303-2/+44
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14275 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Code cleanup.Jean-Philippe Lang2015-05-251-8/+7
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14274 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Don't store total estimated hours on parent issues (#16092).Jean-Philippe Lang2015-05-252-8/+10
| | | | | | 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
* Adds a setting to control done ratio on parent tasks (#5490).Jean-Philippe Lang2015-05-251-13/+22
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14270 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds settings to control start/due dates and priority on parent tasks (#5490).Jean-Philippe Lang2015-05-251-18/+39
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14269 e93f8b46-1217-0410-a6f0-8f06a7374b81