summaryrefslogtreecommitdiffstats
path: root/app/controllers/timelog_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
* Merged r17459 from trunk to 3.3-stable (#29308).Go MAEDA2018-08-021-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17461 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16056 (#14817).Jean-Philippe Lang2016-12-201-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16097 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15952 and r15953 (#23922).Jean-Philippe Lang2016-12-031-2/+5
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16043 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15955 and r15956 (#24297).Jean-Philippe Lang2016-11-261-3/+7
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15999 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15532 to r15534 (#23054).Jean-Philippe Lang2016-06-181-8/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15537 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Updates copyright for 2016.Jean-Philippe Lang2016-03-131-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@15238 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Can't bulk edit own time entries with "Edit own time entries" (#18580).Jean-Philippe Lang2015-05-091-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14242 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Copyright update.Jean-Philippe Lang2015-01-111-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@13872 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Use logger.info? (#18605).Jean-Philippe Lang2014-12-141-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@13766 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged rails-4.1 branch (#14534).Jean-Philippe Lang2014-10-221-5/+5
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Let the new time_entry form be submitted without project (#17954).Jean-Philippe Lang2014-10-041-40/+23
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@13422 e93f8b46-1217-0410-a6f0-8f06a7374b81
* update copyright year (#15977)Toshi MARUYAMA2014-01-291-1/+1
| | | | | | Contributed by Daniel Felix. git-svn-id: http://svn.redmine.org/redmine/trunk@12736 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Rails4: replace deprecated find_all_by_* at TimelogController#find_time_entriesToshi MARUYAMA2014-01-101-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@12603 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed that filtering time entries on activity does not take care of activity ↵Jean-Philippe Lang2013-12-151-1/+1
| | | | | | overrides (#15623). git-svn-id: http://svn.redmine.org/redmine/trunk@12414 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Spent time details and report should ignore ↵Jean-Philippe Lang2013-07-281-2/+0
| | | | | | 'Setting.display_subprojects_issues?' (#14415). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12057 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Don't use finder options.Jean-Philippe Lang2013-07-281-12/+3
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12045 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Preload some associations.Jean-Philippe Lang2013-07-281-8/+5
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12044 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed that sorting time entries by custom field raises a SQL error (#14366).Jean-Philippe Lang2013-07-281-9/+5
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12042 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Log errors when bulk edit/copy fails (#13440).Jean-Philippe Lang2013-03-121-0/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11611 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Refactor: #issues_to_csv and #entries_to_csv merged into ↵Jean-Philippe Lang2013-02-231-1/+1
| | | | | | QueriesHelper#query_to_csv. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11448 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Makes all time entry columns available in the CSV export.Jean-Philippe Lang2013-02-191-1/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11442 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Use #per_page instead of #items_per_page.Jean-Philippe Lang2013-02-171-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11425 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Copyright for 2013 (#12788).Jean-Philippe Lang2013-01-121-1/+1
| | | | | | Patch by Daniel Felix. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11169 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Deprecation warnings (#12774).Jean-Philippe Lang2013-01-081-2/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11139 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Removed unused code.Jean-Philippe Lang2012-12-111-47/+0
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10985 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Use named routes in controllers.Jean-Philippe Lang2012-12-111-6/+14
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10983 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Rescue Query::StatementInvalid in TimelogController.Jean-Philippe Lang2012-12-091-0/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10973 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds filters for regular/custom fields to the time entries list/report (#10191).Jean-Philippe Lang2012-12-091-2/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10970 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds TimeEntryQuery for listing time entries.Jean-Philippe Lang2012-12-091-17/+20
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10967 e93f8b46-1217-0410-a6f0-8f06a7374b81
* remove trailing white-space from app/controllers/timelog_controller.rbToshi MARUYAMA2012-11-131-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10797 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Add "last 2 weeks" preset to time entries reporting (#11862).Jean-Philippe Lang2012-10-091-0/+3
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10583 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed that 200 API responses have a body containing one space (#11388).Jean-Philippe Lang2012-07-141-2/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9975 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed that time entries should be sorted by date and created_on (#11178).Jean-Philippe Lang2012-06-161-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9837 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed that project, issue and activity should be preserved when logging time ↵Jean-Philippe Lang2012-05-291-8/+16
| | | | | | with "Create and continue" (#11038). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9741 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Copyright update.Jean-Philippe Lang2012-05-051-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9636 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Prevent mass-assignment when adding/updating a time entry (#10390).Jean-Philippe Lang2012-03-061-5/+5
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9136 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Cleanup in TimelogController#destroy.Jean-Philippe Lang2012-03-041-15/+15
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9095 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Removes all #verify calls in controllers. Verification is handled at routing ↵Jean-Philippe Lang2012-03-031-3/+0
| | | | | | 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
* Fixed that project is ignored when entering an issue id on /time_entries/new ↵Jean-Philippe Lang2012-01-221-4/+6
| | | | | | form (#10020). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8693 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Keep back_url param for when continuing creating issues.Jean-Philippe Lang2012-01-211-2/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8692 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Enable global time logging at /time_entries/new (#10020).Jean-Philippe Lang2012-01-211-6/+13
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8691 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds a 'Create and continue' button on the spent time form (#9995).Jean-Philippe Lang2012-01-211-2/+6
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8687 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Separated new/edit views for the timelog controller.Jean-Philippe Lang2012-01-101-1/+0
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8628 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Do not call _before_save hook without saving.Jean-Philippe Lang2012-01-091-2/+0
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8596 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Do not call _before_save hook without saving.Jean-Philippe Lang2012-01-091-2/+0
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8595 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Removed unnecessary calculations in time entries index.Jean-Philippe Lang2011-12-041-2/+0
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8085 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds named scopes for time entries index.Jean-Philippe Lang2011-12-041-30/+29
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8084 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Dropped TimeEntryReportsController.Jean-Philippe Lang2011-12-021-2/+12
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8027 e93f8b46-1217-0410-a6f0-8f06a7374b81
* remove trailing white-spaces from app/controllers/timelog_controller.rb.Toshi MARUYAMA2011-08-211-23/+23
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6518 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Separation of RSS/API auth actions.Jean-Philippe Lang2011-07-091-2/+3
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6197 e93f8b46-1217-0410-a6f0-8f06a7374b81