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
5a35c5b2e2
Fixed that date range fields don't get enabled when using the calendar popup ( #8574 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9452 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-19 12:26:19 +00:00
b13f85e456
Adds custom field in TimeEntry API responses ( #10131 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8748 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-01 21:15:13 +00:00
6714d69767
Fixed javascript error when changing time period on time report.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8701 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-24 21:01:49 +00:00
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
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
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
48fae14403
Rails3: view: html_safe for timelog/report.html.erb
...
Contributed by Eric Cline.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8450 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-01 06:11:46 +00:00
09e4fd0500
Rails3: view: html_safe for timelog/_report_criteria.html.erb
...
Contributed by Eric Cline.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8449 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-01 06:11:01 +00:00
0d5df3a73e
Rails3: view: html_safe for timelog/bulk_edit.html.erb
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8308 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-21 13:42:19 +00:00
b86ca61b49
Invalid HTML generated with ruby1.9.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8251 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-17 09:21:37 +00:00
1ad16c2238
Removed fieldset.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8188 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-10 21:33:56 +00:00
8be46ff0b2
Removed double dash.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8186 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-10 21:28:30 +00:00
9636882c1e
Use #labelled_form_for instead of #labelled_tabular_form_for.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8141 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-09 18:15:55 +00:00
b1996b38b4
Rails3: view: html_safe for timelog/_date_range.html.erb
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8122 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-07 23:54:10 +00:00
e5bea933a8
Slight change to time report style.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8094 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-05 18:40:52 +00:00
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
cce80c690c
Adds an autoscroll div around time entry list and report ( #8809 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7982 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-29 18:32:28 +00:00
8ea09238da
[ #9489 ] set ids, created invisible labels and linked them
...
Contributed by Romano Licker.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7689 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-29 01:20:55 +00:00
dcedf57db8
replace tabs to spaces at app/views/timelog/_date_range.html.erb
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7316 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-17 08:42:01 +00:00
ea539c54d6
replace tabs to spaces at app/views/timelog/index.html.erb
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7315 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-17 08:41:35 +00:00
208cef13b3
replace tabs to spaces at app/views/timelog/edit.html.erb
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7291 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-17 04:07:35 +00:00
8933443b9d
remove a trailing tab from app/views/timelog/_list.html.erb
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7283 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-17 04:03:48 +00:00
9fec631d14
remove trailing white-spaces app/views/timelog/_list.html.erb
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7278 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-17 02:54:38 +00:00
beeb177a86
rename .rhtml to .html.erb of app/views/timelog/_date_range.rhtml.
...
:rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6712 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-29 01:41:04 +00:00
0a49526751
rename .rhtml to .html.erb of app/views/timelog/_list.rhtml.
...
:rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6711 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-29 01:40:28 +00:00
510504b007
rename .rhtml to .html.erb of app/views/timelog/bulk_edit.rhtml.
...
:rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6710 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-29 01:39:54 +00:00
c434457112
rename .rhtml to .html.erb of app/views/timelog/edit.rhtml.
...
:rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6709 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-29 01:39:21 +00:00
b921cb3cb4
HTML escape at app/views/timelog/_list.rhtml.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6385 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-02 13:14:38 +00:00
12801ca031
Fixed: GET /time_entries.xml ignores limit/offset parameters ( #8356 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5881 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-22 10:48:59 +00:00
d0ea5fae62
Fixed: empty list for user/version custom fields on bulk edit form ( #2096 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5354 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-07 16:34:58 +00:00
2029df01ae
add bulk edit items and context menu in time entries list view ( #7996 ).
...
get bulk edit form action working by mapping permissions.
Contributed by Adam Soltys.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5314 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-04 11:53:55 +00:00
f6c5426605
add view for bulk edit time entries ( #7996 ).
...
Contributed by Adam Soltys.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5311 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-04 11:52:33 +00:00
4ab4c21890
Disable unused fields when switching the period type.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5299 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-03 12:02:56 +00:00
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
224921460a
Adds a pseudo format to api template names and overrides ActionController#default_template so that api templates are chosen automatically.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4466 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-04 17:43:39 +00:00
f7cf8aa878
Adds REST API for TimeEntries ( #6823 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4461 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-04 10:13:15 +00:00
718816c5d4
Refactor: convert timelogs to a REST resource (:time_entries)
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4250 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-12 15:55:21 +00:00
435c90eb47
Refactor: extract TimelogController#edit to #update
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4248 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-11 15:31:42 +00:00
4acd990ee2
Refactor: extract TimelogController#create from TimelogController#edit
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4244 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-08 15:39:39 +00:00
068771ea07
Refactor: extract TimelogController#new from #edit
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4239 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-07 15:51:09 +00:00
2ecca7e4df
Refactor: rename TimelogController#details to #index
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4235 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-06 18:23:45 +00:00
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
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
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
e76d4c5c4c
Added an active field track if an Enumeration is active on the frontend view.
...
* 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
2009-10-21 22:34:28 +00:00
19df1b636c
Fixed a bug where the form would POST causing a routing error. ( #3918 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2902 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-09-25 00:39:02 +00:00
21e18c1eb4
Adds missing native eol properties.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2895 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-09-20 14:06:57 +00:00
41cbd239c4
Makes timelog report work at issue level ( #2935 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2893 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-09-20 09:30:41 +00:00
3477ded32a
Makes tickets and timelogs filters collapsible (UI).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2891 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-09-20 07:24:16 +00:00
Jean-Philippe Lang
Toshi MARUYAMA
Eric Davis