Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-08 14:26:04 +01:00
Code Issues Packages Projects Releases Activity
12,660 Commits 35 Branches 222 Tags
b37e19e4158ead9990cb15d26ffb38984bd4a2ce
Commit Graph

112 Commits

Author SHA1 Message Date
Jean-Philippe Lang
ac456fafc8 Merged r16056 (#14817). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16097 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-20 09:02:07 +00:00
Jean-Philippe Lang
bde77eebe3 Merged r15952 and r15953 (#23922). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16043 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-03 08:38:40 +00:00
Jean-Philippe Lang
6ebb700db2 Merged r15955 and r15956 (#24297). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15999 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-11-26 08:58:41 +00:00
Jean-Philippe Lang
89cfe130fc Merged r15532 to r15534 (#23054). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15537 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-18 06:01:43 +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
Jean-Philippe Lang
27bcd879f3 Can't bulk edit own time entries with "Edit own time entries" (#18580). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14242 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-09 10:10:28 +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
15bb695bbb Use logger.info? (#18605). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13766 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-14 21:53:38 +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
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
Toshi MARUYAMA
b02429e864 Rails4: replace deprecated find_all_by_* at TimelogController#find_time_entries 
git-svn-id: http://svn.redmine.org/redmine/trunk@12603 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-01-10 10:40:46 +00:00
Jean-Philippe Lang
c6fc1a8047 Fixed that filtering time entries on activity does not take care of activity overrides (#15623). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12414 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-15 09:49:12 +00:00
Jean-Philippe Lang
76e48c3914 Spent time details and report should ignore 'Setting.display_subprojects_issues?' (#14415). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12057 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-07-28 15:16:14 +00:00
Jean-Philippe Lang
0ac3afebc6 Don't use finder options. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12045 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-07-28 10:15:53 +00:00
Jean-Philippe Lang
ef8dd0f64b Preload some associations. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12044 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-07-28 10:13:48 +00:00
Jean-Philippe Lang
21fc903c04 Fixed that sorting time entries by custom field raises a SQL error (#14366). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12042 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-07-28 09:59:34 +00:00
Jean-Philippe Lang
1d48ab201b Log errors when bulk edit/copy fails (#13440). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11611 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-03-12 19:43:46 +00:00
Jean-Philippe Lang
797a9f1ea9 Refactor: #issues_to_csv and #entries_to_csv merged into QueriesHelper#query_to_csv. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11448 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-23 11:07:43 +00:00
Jean-Philippe Lang
f8c649320f Makes all time entry columns available in the CSV export. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11442 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-19 20:41:54 +00:00
Jean-Philippe Lang
d8e4a8fb32 Use #per_page instead of #items_per_page. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11425 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-17 11:35:42 +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
9394d739b1 Deprecation warnings (#12774). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11139 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-01-08 20:18:12 +00:00
Jean-Philippe Lang
8c7b6012f5 Removed unused code. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10985 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-12-11 20:09:16 +00:00
Jean-Philippe Lang
8ab9215ea8 Use named routes in controllers. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10983 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-12-11 19:39:47 +00:00
Jean-Philippe Lang
aba07a860f Rescue Query::StatementInvalid in TimelogController. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10973 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-12-09 21:13:26 +00:00
Jean-Philippe Lang
9dc07d4790 Adds filters for regular/custom fields to the time entries list/report (#10191). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10970 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-12-09 19:18:57 +00:00
Jean-Philippe Lang
f8895a7cdd Adds TimeEntryQuery for listing time entries. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10967 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-12-09 17:57:18 +00:00
Toshi MARUYAMA
cb68851eac remove trailing white-space from app/controllers/timelog_controller.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10797 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-11-13 03:58:38 +00:00
Jean-Philippe Lang
3a178a42cf Add "last 2 weeks" preset to time entries reporting (#11862). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10583 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-09 17:40:00 +00:00
Jean-Philippe Lang
18f693f9f7 Fixed that 200 API responses have a body containing one space (#11388). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9975 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-07-14 08:13:55 +00:00
Jean-Philippe Lang
2c07b478bb Fixed that time entries should be sorted by date and created_on (#11178). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9837 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-16 20:09:12 +00:00
Jean-Philippe Lang
4ee133e77e Fixed that project, issue and activity should be preserved when logging time with "Create and continue" (#11038). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9741 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-29 18:54: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
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
6b47cad8ce Cleanup in TimelogController#destroy. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9095 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-04 15:24:14 +00:00
Jean-Philippe Lang
b3866b05c1 Removes all #verify calls in controllers. Verification is handled at routing level now that the default route is removed. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9061 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-03 15:09:20 +00:00
Jean-Philippe Lang
13f28858ba Fixed that project is ignored when entering an issue id on /time_entries/new form (#10020). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8693 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-22 10:37:57 +00:00
Jean-Philippe Lang
41e82c4598 Keep back_url param for when continuing creating issues. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8692 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-21 14:34:55 +00:00
Jean-Philippe Lang
41eab6615b Enable global time logging at /time_entries/new (#10020). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8691 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-21 14:26:51 +00:00
Jean-Philippe Lang
1d07bb91a7 Adds a 'Create and continue' button on the spent time form (#9995). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8687 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-21 10:37:19 +00:00
Jean-Philippe Lang
8eef72aa1a Separated new/edit views for the timelog controller. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8628 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-10 17:35:09 +00:00
Jean-Philippe Lang
c131a38d7c Do not call _before_save hook without saving. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8596 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-09 18:52:07 +00:00
Jean-Philippe Lang
919e686e93 Do not call _before_save hook without saving. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8595 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-09 18:51:40 +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
69a2431dd0 Dropped TimeEntryReportsController. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8027 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-12-02 19:33:05 +00:00
Toshi MARUYAMA
dd43df8180 remove trailing white-spaces from app/controllers/timelog_controller.rb. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6518 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-08-21 09:26:32 +00:00
Jean-Philippe Lang
93c2b92a4b Separation of RSS/API auth actions. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6197 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-07-09 08:56:07 +00:00
Jean-Philippe Lang
12801ca031 Fixed: GET /time_entries.xml ignores limit/offset parameters (#8356). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5881 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-05-22 10:48:59 +00:00