Commit Graph

98 Commits

Author SHA1 Message Date
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 a4f989a5e0 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11070 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-22 10:57:01 +00:00
Jean-Philippe Lang 0ce6eb9285 Makes time entry custom fields available for display on the time entries list (#1766).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10972 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-09 21:03:30 +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 1b64e4be5e Set radio button when selecting a date with the date picker.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10284 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-02 17:24:29 +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 f1650b8ff4 Adds autocomplete to issue field on time logging form.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10182 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-09 16:58:36 +00:00
Jean-Philippe Lang 6a2ca5e034 JQuery in, Prototype/Scriptaculous out (#11445).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10068 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-22 13:29:26 +00:00
Jean-Philippe Lang 851fbaf750 Use named routes.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9938 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-07 14:39:29 +00:00
Jean-Philippe Lang 7b40767428 Deprecated :confirm => 'Text' option.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9937 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-07 14:36:49 +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 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 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Toshi MARUYAMA 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
Jean-Philippe Lang 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
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 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Jean-Philippe Lang 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
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 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
Jean-Philippe Lang 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