591922c365
Merged r12057 from trunk ( #14415 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12063 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 20:46:04 +00:00
493119e795
Merged r12042 from trunk ( #14366 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12043 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 10:00:35 +00:00
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
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
d8e4a8fb32
Use #per_page instead of #items_per_page.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11425 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-17 11:35:42 +00:00
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
9394d739b1
Deprecation warnings ( #12774 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11139 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-08 20:18:12 +00:00
8c7b6012f5
Removed unused code.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10985 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-11 20:09:16 +00:00
8ab9215ea8
Use named routes in controllers.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10983 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-11 19:39:47 +00:00
aba07a860f
Rescue Query::StatementInvalid in TimelogController.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10973 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-09 21:13:26 +00:00
9dc07d4790
Adds filters for regular/custom fields to the time entries list/report ( #10191 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10970 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-09 19:18:57 +00:00
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
cb68851eac
remove trailing white-space from app/controllers/timelog_controller.rb
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10797 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-13 03:58:38 +00:00
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
18f693f9f7
Fixed that 200 API responses have a body containing one space ( #11388 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9975 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-14 08:13:55 +00:00
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
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
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
1ec2d98c14
Prevent mass-assignment when adding/updating a time entry ( #10390 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9136 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-06 20:23:00 +00:00
6b47cad8ce
Cleanup in TimelogController#destroy.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9095 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-04 15:24:14 +00:00
b3866b05c1
Removes all #verify calls in controllers. Verification is handled at routing level now that the default route is removed.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9061 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-03 15:09:20 +00:00
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
41e82c4598
Keep back_url param for when continuing creating issues.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8692 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-21 14:34:55 +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
c131a38d7c
Do not call _before_save hook without saving.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8596 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-09 18:52:07 +00:00
919e686e93
Do not call _before_save hook without saving.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8595 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-09 18:51:40 +00:00
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
9e5ed4208b
Adds named scopes for time entries index.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8084 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-04 22:49:46 +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
dd43df8180
remove trailing white-spaces from app/controllers/timelog_controller.rb.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6518 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-21 09:26:32 +00:00
93c2b92a4b
Separation of RSS/API auth actions.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6197 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-07-09 08:56:07 +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
efccc61d79
Fixed: DoubleRenderError introduced by #7996 .
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5318 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-05 11:38:45 +00:00
098fabd6ce
add function of bulk delete time entries ( #7996 ).
...
Contributed by Adam Soltys.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5316 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-04 11:54:47 +00:00
8a31517288
add bulk edit and bulk update actions for time entries ( #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@5313 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-04 11:53:29 +00:00
0786b9ef99
Replaces TimeEntry.visible_by with a visible scope.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5149 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-16 17:29:30 +00:00
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
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
37ed02553a
Fixes test failure in r4461.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4462 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-04 10:40:44 +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
3ba3c540fb
Prevents NoMethodError when requesting /time_entries/edit without an id ( #6904 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4410 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-16 20:27:45 +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
cdfc57d544
Change the TimelogController's to/from dates based on the project time entries
...
Instead of looking for the earliest and latest time entry system wide for the
dates in the form, now TimelogController will only look at the time entries
for the current project (and parent/sub projects).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4087 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-14 19:02:25 +00:00
Jean-Philippe Lang
Toshi MARUYAMA
Eric Davis