summaryrefslogtreecommitdiffstats
path: root/app/helpers/timelog_helper.rb
Commit message (Collapse)AuthorAgeFilesLines
* Merged r19727 from trunk to 4.1-stable (#33341).Go MAEDA2020-04-271-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19728 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r19651 and r19652 to 4.1-stable (#32973).Jean-Philippe Lang2020-04-051-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19657 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r19554 from trunk to 4.1-stable (#33052).Go MAEDA2020-03-041-1/+9
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19557 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r19501 from trunk to 4.1-stable (#32959).Go MAEDA2020-02-091-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19502 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r19341 from trunk to 4.1-stable (#32500).Go MAEDA2019-12-061-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19342 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Update copyright year.Go MAEDA2019-05-251-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@18198 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Enable frozen_string_literal for some files under app and lib directory ↵Go MAEDA2019-03-161-1/+1
| | | | | | (#26561). git-svn-id: http://svn.redmine.org/redmine/trunk@17977 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Remove unnecessary encoding magic comment (#31034).Go MAEDA2019-03-161-2/+0
| | | | | | | | | The default script encoding is UTF-8 in Ruby 2.0 or later. Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@17976 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Add "frozen_string_literal: false" for all files (#26561).Go MAEDA2019-03-151-0/+2
| | | | | | | This will be changed to true in the future. git-svn-id: http://svn.redmine.org/redmine/trunk@17947 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds a permission to log time for another user (#3848).Jean-Philippe Lang2018-12-161-0/+5
| | | | | | Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@17755 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Removes render_ prefix from cancel_button_tag methods (#8888).Jean-Philippe Lang2018-09-261-2/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@17523 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Add cancel button to new/edit log time page (#8888).Jean-Philippe Lang2018-09-261-0/+6
| | | | | | Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@17522 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Add links to Users, Projects and Versions in timelog report (#29042).Go MAEDA2018-06-181-7/+3
| | | | | | | Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@17404 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Allow switching the encoding to UTF-8 when exporting to CSV (#26279).Go MAEDA2018-05-071-1/+1
| | | | | | | Patch by Mizuki ISHIKAWA. git-svn-id: http://svn.redmine.org/redmine/trunk@17328 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Update copyright.Jean-Philippe Lang2017-06-251-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@16685 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Remove special behaviour for listing issue time entries, use a filter for that.Jean-Philippe Lang2016-07-121-14/+0
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@15644 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
* Adds a class for handling CSV generation (#7037).Jean-Philippe Lang2015-06-131-15/+8
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14302 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Update activities list when changing project/issue id on the time entry form ↵Jean-Philippe Lang2015-05-301-0/+1
| | | | | | (#19656). git-svn-id: http://svn.redmine.org/redmine/trunk@14287 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
* Removed unused helper.Jean-Philippe Lang2014-12-121-15/+0
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@13741 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged rails-4.1 branch (#14534).Jean-Philippe Lang2014-10-221-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@13482 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
* Merged custom fields format refactoring.Jean-Philippe Lang2013-12-141-1/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@12400 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds label_total_time string (#13337).Jean-Philippe Lang2013-03-101-2/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11582 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Refactor: #issues_to_csv and #entries_to_csv merged into ↵Jean-Philippe Lang2013-02-231-15/+0
| | | | | | 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-34/+6
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11442 e93f8b46-1217-0410-a6f0-8f06a7374b81
* replace tabs to spaces at app/helpers/timelog_helper.rbToshi MARUYAMA2013-02-161-3/+3
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11406 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
* Replaces find(:all) calls.Jean-Philippe Lang2012-12-021-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10916 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Add "last 2 weeks" preset to time entries reporting (#11862).Jean-Philippe Lang2012-10-091-0/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10583 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
* Display of multi custom fields.Jean-Philippe Lang2012-01-291-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8726 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Display "none" inside square brackets.Jean-Philippe Lang2012-01-141-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8644 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Added encoding comment to helpers (#9792).Jean-Philippe Lang2011-12-141-0/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8210 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Extracted time report logic from the controller.Jean-Philippe Lang2011-12-021-18/+18
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8026 e93f8b46-1217-0410-a6f0-8f06a7374b81
* fix csv decimal separator of time entry csv (#8368)Toshi MARUYAMA2011-11-271-5/+6
| | | | | | Contributed by Francisco José Martínez. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7950 e93f8b46-1217-0410-a6f0-8f06a7374b81
* fix time entry csv last line encoding (#8549)Toshi MARUYAMA2011-11-271-1/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7947 e93f8b46-1217-0410-a6f0-8f06a7374b81
* backout r6356: HTML escape of app/helpers/timelog_helper.rbToshi MARUYAMA2011-11-271-1/+1
| | | | | | | When export time entry csv, "undefined method `h'" error raises. HTML escapes in view. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7941 e93f8b46-1217-0410-a6f0-8f06a7374b81
* fix malformed time entry report csv encoding in case of unable to convert ↵Toshi MARUYAMA2011-11-161-7/+6
| | | | | | (#8549) git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7820 e93f8b46-1217-0410-a6f0-8f06a7374b81
* fix malformed time log csv encoding in case of unable to convert (#8549)Toshi MARUYAMA2011-11-161-3/+6
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7819 e93f8b46-1217-0410-a6f0-8f06a7374b81
* remove trailing white-spaces from app/helpers/timelog_helper.rb.Toshi MARUYAMA2011-08-311-18/+18
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6911 e93f8b46-1217-0410-a6f0-8f06a7374b81
* HTML escape at app/helpers/timelog_helper.rb.Toshi MARUYAMA2011-08-021-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6356 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixes time report with JRuby (#5404).Jean-Philippe Lang2010-04-301-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3708 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Changes misleading scopes on Enumeration.Jean-Philippe Lang2009-11-211-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3083 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Don't reveal issue subjects if user is only allowed to view spent time (#3187).Jean-Philippe Lang2009-11-141-2/+19
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3043 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Refactoring ApplicationHelper#link_to_issue.Jean-Philippe Lang2009-11-141-1/+1
| | | | | | Now displays issue subject by default. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3040 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Use FasterCSV or ruby1.9 CSV instead of ruby1.8 builtin CSV.Jean-Philippe Lang2009-11-041-6/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3007 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Changed the Timelogs to use both the Systemwide and Project specific ↵Eric Davis2009-10-211-3/+9
| | | | | | | | | | | | TimeEntryActivities * Added Project#activities to return all the Systemwide and Project specific activities, excluding Systemwide ones that are overridden. * Added some tests for TimelogHelper. #4077 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2948 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Added an active field track if an Enumeration is active on the frontend view.Eric Davis2009-10-211-4/+11
| | | | | | | | | | | * Changed TimelogHelper#activity_collection_for_select_options to only use active TimeEntryActivities. * Changed TimelogHelper#activity_collection_for_select_options to return a blank option if the time_entry's current activity is inactive. #4077 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2946 e93f8b46-1217-0410-a6f0-8f06a7374b81