Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-10 23:36:01 +01:00
Code Issues Packages Projects Releases Activity
16,114 Commits 35 Branches 222 Tags
d3004f0dfdc8f01e74bc7af4ac9c75b4df86d1d3
Commit Graph

66 Commits

Author SHA1 Message Date
Toshi MARUYAMA
60c8ac0de1 remove spaces inside {} of TimelogHelper 
git-svn-id: http://svn.redmine.org/redmine/trunk@20059 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-09-21 13:03:45 +00:00
Go MAEDA
953fce3c95 Fix time entry user is shown twice in the User drop-down (#33341). 
Patch by Thomas Löber and Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@19727 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-04-27 06:19:26 +00:00
Jean-Philippe Lang
e91dbcb5a7 Editing a time entry for a locked user changes the user to the current user (#32973). 
Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@19651 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-04-05 08:21:25 +00:00
Go MAEDA
555a2d3116 Fix missing subject and tracker name in CSV export of time (#33052). 
Patch by Kevin Fischer and Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@19554 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-03-04 07:10:07 +00:00
Go MAEDA
907e0173e4 Update copyright year in source files to 2020 (#33069). 
git-svn-id: http://svn.redmine.org/redmine/trunk@19553 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-03-03 00:24:10 +00:00
Go MAEDA
8cbb53c2ce Fix that selected user on timelog#edit is incorrect (#32959). 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@19501 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-02-09 00:23:18 +00:00
Go MAEDA
e675eaedab Fix that spent time report CSV shows translation missing text if custom fields are involved (#32500). 
Patch by Yuichi HARADA.


git-svn-id: http://svn.redmine.org/redmine/trunk@19341 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-12-06 00:24:41 +00:00
Go MAEDA
4082069c75 Update copyright year. 
git-svn-id: http://svn.redmine.org/redmine/trunk@18198 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-05-25 07:36:06 +00:00
Go MAEDA
07b3087fda Enable frozen_string_literal for some files under app and lib directory (#26561). 
git-svn-id: http://svn.redmine.org/redmine/trunk@17977 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-03-16 09:37:35 +00:00
Go MAEDA
e70c283a22 Remove unnecessary encoding magic comment (#31034). 
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
 2019-03-16 06:26:33 +00:00
Go MAEDA
5861160ffc Add "frozen_string_literal: false" for all files (#26561). 
This will be changed to true in the future.


git-svn-id: http://svn.redmine.org/redmine/trunk@17947 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-03-15 01:32:57 +00:00
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
dc4bb0fb06 Removes render_ prefix from cancel_button_tag methods (#8888). 
git-svn-id: http://svn.redmine.org/redmine/trunk@17523 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-09-26 07:49:48 +00:00
Jean-Philippe Lang
6c0aa5cb89 Add cancel button to new/edit log time page (#8888). 
Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@17522 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-09-26 07:47:59 +00:00
Go MAEDA
d32f007319 Add links to Users, Projects and Versions in timelog report (#29042). 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@17404 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-06-18 06:13:18 +00:00
Go MAEDA
ca2875fab2 Allow switching the encoding to UTF-8 when exporting to CSV (#26279). 
Patch by Mizuki ISHIKAWA.


git-svn-id: http://svn.redmine.org/redmine/trunk@17328 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-05-07 01:13:12 +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
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
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
49914f010d Adds a class for handling CSV generation (#7037). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14302 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-13 07:33:20 +00:00
Jean-Philippe Lang
216a153421 Update activities list when changing project/issue id on the time entry form (#19656). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14287 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-30 08:38:35 +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
47f331a63b Removed unused helper. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13741 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-12 21:39:43 +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
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
Jean-Philippe Lang
2e2e2cfe42 Merged custom fields format refactoring. 
git-svn-id: http://svn.redmine.org/redmine/trunk@12400 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-14 08:22:43 +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
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
Toshi MARUYAMA
5778bdd4f7 replace tabs to spaces at app/helpers/timelog_helper.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11406 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-16 13:03:54 +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
96fca0b08f Replaces find(:all) calls. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10916 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-12-02 19:16:32 +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
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
79b12c73d9 Display of multi custom fields. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8726 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-29 22:01:40 +00:00
Jean-Philippe Lang
18ea835739 Display "none" inside square brackets. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8644 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-14 09:55:49 +00:00
Jean-Philippe Lang
e43df59168 Added encoding comment to helpers (#9792). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8210 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-12-14 19:56:23 +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
a79e0fa5f6 fix csv decimal separator of time entry csv (#8368) 
Contributed by Francisco José Martínez.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7950 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-27 12:14:20 +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
55d41cf77b backout r6356: HTML escape of app/helpers/timelog_helper.rb 
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
 2011-11-27 08:25:12 +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
4b5d50e40a fix malformed time log csv encoding in case of unable to convert (#8549) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7819 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-16 08:10:53 +00:00
Toshi MARUYAMA
dbc616c928 remove trailing white-spaces from app/helpers/timelog_helper.rb. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6911 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-08-31 13:11:39 +00:00
Toshi MARUYAMA
fb8f3a7ada HTML escape at app/helpers/timelog_helper.rb. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6356 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-08-02 12:52:36 +00:00
Jean-Philippe Lang
663f0c83b2 Fixes time report with JRuby (#5404). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3708 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-04-30 12:18:11 +00:00
Jean-Philippe Lang
d8c5549168 Changes misleading scopes on Enumeration. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3083 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-11-21 12:00:49 +00:00
Jean-Philippe Lang
1a65eb8b08 Don't reveal issue subjects if user is only allowed to view spent time (#3187). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3043 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-11-14 14:10:09 +00:00
Jean-Philippe Lang
cbeeaa4d4d Refactoring ApplicationHelper#link_to_issue. 
Now displays issue subject by default.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3040 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-11-14 12:53:50 +00:00
Jean-Philippe Lang
27e3fa2bed Use FasterCSV or ruby1.9 CSV instead of ruby1.8 builtin CSV. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3007 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-11-04 13:22:26 +00:00