Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-01 10:56:17 +01:00
Code Issues Packages Projects Releases Activity
14,213 Commits 35 Branches 222 Tags
9f4a4be01a48eb2cbb30f8786aee3b9fec830f19
Commit Graph

132 Commits

Author SHA1 Message Date
Jean-Philippe Lang
2fdbcd35dd Adds a permission to log time for another user (#3848). 
Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@17755 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-12-16 16:28:22 +00:00
Jean-Philippe Lang
aac543dfba Column Project is no longer added by default to the list of default columns for time entries (#26537). 
Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@17503 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-09-23 11:59:52 +00:00
Go MAEDA
156b8e2ee6 Allow project bulk edit of time entries (#26534). 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@17482 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-09-14 03:40:37 +00:00
Go MAEDA
c76a021e92 Time entry creation: preserve 'spent on' value when using 'Create and Continue' (#29308). 
Patch by Jens Krämer.


git-svn-id: http://svn.redmine.org/redmine/trunk@17459 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-08-02 06:00:10 +00:00
Jean-Philippe Lang
2a721fff4c Set default configuration for the timelog list (#26356). 
git-svn-id: http://svn.redmine.org/redmine/trunk@16814 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-12 18:13:20 +00:00
Jean-Philippe Lang
339a6212ef Use ApplicationController#find_optional_project instead. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16722 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-26 19:53:09 +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
7b125bc292 Better handling of update failures when bulk editing time entries. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16477 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-04 17:22:08 +00:00
Jean-Philippe Lang
71d88e5535 Get rid of sort_helper when using queries. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16390 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-13 19:17:59 +00:00
Jean-Philippe Lang
d05d559d15 Redmine loses filters after deleting a spent time (#14817). 
git-svn-id: http://svn.redmine.org/redmine/trunk@16056 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-11 09:25:41 +00:00
Jean-Philippe Lang
e9184adafc Show action not allowed for time entries in closed projects (#24297). 
Patch by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@15955 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-11-18 08:37:07 +00:00
Jean-Philippe Lang
3c067ba8bd Bulk edit for shows activities not available for the time entry's project (#23922). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15953 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-11-18 08:21:11 +00:00
Jean-Philippe Lang
f7782c4648 Preload project and user. 
git-svn-id: http://svn.redmine.org/redmine/trunk@15941 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-29 14:19:25 +00:00
Jean-Philippe Lang
ed4c0886e2 Preload project and user. 
git-svn-id: http://svn.redmine.org/redmine/trunk@15940 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-29 14:16:13 +00:00
Jean-Philippe Lang
858cb0bd78 Don't bulk edit file custom fields (#6719). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15924 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-23 11:51:26 +00:00
Jean-Philippe Lang
9ef42ce3d5 New "Spent time" menu tab when spent time module is enabled on project (#23311). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15747 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-08-20 12:18:29 +00:00
Jean-Philippe Lang
3539cfcf0f Adds issue tracker and status columns and filters on spent time list (#23401). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15738 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-08-20 10:27:39 +00:00
Jean-Philippe Lang
cad0036297 Use head instead of render :nothing => true. 
git-svn-id: http://svn.redmine.org/redmine/trunk@15687 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-17 06:35:28 +00:00
Jean-Philippe Lang
ee82a55602 Use .before_action instead of .before_filter. 
git-svn-id: http://svn.redmine.org/redmine/trunk@15655 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-14 07:27:31 +00:00
Jean-Philippe Lang
793cb16764 Make time entries groupable (#16843). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15649 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-13 19:02:48 +00:00
Jean-Philippe Lang
03dbf8abb8 Remove special behaviour for listing issue time entries, use a filter for that. 
git-svn-id: http://svn.redmine.org/redmine/trunk@15644 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-12 19:28:49 +00:00
Jean-Philippe Lang
beb5e60391 Makes spent time queries savable (#14790). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15639 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-12 17:40:19 +00:00
Jean-Philippe Lang
f694839c82 Code cleanup (#23054). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15534 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-15 18:24:02 +00:00
Jean-Philippe Lang
755839dad7 Clearing time entry custom fields while bulk editing results in values set to __none__ (#23054). 
Patch by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@15532 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-15 18:18:24 +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