Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-10-31 10:25:55 +01:00
Code Issues Packages Projects Releases Activity
11,169 Commits 35 Branches 222 Tags
eae9c9ab2be43c64c830a03e414b51a08571c957
Commit Graph

84 Commits

Author SHA1 Message Date
Jean-Philippe Lang
b2ba7db4e1 Time entries CSV export should include the tracker and subject of the issue (#18269). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13562 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-05 15:23:22 +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
2e9b28906d Removes routes for time entries nested under project/issues. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13424 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-04 09:14:17 +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
Jean-Philippe Lang
dd70327ce4 Let user choose an issue of another project when updating a time entry (#16338). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12990 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-21 02:12:32 +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
4e151a4722 Syntax error with ruby1.8. 
git-svn-id: http://svn.redmine.org/redmine/trunk@12651 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-01-11 11:50:47 +00:00
Toshi MARUYAMA
2a8ae016c5 Rails4: replace deprecated find_all_by_* at TimelogControllerTest 
git-svn-id: http://svn.redmine.org/redmine/trunk@12644 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-01-11 10:14:24 +00:00
Toshi MARUYAMA
eab8f307f9 Rails4: replace deprecated Relation#first with finder options at TimelogControllerTest 
git-svn-id: http://svn.redmine.org/redmine/trunk@12642 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-01-11 10:13:53 +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
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
dc5e5eca6b Fixed that displaying time entries with custom field column raises an error (#5037). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12041 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-07-24 18:18:08 +00:00
Jean-Philippe Lang
6b03c741ac Adds a link on "My Page" to view all my spent time (#13157). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11859 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-05-18 07:39:26 +00:00
Jean-Philippe Lang
25209273d3 Fixed that CSV Export of Spent Time ignores filters and columns selection (#13618). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11696 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-04-03 16:48:28 +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
8f00d31ec6 Accommodates fixtures for databases with case sensitive sort. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11260 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-01-23 18:09:03 +00:00
Jean-Philippe Lang
e18d0e268d Makes issue custom fields available as timelog columns (#1766). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11174 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-01-12 13:09:06 +00:00
Jean-Philippe Lang
14b09361e4 Adds issue custom fields to time entries filters (#10191). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11171 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-01-12 12:38:45 +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
ad246e81ad Code cleanup, use named routes. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11071 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-12-22 12:24:43 +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
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
340b4a30d0 Removed invalid/duplicate test. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10582 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-09 17:38:46 +00:00
Jean-Philippe Lang
e06bf0c464 Don't show the project dropdown when logging time on an issue. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10183 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-08-09 17:12:24 +00:00
Jean-Philippe Lang
2c07b478bb Fixed that time entries should be sorted by date and created_on (#11178). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9837 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-16 20:09:12 +00:00
Jean-Philippe Lang
4ee133e77e Fixed that project, issue and activity should be preserved when logging time with "Create and continue" (#11038). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9741 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-29 18:54:26 +00:00
Jean-Philippe Lang
53a0cee57a Fixed that logging time inside redirects at global time logging (#11038). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9740 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-29 17:07:07 +00:00
Jean-Philippe Lang
ee8dcab9db Fixed that activities option tags on the time entry bulk edit form are escaped. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9643 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-05 16:09:27 +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
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
f79961f1c5 Additional tests for TimelogController. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9440 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-18 19:42:18 +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
13f28858ba Fixed that project is ignored when entering an issue id on /time_entries/new form (#10020). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8693 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-22 10:37:57 +00:00
Jean-Philippe Lang
41eab6615b Enable global time logging at /time_entries/new (#10020). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8691 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-21 14:26:51 +00:00
Jean-Philippe Lang
1d07bb91a7 Adds a 'Create and continue' button on the spent time form (#9995). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8687 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-21 10:37:19 +00:00
Jean-Philippe Lang
8eef72aa1a Separated new/edit views for the timelog controller. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8628 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-10 17:35:09 +00:00
Jean-Philippe Lang
b4af45537a Additional tests for TimelogController and added missing i18n string. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8263 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-12-17 15:25:15 +00:00
Jean-Philippe Lang
1050993348 Removed unnecessary calculations in time entries index. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8085 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-12-04 23:01:42 +00:00
Toshi MARUYAMA
caefb912b5 add tests to export time log csv in Traditional Chinese and French for csv separator (#8368) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7944 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-27 10:02:31 +00:00
Jean-Philippe Lang
f436918dbe Fixed that :edit_time_entries permission allows creating time entries (#9405). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7921 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-24 21:21:15 +00:00
Jean-Philippe Lang
6b43e9462e Fixed that :view_time_entries permission allows time entry editing (#9405). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7920 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-24 21:16:44 +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
36afbc41b6 add functional test to export time log csv encoded in Big5 on Traditional Chinese locale (#8549) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7812 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-15 10:06:01 +00:00
Toshi MARUYAMA
41bf0a74a5 code layout clean up test/functional/timelog_controller_test.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7762 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-10 13:44:36 +00:00
Toshi MARUYAMA
f4eb05a26e remove trailing white-spaces from test/functional/timelog_controller_test.rb. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6624 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-08-25 01:44:57 +00:00
Jean-Philippe Lang
1af6527e42 Code cleanup. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5319 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-05 11:40:31 +00:00
Toshi MARUYAMA
c2baf187ac add functional tests for bulk edit time entries (#7996). 
Contributed by Adam Soltys.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5315 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-04 11:54:22 +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-Philippe Lang
335f8da5e8 Fixed: 404 when entering time with blank issue id (#7099). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4511 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-14 18:29:24 +00:00