Commit Graph

26 Commits

Author SHA1 Message Date
Jean-Philippe Lang c47aacd6b0 Merged r12736 (#15977).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12860 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-08 07:58:49 +00:00
Toshi MARUYAMA 75050f767a Traditional Chinese "label_total_time" translation changed by ChunChang Lo (#13528)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11668 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-20 06:02:58 +00:00
Jean-Philippe Lang 06a92fe0d0 Adds label_total_time string (#13337).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11582 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-10 13:01:46 +00:00
Jean-Philippe Lang 0a6a7f0ed7 Fixed that time entries report by week breaks on edge cases (#5329).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11471 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-24 12:18:29 +00:00
Jean-Philippe Lang 85b872f340 Makes project custom fields available on spent time report (#1766).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11459 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-24 08:57:04 +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 d6ecfcf50c Rename the Member column to User on the time entries list.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10968 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-09 18:09:44 +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
Jean-Philippe Lang 4cc4e8bfd3 Functional tests cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10936 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-03 22:23:23 +00:00
Jean-Philippe Lang 76eeb64d1a Fixed that time report raises a SQL error if there are multiple CustomValue for a time entry (#11160).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9831 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-14 10:47:04 +00:00
Jean-Philippe Lang 5e57a1a9d9 Merged rails-3.2 branch.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-25 17:17:49 +00:00
Jean-Philippe Lang a6a627f445 Adds "Status" to the time report criteria (#9985).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8643 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-14 09:51:56 +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
Jean-Philippe Lang caf898d7d1 Extracted time report logic from the controller.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8026 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-02 18:46:43 +00:00
Toshi MARUYAMA d136672fa3 add tests to export time entry csv in French for csv separator (#8368)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7951 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-27 12:14:45 +00:00
Toshi MARUYAMA 88231f460f add csv separator check to the test to export time entry csv in Traditional Chinese (#8368)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7949 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-27 12:09:11 +00:00
Toshi MARUYAMA b95fd6315c fix time entry csv last line encoding (#8549)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7947 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-27 10:53:08 +00:00
Toshi MARUYAMA 4a3581c748 fix malformed time entry report csv encoding in case of unable to convert (#8549)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7820 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-16 08:29:18 +00:00
Toshi MARUYAMA 95ef931048 add functional test to export time entry report csv encoded in Big5 on Traditional Chinese locale (#8549)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7811 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-15 06:06:47 +00:00
Toshi MARUYAMA e1d71c7968 code layout clean up test_report_csv_export of test/functional/time_entry_reports_controller_test.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7784 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-12 08:35:12 +00:00
Toshi MARUYAMA b560927d45 code layout clean up test_report_all_projects_csv_export of test/functional/time_entry_reports_controller_test.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7783 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-12 08:34:49 +00:00
Toshi MARUYAMA a920184c83 code layout clean up test/functional/time_entry_reports_controller_test.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7764 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-10 23:48:58 +00:00
Toshi MARUYAMA ff1ba32b5c remove trailing white-spaces from test/functional/time_entry_reports_controller_test.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6612 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-25 01:13:28 +00:00
Jean-Philippe Lang b0ade644d6 Changed timelogs filters to use non-AJAX requests (#1965).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5297 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-03 11:55:24 +00:00
Jean-Baptiste Barth 17f86d964f Use absolute paths in test/**/* requires for Ruby 1.9.2 compatibility. #4050
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4509 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 23:24:34 +00:00
Eric Davis e13790c62c Refactor: extract TimelogController#report to a new controller class
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4232 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-05 16:07:17 +00:00