Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-11 07:46:02 +01:00
Code Issues Packages Projects Releases Activity
12,678 Commits 35 Branches 222 Tags
45a0daa16a140d2d41a114e2fc2270a6fa688c93
Commit Graph

59 Commits

Author SHA1 Message Date
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
Jean-Philippe Lang
945a091c94 Don't let users log time on issues they cannot see in their projects (#21150). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14796 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-04 18:40:15 +00:00
Jean-Philippe Lang
5882629e26 Raises time entries comments limit to 1024 (#19885). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14621 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-21 21:00:06 +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
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
3d1c40cd52 Fixed validation when logging time on issue (#19464). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14162 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-12 07:37:18 +00:00
Jean-Philippe Lang
4bbd3d81fd TimeEntry acts_as_activity_provider scope should joins(:project) (#18818). 
Patch by Ondřej Ezr.

git-svn-id: http://svn.redmine.org/redmine/trunk@13971 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-07 09:10:57 +00:00
Jean-Philippe Lang
000124f44f Copyright update. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13872 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-11 09:09:50 +00:00
Jean-Philippe Lang
8992dc9f93 Removed dead code, Rails4 handles that in its attribute writer. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13716 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-05 12:37:00 +00:00
Jean-Philippe Lang
2cd00fdc29 Removed unused scopes. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13715 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-05 12:34:59 +00:00
Toshi MARUYAMA
6f92548b38 remove unneeded "references" of joins 
"references" is needed for includes, but not needed for joins.

git-svn-id: http://svn.redmine.org/redmine/trunk@13501 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-24 02:18:45 +00:00
Jean-Philippe Lang
498a34403a Removed unneeded :foreign_key option on belongs_to associations. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13484 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 18:41:03 +00:00
Jean-Philippe Lang
2d1866d966 Merged rails-4.1 branch (#14534). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 17:37:16 +00:00
Jean-Philippe Lang
15d5c331eb Let the new time_entry form be submitted without project (#17954). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13422 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-04 07:23:14 +00:00
Jean-Philippe Lang
efc05bc73c Add time entries custom fields to the context menu for quick bulk edit (#17484). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13335 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-29 17:52:27 +00:00
Jean-Philippe Lang
dd70327ce4 Let user choose an issue of another project when updating a time entry (#16338). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12990 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-21 02:12:32 +00:00
Toshi MARUYAMA
35cc911192 update copyright year (#15977) 
Contributed by Daniel Felix.

git-svn-id: http://svn.redmine.org/redmine/trunk@12736 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-01-29 22:45:39 +00:00
Jean-Philippe Lang
458800c1d5 Time entry with 2 digits year should not validate (#3107). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11472 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-24 12:28:44 +00:00
Jean-Philippe Lang
e396a0eebe Copyright for 2013 (#12788). 
Patch by Daniel Felix.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11169 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-01-12 09:29:31 +00:00
Jean-Philippe Lang
0e30724d66 Group events in the activity view (#12542). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10951 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-12-08 08:24:01 +00:00
Jean-Philippe Lang
7222e4012d Rewrites named scopes with ARel queries. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10950 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-12-07 17:59:20 +00:00
Jean-Philippe Lang
9f788310b1 Fixed that custom_fields property is ignored for time entries in REST API (#11112). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9783 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-09 07:55:26 +00:00
Jean-Philippe Lang
ba5a052c8c Copyright update. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9636 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-05 12:56:53 +00:00
Toshi MARUYAMA
d0d01d4e70 model: replace Rails2 "named_scope" to Rails3 "scope" 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9537 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-26 23:51:10 +00:00
Jean-Philippe Lang
1ec2d98c14 Prevent mass-assignment when adding/updating a time entry (#10390). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9136 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-06 20:23:00 +00:00
Jean-Philippe Lang
430477d4d6 Round hours when reading TimeEntry attribute. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8980 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-24 18:40:22 +00:00
Jean-Philippe Lang
9e83ee2ddf Removed after_initialize methods. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8288 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-12-18 14:57:58 +00:00
Jean-Philippe Lang
1050993348 Removed unnecessary calculations in time entries index. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8085 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-12-04 23:01:42 +00:00
Jean-Philippe Lang
9e5ed4208b Adds named scopes for time entries index. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8084 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-12-04 22:49:46 +00:00
Jean-Philippe Lang
b8836d89b1 Removed deprecated methods. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7977 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-29 18:11:11 +00:00
Toshi MARUYAMA
4ffca69d84 Rails3: model: replace deprecated 'before_validation' method at TimeEntry model 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7453 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-09-22 13:39:06 +00:00
Toshi MARUYAMA
e683bd7582 Rails3: model: replace deprecated 'validate' method at TimeEntry model 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7448 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-09-22 12:06:33 +00:00
Toshi MARUYAMA
6f8e3c031f remove trailing white-spaces from time entry model source. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5820 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-05-17 03:58:41 +00:00
Jean-Philippe Lang
405fc07e90 Makes visible scopes accept projects option and deprecate Project.visible_by. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5324 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-05 12:50:19 +00:00
Jean-Philippe Lang
0786b9ef99 Replaces TimeEntry.visible_by with a visible scope. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5149 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-03-16 17:29:30 +00:00
Jean-Philippe Lang
88d847a1d5 Fixes TimeEntry#spent_on= so that datetimes don't get stored in SQLite3 (#7258). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4708 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-01-14 18:04:16 +00:00
Jean-Philippe Lang
d8ef4b6f4d Fixed: timelog link in the activity broken by recent refactoring (#6702). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4277 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-22 20:40:11 +00:00
Eric Davis
cdfc57d544 Change the TimelogController's to/from dates based on the project time entries 
Instead of looking for the earliest and latest time entry system wide for the
dates in the form, now TimelogController will only look at the time entries
for the current project (and parent/sub projects).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4087 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-14 19:02:25 +00:00
Eric Davis
8900797ada Refactor: move method to Model. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4086 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-14 19:02:20 +00:00
Jean-Philippe Lang
d63784569f Force TimeEntry#hours default to nil (#3075, #4449). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3232 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-12-23 20:05:46 +00:00
Jean-Philippe Lang
8faa66f68f Adds spent time to the activity view (#3809). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2877 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-09-12 10:37:49 +00:00
Eric Davis
62e58f26b0 Changed Enumerations to use a Single Table Inheritance 
* Added migrations to change Enumerations to an STI relationship
* Added TimeEntryActivity model (STI)
* Added DocumentCategory model (STI)
* Added IssuePriority model (STI)
* Added Enumeration#get_subclasses to get a list of the subclasses of Enumeration
* Changed Enumeration to use the STI type field instead of the opt field
* Changed Enumeration#opt to return the old opt values but with a deprecation warning.
* Removed Enumeration::OPTIONS
* Removed the dynamic named_scopes in favor of specific named_scopes.  Kept for
  compatibility reasons.
* Added Enumeration#default so each subclass can easily find it's default record.
* Fixed Enumeration#default to use the STI scoping with a fake default scope for finding Enumeration's default.
* Added a 'all' named scope for getting all records in order by position.
* Added Deprecation warnings to the old named_scopes in Enumerations.
* Moved various methods off of Enumeration and onto the concrete classes
* Changed the EnumerationsController to use types
* Updated the Enumeration list template
* Added has_many relationships to the Enumeration STI classes.
* Fixes for tests.

  #3007

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2777 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-05-30 23:30:36 +00:00
Jean-Philippe Lang
fe28193e4e Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2493 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-02-21 11:04:50 +00:00
Jean-Philippe Lang
4601ed2f3a Replaces Enumeration.get_values and Enumeration.default with named scopes. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2472 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-02-15 13:33:09 +00:00
Jean-Philippe Lang
6768bec456 Fixed: no error is raised when entering invalid hours on the issue update form (#2465). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2251 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-01-09 17:32:46 +00:00
Jean-Philippe Lang
898fac293b Adds custom fields on time entries (#772). 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1689 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-07-22 18:52:00 +00:00
Jean-Philippe Lang
ee608f24f4 Fixed: Comment too long message when updating issue (#1550). 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1608 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-06-30 17:31:50 +00:00
Jean-Philippe Lang
062a2d6f5d Adds atom feed on time entries details (#1479). 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1560 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-06-17 20:01:15 +00:00
Jean-Philippe Lang
846045fd05 Fixed: time entries created with the default activity even if a different one is specified (#1302). 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1533 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-06-14 12:31:32 +00:00
Jean-Philippe Lang
d6daeca40a Fixed: IssueController#edit doesn't set default Activity as default (#1302). 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1461 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-05-26 17:12:11 +00:00