Tim Felgentreff
8c5312e0ec
more merge fixups
2010-10-26 18:58:54 +02:00
Tim Felgentreff
19c7dc0094
Merge remote branch 'edavis/master' into master-journalized
...
Conflicts:
app/controllers/application_controller.rb
app/controllers/wiki_controller.rb
app/helpers/issues_helper.rb
app/models/time_entry.rb
app/models/wiki_content.rb
app/views/wiki/edit.rhtml
config/locales/ja.yml
test/functional/wiki_controller_test.rb
2010-10-26 18:28:39 +02:00
Tim Felgentreff
8cece46dd4
Merge branch 'master' into master-journalized
...
Conflicts:
app/controllers/application_controller.rb
app/controllers/context_menus_controller.rb
app/controllers/gantts_controller.rb
app/controllers/issue_moves_controller.rb
app/controllers/issues_controller.rb
app/controllers/journals_controller.rb
app/controllers/previews_controller.rb
app/controllers/timelog_controller.rb
app/helpers/issues_helper.rb
app/helpers/journals_helper.rb
app/models/issue.rb
app/models/journal.rb
app/models/journal_observer.rb
app/views/admin/projects.rhtml
app/views/context_menus/issues.html.erb
app/views/issues/_action_menu.rhtml
app/views/issues/_history.rhtml
app/views/news/_news.rhtml
app/views/news/index.rhtml
app/views/repositories/diff.rhtml
config/locales/bg.yml
config/locales/bs.yml
config/locales/ca.yml
config/locales/cs.yml
config/locales/da.yml
config/locales/de.yml
config/locales/el.yml
config/locales/en-GB.yml
config/locales/es.yml
config/locales/eu.yml
config/locales/fi.yml
config/locales/fr.yml
config/locales/gl.yml
config/locales/he.yml
config/locales/hr.yml
config/locales/hu.yml
config/locales/id.yml
config/locales/it.yml
config/locales/ko.yml
config/locales/lt.yml
config/locales/lv.yml
config/locales/mn.yml
config/locales/nl.yml
config/locales/no.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/locales/pt.yml
config/locales/ro.yml
config/locales/ru.yml
config/locales/sk.yml
config/locales/sl.yml
config/locales/sr-YU.yml
config/locales/sr.yml
config/locales/sv.yml
config/locales/th.yml
config/locales/tr.yml
config/locales/uk.yml
config/locales/vi.yml
config/locales/zh-TW.yml
config/locales/zh.yml
config/routes.rb
doc/CHANGELOG
lib/redmine.rb
lib/redmine/export/pdf.rb
lib/redmine/helpers/gantt.rb
lib/redmine/version.rb
public/stylesheets/application.css
test/functional/context_menus_controller_test.rb
test/functional/issues_controller_test.rb
test/functional/journals_controller_test.rb
test/functional/previews_controller_test.rb
test/functional/users_controller_test.rb
test/functional/wiki_controller_test.rb
test/integration/routing_test.rb
test/unit/issue_test.rb
test/unit/mailer_test.rb
test/unit/query_test.rb
2010-10-26 18:20:57 +02:00
Eric Davis
17eab0f5f9
Fix wiki links on the activity page. #6746
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4294 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-26 15:44:30 +00:00
Jean-Philippe Lang
eea456ed84
Improved error message when trying to access an archived project ( #2995 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4285 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-23 09:48:01 +00:00
Eric Davis
0ca74df604
Refactor: move method to model with compatibility wrapper
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4282 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-22 22:38:45 +00:00
Jean-Philippe Lang
d8ef4b6f4d
Fixed: timelog link in the activity broken by recent refactoring ( #6702 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4277 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-22 20:40:11 +00:00
Jean-Philippe Lang
f3baa5bfee
Fixed: precedes/follows relations no longer update start/due dates ( #5803 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4263 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-19 19:16:50 +00:00
Eric Davis
fef21d5aa2
Remember the selected "Member of Role" and "Member of Group" options. #6467
...
Contributed by Yuki Kita
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4260 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-16 00:00:23 +00:00
Eric Davis
700c302fca
Change Project#notified_users to check for the 'all' notification option. #6541
...
The previous mail_notification? check would always pass since the
notifications where converted to strings and strings are always true.
Also changed Project#recipients to use #notified_users instead of duplicated
code.
Based on contribution by Felix Schäfer.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4247 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-10 21:42:24 +00:00
Eric Davis
73f12765a9
Don't duplicate users in Issue#assignable_users. From r4240
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4241 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-07 17:46:37 +00:00
Eric Davis
7798e1b1f7
Allow assigning issues back to the author. #4199
...
This allows an issue to be reassigned to the author even if they are not
a project member. Useful when passing back an issue to get more
information from the author.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4240 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-07 17:28:29 +00:00
Jean-Baptiste Barth
c43ef6e769
Code cleanup: renamed variables in User#allowed_to? with explicit names
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4234 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-06 05:08:38 +00:00
Jean-Baptiste Barth
e59c927ee5
Fixed: User#allowed_to? returning true in any case if array of projects had only one item ( #5332 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4233 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-06 05:08:31 +00:00
Jean-Baptiste Barth
e8f3dd07dd
Added ability to specify multiple projects in User#allowed_to? ( #5332 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4227 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-29 05:22:45 +00:00
Eric Davis
747b9ec568
Refactor: move method to model
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4224 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-28 22:13:11 +00:00
Eric Davis
437690119b
Allow admins to edit user's email notifications and preferences. #3503
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4223 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-28 22:13:06 +00:00
Eric Davis
4c9f261a24
Added three new notifiable events based on issue attributes
...
* issue_note_added
* issue_status_updated
* issue_priority_updated
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4221 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-28 20:20:00 +00:00
Eric Davis
582ed86d82
Add a default mail notification setting for new users
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4219 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-28 18:36:50 +00:00
Eric Davis
c059300d99
Added User#notify_about? to check when a user should be notified about an event
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4218 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-28 18:22:10 +00:00
Eric Davis
0316af7f6b
Converted User#mail_notification from a boolean to a string.
...
The string will now store which type of notification option to use.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4216 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-28 18:22:00 +00:00
Eric Davis
83e0be5d07
Fixes reverting an issue to a status with a done_ratio of 0%. #5170
...
Contributed by Felix Schäfer
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4186 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-26 18:13:31 +00:00
Eric Davis
83bfb8cd2b
Revert "Fixed: gantt broken when no due date on project issues and versions."
...
It broke the tests for overdue projects and isn't a good way to fix #6350
because it makes an assumption that a project is due Today and will still
error if issue tracking is disabled.
This reverts commit a7fd592db4
. (r4178)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4184 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-26 17:35:18 +00:00
Jean-Philippe Lang
a7fd592db4
Fixed: gantt broken when no due date on project issues and versions.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4178 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-26 08:16:05 +00:00
Eric Davis
51359704a0
Added a users options to the reminders email
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4167 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-20 23:17:51 +00:00
Eric Davis
6a76aef375
Add User#allowed_to_globally? which wraps User#allowed_to?
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4164 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-20 16:38:00 +00:00
Eric Davis
f62a1827f3
Updated issue delete confirmation when it has child issues. #6191
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4105 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-20 02:55:26 +00:00
Jean-Baptiste Barth
c4d44af54c
Fixed non standard SQL syntax. #6413
...
Contributed by Juan G
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4091 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-16 19:28:04 +00:00
Tim Felgentreff
61fdd38435
move issue journal reply to issue controller test, as each journalized controller will now use the render_reply journals helper to reply
2010-09-15 17:50:20 +02:00
Tim Felgentreff
53fd34fbd0
message mail delivery must happen after the first journal is created
2010-09-15 17:10:22 +02:00
Tim Felgentreff
e28b809271
use direct method call
2010-09-15 14:26:42 +02:00
Tim Felgentreff
68ae2d0dfd
change issue specific journal query and show_details for journal helper
2010-09-15 12:56:33 +02:00
Tim Felgentreff
6863c00359
forgot a few versioned => journaled conversions
2010-09-15 11:05:42 +02:00
Tim Felgentreff
3279b2adbd
fix mailer tests
2010-09-15 10:53:00 +02:00
Tim Felgentreff
485335599a
fix attachment_removal
2010-09-15 10:38:07 +02:00
Eric Davis
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
Eric Davis
8900797ada
Refactor: move method to Model.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4086 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-14 19:02:20 +00:00
Tim Felgentreff
3b51eb54ea
fix 2 more tests
2010-09-14 19:18:28 +02:00
Tim Felgentreff
9cd55d8dd4
more test fixes
2010-09-14 18:07:38 +02:00
Tim Felgentreff
d1ba27358a
fix wiki content specs
2010-09-14 16:59:43 +02:00
Tim Felgentreff
68ca0636c4
init journal will return the last_journal, not the new one, now
2010-09-14 16:59:27 +02:00
Tim Felgentreff
4eb07d6ce6
fix use of versions vs journals
2010-09-14 15:18:28 +02:00
Tim Felgentreff
a6a25cc5c1
render done_ratio as decimal
2010-09-14 15:17:51 +02:00
Tim Felgentreff
72e7baafdf
fix various tests in mailer, wiki content and issue helper
2010-09-14 14:25:19 +02:00
Tim Felgentreff
4b098d7774
Merge branch 'journals' into 1.0-stable
...
Conflicts:
app/controllers/issues_controller.rb
app/controllers/journals_controller.rb
app/helpers/journals_helper.rb
app/views/issues/_history.rhtml
lib/redmine/activity/fetcher.rb
test/functional/issues_controller_test.rb
test/test_helper.rb
2010-09-14 09:32:35 +02:00
Eric Davis
878bb55522
Refactor: move method to Project#css_classes
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4080 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-10 23:07:10 +00:00
Eric Davis
d36700eeee
Refactor: replace chained finders with an inject. Should handle edge cases better.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4079 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-10 19:53:57 +00:00
Eric Davis
41f8d043eb
Added a "Member of Role" to the issues filters. #5869
...
This filter will check an issue's assigned to field for users who have
(or don't have) a specific Role(s).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4078 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-10 19:44:45 +00:00
Eric Davis
109b42f482
Added a "Member of Group" to the issues filter. #5869
...
This filter will check an issue's assigned to field for users in (or not in)
specific groups.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4077 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-10 18:46:29 +00:00
Eric Davis
4c656fcffc
Define Principal#name so all subclasses will have some sort of name when printed.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4076 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-10 18:46:23 +00:00
Eric Davis
abf3ee4999
Add project names to the Versions in the Gantt export. #5904
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4073 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-10 03:09:11 +00:00
Eric Davis
bdb3937e0f
Rewrite the Gantt chart. #6276
...
This version of the Gantt chart supports nested charts. So Projects,
Versions, and Issues will be nested underneath their parents correctly.
Additional features:
* Move all Gantt code to Redmine::Helpers::Gantt class instead of having it in
the Gantt class, controller, and view
* Recursive and nest sub-projects
* Recursive and nest versions
* Recursive and nest issues
* Draw a line showing when a Project is active and it's progress
* Draw a line showing when a Version is active and it's progress
* Show a version's % complete
* Change the color of Projects, Versions, and Issues if they are late or
behind schedule
* Added Project#start_date and #due_date
* Added Project#completed_percent
* Use a mini-gravatar on the Gantt chart
* Added tests for the Gantt rendering
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4072 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-10 03:09:02 +00:00
Eric Davis
db11030410
Refactor: move method to model. (references r4057)
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4062 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-05 22:57:20 +00:00
Eric Davis
597266e5a2
Merged r3929 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3979 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:32:36 +00:00
Eric Davis
36ad597b69
Merged r3928 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3978 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:32:31 +00:00
Eric Davis
c67272599c
Merged r3927 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3977 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:32:25 +00:00
Eric Davis
102e845391
Merged r3916 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3966 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:31:18 +00:00
Eric Davis
acaa223cf8
Merged r3907 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3957 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:30:23 +00:00
Eric Davis
8dde6e019d
Merged r3906 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3956 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:30:03 +00:00
Tim Felgentreff
331d98c2d2
fix first version for wiki
2010-08-10 17:09:28 +02:00
Wieland Lindenthal
08a013da44
Minor bug fixes to journalized versions
2010-08-10 16:18:26 +02:00
Jean-Baptiste Barth
e00884bcca
Removed hard-coded english error message on failed Member creation
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3929 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-09 05:10:00 +00:00
Jean-Baptiste Barth
56e3953a71
Removed useless debug code. #5978
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3928 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-08 20:26:33 +00:00
Jean-Baptiste Barth
56a6d86af5
Added project filter when viewing all issues. #5084
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3927 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-08 09:01:25 +00:00
Tim Felgentreff
7d67365e10
smaller fixes for journalized news and attachments
2010-08-06 18:47:56 +02:00
Tim Felgentreff
1f9eda4e0d
update tests to work with the new data model, where neccessary
2010-08-05 19:05:04 +02:00
Jean-Baptiste Barth
0bcde4ab28
Fixed: assigned_to and author filters in cross project issues view should be based on user's project visibility. #5760
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3916 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-04 21:01:56 +00:00
Tim Felgentreff
81e97d23a8
fix document activity url
2010-08-04 19:02:49 +02:00
Tim Felgentreff
47ecf151dd
completely remove acts_as_versioned as it's functionality is contained in acts_as_journalized
...
This makes the wiki just use the versioning provided by acts_as_journalized
2010-08-04 19:01:18 +02:00
Tim Felgentreff
cea1a987ab
fix display of attachments with acts_as_journalized
2010-08-04 18:56:33 +02:00
Eric Davis
16969fdbbb
Show the number of days in the subject line of Reminder emails.
...
i18n check needed.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3907 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-03 16:01:53 +00:00
Eric Davis
13234f8552
Refactor: Add methods to User to edit the encapsulate the status field.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3906 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-03 15:26:50 +00:00
Tim Felgentreff
d34abea14e
use the journal formatters API to register the issue journal formats
2010-07-29 11:30:24 +02:00
Jean-Philippe Lang
52a12aaca8
Merged r3881 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3882 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 10:49:08 +00:00
Jean-Philippe Lang
c47d23a87b
Fixed: Deleting statuses doesn't delete all workflow entries ( #5811 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3881 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 10:48:27 +00:00
Jean-Philippe Lang
ec526c1261
Merged r3873 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3874 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 09:52:07 +00:00
Jean-Philippe Lang
66820dbed3
Strips user email ( #5834 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3873 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 09:50:41 +00:00
Eric Davis
8a1d45ffd6
Merged r3860 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3861 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-24 00:20:35 +00:00
Eric Davis
a628b0f186
Force-clear the default value for migration from :string to :text. #5846 #5771
...
This is a special case for MySQL in Win32.
Contributed by Holger Just.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3860 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-24 00:19:32 +00:00
Tim Felgentreff
4851451017
remove changes from version model
2010-07-23 17:17:00 +02:00
Tim Felgentreff
ff6372ad43
move wiki edits to use journalized plugin. will break if any actual edits are done
2010-07-21 18:25:01 +02:00
Tim Felgentreff
ff31875149
move to STI for journals so the journals themselves can be events
2010-07-21 17:57:45 +02:00
Tim Felgentreff
2ec2405b32
convert more to acts_as_journalized
2010-07-15 21:10:05 +02:00
Tim Felgentreff
2d282f8deb
move (almost) everything over to acts_as_journalized
2010-07-15 18:24:12 +02:00
Tim Felgentreff
4b0bd11f6d
move more journal classes
2010-07-15 18:23:19 +02:00
Tim Felgentreff
aecb868b85
remove more journal specific functionality
2010-07-14 19:00:03 +02:00
Tim Felgentreff
d7768ce600
remove journals to start moving it all out to vestal_versions based plugin
2010-07-14 14:13:55 +02:00
Eric Davis
0d5fca9ba5
Force the default value of path to be set on the Change model class. #5771
...
This is needed because MySQL does not support default values on text columns
(Error introduced in r3828)
Contributed by Holger Just
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3830 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-06 21:06:09 +00:00
Eric Davis
c6201ae15b
Recalculate inherited attributes on parents when a child is moved under a new parent. #5524
...
Contributed by Jean-Baptiste Barth.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3821 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-30 02:45:34 +00:00
Holger Just
f2957176bf
Added helper functions to base journal class
2010-06-29 19:39:28 +02:00
Holger Just
bcbb328cd2
Merge branch 'master' of git://github.com/edavis10/redmine into journals
2010-06-29 19:27:14 +02:00
Eric Davis
672852baaf
Force string comparison for login search to be case sensitive on MySQL. #2473
...
Contributed by Holger Just.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3813 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-24 03:08:20 +00:00
Eric Davis
6cb4ff7d89
Refactor and documentation for User#find_by_login.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3808 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-20 21:40:55 +00:00
Eric Davis
de17640489
Change User#login to be case-insensitive. #2473
...
This change also overrides User#find_by_login to give priority to exact
matches in the login.
Contributed by Greg Mefford
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3807 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-20 21:40:50 +00:00
Eric Davis
4083e7e622
Truncate incoming email subject lines to 255 characters. #5698
...
Contributed by Jan
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3801 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-20 16:22:36 +00:00
Eric Davis
d48eb2de47
Accept email from anonymous users with an empty from address. #5604
...
Contributed by Andrew Fenn
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3783 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-19 19:24:17 +00:00
Eric Davis
f08b2a394d
Unused variable
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3774 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-19 03:54:28 +00:00
Eric Davis
c56c0f411c
Fix a nil error when a Project cannot save attachments.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3772 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-19 03:54:17 +00:00
Holger Just
bc6805a6a6
Initial version of acts_as_journalized
2010-06-18 19:31:21 +02:00
Eric Davis
e94c45d548
Add an "Assigned To" keyword to receiving email. #5594
...
Will take a user's email address, login, or full name.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3764 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-29 00:05:24 +00:00
Eric Davis
080dc2212e
Add 'Start date' and 'End date' keywords for incoming email. #5595
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3763 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-28 23:45:45 +00:00
Eric Davis
1a4b23731f
Include the Project name when sorting versions.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3761 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-27 17:16:15 +00:00
Eric Davis
f3cc84b343
Show subproject versions on the Roadmap.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3760 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-27 17:16:10 +00:00
Eric Davis
908d44519c
Allow AuthSources to control if they allow password changes.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3745 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-23 03:16:37 +00:00
Eric Davis
a1f73c8b20
Remove hard coded LDAP log message.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3743 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-23 03:16:25 +00:00
Jean-Philippe Lang
cbd4af236c
Adds issue relations to individual issue XML ( #5305 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3729 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-01 14:07:36 +00:00
Jean-Philippe Lang
da7c89bfd0
Fixes workflow edit with JRuby ( #5404 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3709 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-30 12:19:51 +00:00
Eric Davis
7ccdaee110
Only copy visible issues.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3698 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-29 23:26:52 +00:00
Eric Davis
657aa624a4
Adding missing setter for Query#available_columns
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3685 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-20 15:42:52 +00:00
Eric Davis
bf33b57aa4
Refactor: Move method to Query model
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3684 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-19 15:08:28 +00:00
Jean-Philippe Lang
0004b52646
Fixes behaviour of move_issues permission for non member role ( #5309 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3683 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-18 12:47:41 +00:00
Jean-Philippe Lang
2c0ce104e7
Fixed: Error on db:migrate with table prefix set ( #5335 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3678 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-17 12:14:52 +00:00
Eric Davis
88db9d0bdc
Replace the hardcoded CustomField::FIELD_FORMATS with a class.
...
Custom Field Formats are now full objects and can be registered with
Redmine::CustomFieldFormat to add new formats.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3672 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-16 15:33:49 +00:00
Jean-Philippe Lang
9ccccb9984
Do not raise an error when destroying a Version with assigned issues.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3668 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-11 17:47:29 +00:00
Jean-Philippe Lang
f35921d308
Fixes Issue#save_issue_with_child_records so that time entry do not get saved if issue save fails.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3664 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-11 16:48:46 +00:00
Jean-Philippe Lang
43e5bb75d2
Fixed: issue optimistic locking broken by r3308 ( #5280 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3663 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-11 16:27:37 +00:00
Jean-Philippe Lang
5163904a3a
Fixed: Update of Subversion changesets broken by r3466 under Solaris ( #5255 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3635 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-11 13:55:30 +00:00
Jean-Philippe Lang
71a4158fd0
Fixes calculation of version estimated hours with subtasks ( #5265 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3633 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-11 13:20:02 +00:00
Jean-Philippe Lang
5879273739
Makes the wiki sidebar editable ( #5208 ).
...
The content of the wiki page named 'Sidebar' is rendered in the sidebar if it exists. Permission to edit protected pages is required to create this page.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3632 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-11 12:56:18 +00:00
Jean-Philippe Lang
4524bc04e9
Issue list improvements for subtasking ( #5196 ):
...
* makes the parent task column available
* display the issue hierarchy when list is sorted by parent
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3618 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-27 16:55:20 +00:00
Jean-Philippe Lang
79b4f68176
Adds an option to enable/disable email notifications during a project copy ( #4672 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3608 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-21 11:17:29 +00:00
Jean-Philippe Lang
5225fb70f5
Optimize retrieval of user's projects members.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3607 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-21 09:28:24 +00:00
Jean-Philippe Lang
e584ae220d
Cleans up status assignment in IssuesController#new handled by Issue#safe_attributes= now.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3606 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-20 17:37:04 +00:00
Eric Davis
6e6e260cea
Refactor: Extract Query#sortable_columns from the controller.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3604 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-19 15:42:03 +00:00
Eric Davis
b5d9a1dfbd
Refactor: Extract method to the Member model
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3601 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-18 15:49:11 +00:00
Jean-Philippe Lang
d550c46160
Makes subtasks rescheduled when a 'precedes' relation is set on a parent task.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3574 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-13 15:29:34 +00:00
Jean-Philippe Lang
8e3d1b694a
Adds subtasking ( #443 ) including:
...
* priority, start/due dates, progress, estimate, spent time roll-up to parent issues
* descendant issues tree displayed on the issue view with context menu support
* issue tree display on the gantt chart
* issue tree copy on project copy
* unlimited nesting
Defining subtasks requires the new permission 'Manage subtasks'.
Subtasks can not belong to a different project than the parent task.
Implementation is based on scoped nested sets for fast reads and updates.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3573 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-13 14:56:49 +00:00
Jean-Philippe Lang
3dc4dbe302
Fixed: error while moving an issue to a project with disabled tracker with SQLite3 ( #5049 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3566 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-12 14:51:33 +00:00
Eric Davis
22c1e2b8cf
Adds named scopes to replace custom finders.
...
* Adds watched_by class method in ActsAsWatchable
* Adds Issue#recently_updated, Issue#with_limit and Issue#on_active_project
#2482
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3557 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-10 05:10:43 +00:00
Eric Davis
3f3e30c2aa
Refactor: Moved the contents of #issue_update into Issue.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3545 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-05 17:11:50 +00:00
Eric Davis
c58dc83e74
Refactor: Replace @journal with @issue.current_journal
...
This removes an instance variable in #issue_update which will let it be moved
to the Issue model.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3540 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-04 16:18:51 +00:00
Eric Davis
976cba0c5d
Refactor: use the existing Issue#new_statuses_allowed_to method.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3533 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-04 00:58:52 +00:00
Jean-Philippe Lang
cdb86d5ef7
Fixed: no email notification on new project/version file added ( #4966 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3532 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-03 21:32:41 +00:00
Eric Davis
fe1e3ccd18
Refactor: Decouple failed attachments and the flash messages
...
Attachment#attach_files will no longer need to return a flash message,
instead it will put unsaved attachments into object#unsaved_attachments
where the calling object can access them.
A utility method #render_attachment_warning_if_needed is included for setting
the standard flash warning.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3528 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-03 17:05:00 +00:00
Eric Davis
0fd7e2d696
Refactor: Moved ApplicationController#attach_files to the Attachment model
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3523 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-02 19:26:03 +00:00
Jean-Philippe Lang
d6c299f57d
Adds 'Blocked by' ( #1755 ) and 'Duplicated by' relation types to the dropdown menu for new relations.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3512 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-28 11:28:32 +00:00
Jean-Philippe Lang
241f79ac06
Fixed: attachments with the same name at the same time overwrite ( #3691 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3511 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-28 11:12:40 +00:00
Jean-Philippe Lang
02cc0efdd7
Fixed: journal details duplicated when an issue is saved twice ( #3690 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3499 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-28 09:21:12 +00:00
Jean-Philippe Lang
d6f9e576e8
Makes AuthSource.authenticate return a hash instead of an array.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3492 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-26 09:13:12 +00:00
Jean-Philippe Lang
aa521c5a5a
User model should not have to clean up LDAP attributes.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3488 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-26 08:29:20 +00:00
Eric Davis
19d4ddf2f2
Fix LDAP on the fly creation. The User object doesn't have a :dn attribute.
...
Fixes #4918 and adds a test for the behavior.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3485 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-25 16:19:55 +00:00
Eric Davis
39c97279ca
Optimize: Only select the name when getting the module names.
...
This has speed up TimelogController#details by 100% with larger databases
(demo.redmine went from 4077ms down to 2085ms).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3484 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-25 04:55:33 +00:00
Jean-Philippe Lang
46ecc488a9
Fixed: projects are referenced by id in search results.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3482 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-24 21:08:08 +00:00
Jean-Philippe Lang
b2dee55e72
Makes project identifiers searchable ( #4897 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3481 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-24 21:05:14 +00:00
Jean-Philippe Lang
e24d6cc223
Bulk edit refactoring.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3478 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-23 21:26:29 +00:00
Eric Davis
f838904a7e
Refactor: Extract Issue#bulk_edit from the IssuesController
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3475 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-23 17:06:08 +00:00
Jean-Philippe Lang
0341ac80eb
Avoid unnecessary SQL queries when loading changesets.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3473 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-21 14:43:45 +00:00
Jean-Philippe Lang
3d393a5711
Memorize commit authors to speed up changesets loading.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3472 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-21 14:42:45 +00:00
Jean-Philippe Lang
46aa855572
Remove invalid utf8 sequences from commit comments and author name ( #4773 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3466 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-20 11:24:41 +00:00
Jean-Philippe Lang
dab0c07fba
Fixed: Links in Forum mails should redirect to message, not topic ( #4884 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3458 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-20 10:07:53 +00:00
Eric Davis
c6b2f1d606
Refactor: Extract #get_user_dn from AuthSourceLdap.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3454 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-19 17:00:49 +00:00
Eric Davis
d828122009
Refactor: extract AuthSourceLdap#search_attributes
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3453 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-19 16:33:01 +00:00
Eric Davis
6f930e9be6
Refactor: Rewrite authenticate_dn to use an implicit return.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3450 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-18 16:55:10 +00:00
Eric Davis
82dd1b2bf2
Refactor: Moved the check for an empty DN to authenticate_dn
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3449 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-18 16:55:05 +00:00
Eric Davis
4f268c5606
Refactor: extract an #authenticate_dn method in AuthSourceLdap
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3441 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-17 16:35:35 +00:00
Eric Davis
b3330d3995
Refactor: Extract method from AuthSourceLdap#authenticate
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3439 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-16 17:03:54 +00:00
Jean-Philippe Lang
2f8cf7f762
Removes duplicated LOC.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3428 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-14 12:45:48 +00:00
Jean-Philippe Lang
a811f67748
Fixed: SystemStackError (stack level too deep) on Issue#attributes= after model reload ( #4838 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3427 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-14 12:43:48 +00:00
Eric Davis
4a67c211ca
Fixed a nil method error in Setting#value=
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3417 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-12 22:08:02 +00:00
Jean-Philippe Lang
541d830d2a
Fixed: Project copy loses wiki pages hierarchy ( #4797 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3412 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-11 19:30:53 +00:00
Jean-Philippe Lang
2c8a24092b
Adds filter for system shared versions on the cross project issue list ( #4792 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3409 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-10 21:42:32 +00:00
Jean-Philippe Lang
d02ddefff4
Fixed: parent project field doesn't include blank value when a member with 'add subproject' permission edits a child project ( #4790 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3405 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-10 20:38:23 +00:00
Jean-Philippe Lang
d04d3f181a
Fixed: Repository.fetch_changesets tries to fetch changesets for archived projects ( #4782 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3402 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-09 18:42:42 +00:00
Jean-Philippe Lang
3c20a9b0ac
Do not parse the entire git log to fetch new commits (takes several minutes for a few thousands commits), but only 1 week before the last known commit ( #4547 , #4716 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3394 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-07 15:17:21 +00:00
Jean-Philippe Lang
8fb29d4d21
Adds pagination to forum messages ( #4664 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3373 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-06 12:54:13 +00:00
Eric Davis
5bd912e9a2
Refactor: Extracted the select_all calls to a new private method.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3365 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-04 17:24:33 +00:00
Eric Davis
155083ec97
Change Role#anonymous and #non_member so they generate the record as needed.
...
While creating tests, it was a common occurrence to lost the builtin roles
because they are only created in the migrations. This makes them behave like
User#anonymous.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3363 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-03 17:47:47 +00:00
Eric Davis
b86b9b898e
Refactor: Moved the raw SQL finders from ReportsController to Issue.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3362 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-03 16:49:21 +00:00
Eric Davis
39c585740d
Refactor: Extract method to create a Change from a Changeset.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3360 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-02 17:02:32 +00:00
Eric Davis
358e3194d7
Refactor: Move recipients method into acts_as_event
...
acts_as_event should be the standard interface to Redmine events, like mail
notifications, so having a standard recipients implementation there makes sense.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3358 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-01 18:57:12 +00:00
Jean-Philippe Lang
d43c860448
Allow commits to reference issues of parent projects and subprojects ( #4674 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3357 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-01-31 16:25:06 +00:00
Jean-Philippe Lang
df46d704e8
Log email delivery errors.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3356 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-01-31 11:41:58 +00:00
Jean-Philippe Lang
a0364deb6a
Log info when sending an email notification.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3355 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-01-31 11:00:40 +00:00
Jean-Philippe Lang
a1a24483b5
Fixed: deleting a project with subprojects breaks the project tree ( #4701 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3354 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-01-31 10:39:42 +00:00
Jean-Philippe Lang
12ea682b66
Fixed: NOT NULL constraint error when adding a group ( #4632 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3343 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-01-30 10:24:23 +00:00
Jean-Philippe Lang
0a05cc2a37
Set a white list of issue attributes that can be mass-assigned from controllers.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3308 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-01-12 20:17:20 +00:00
Jean-Philippe Lang
ff77fb6aa9
Fixed: email notifications may affect language of notices on the UI ( #4086 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3307 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-01-10 14:54:02 +00:00
Jean-Philippe Lang
f6ac12ad9d
Fixed: undefined method `stringify_keys!' error in Issue#attributes_with_tracker_first= with ruby1.9 ( #4540 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3289 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-01-09 10:27:05 +00:00
Jean-Philippe Lang
518779d96d
Fixed: issue summary counts should link to the issue list without subprojects ( #4525 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3283 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-01-07 21:12:16 +00:00
Eric Davis
4b3d4553e4
Create and assign the api token so the current instance can access it. ( #4497 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3265 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-30 00:25:53 +00:00
Jean-Philippe Lang
ff7eb7b23a
Auto-detect attachment content type when blank ( #3782 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3258 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-29 13:28:30 +00:00
Jean-Philippe Lang
04455783a7
Fixed: project copy doesn't copy group memberships ( #3975 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3250 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-26 16:14:55 +00:00
Jean-Philippe Lang
c36c924714
Ask for confirmation when a non-admin users tries to remove himself from a project ( #4402 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3249 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-26 15:46:12 +00:00
Jean-Philippe Lang
a4c64ff84b
Fixed: subject of incoming emails gets mangled ( #3717 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3247 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-26 12:15:12 +00:00
Jean-Philippe Lang
8db9ecef08
Removes column opt in enumerations table.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3240 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-25 17:13:58 +00:00
Eric Davis
9fb40b1a2f
Project#activities should check all overridden activities, not just active ones.
...
Fixes #4084
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3239 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-24 18:25:49 +00:00
Jean-Philippe Lang
62c83bdd2e
Adds a 'Add subprojects' permission.
...
* 'Add project' permission will let user create a root project
* 'Add subprojects' permission will let project members create subprojects
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3238 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-24 16:18:15 +00:00
Jean-Philippe Lang
d63784569f
Force TimeEntry#hours default to nil ( #3075 , #4449 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3232 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-23 20:05:46 +00:00
Jean-Philippe Lang
5e1dc78d75
Fixed: wiki pages in search results are referenced by project number, not by project identifier ( #4456 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3231 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-23 20:01:28 +00:00
Jean-Philippe Lang
0704ac9444
Fixes delimiters regexp.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3229 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-23 19:52:48 +00:00
Jean-Philippe Lang
a54fa93b2e
Adds a setting to remove incoming emails body after a delimiter ( #4409 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3226 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-23 18:35:19 +00:00
Eric Davis
aa9951b38b
Added an API token for each User to use when making API requests. ( #3920 )
...
The API key will be displayed on My Account page with a link to reset or
generate a new one. All existing users will have a token generated by the
migration.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3217 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-23 06:27:28 +00:00
Eric Davis
6be0e335fb
Added an optimization note for later.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3207 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-20 19:13:27 +00:00
Jean-Philippe Lang
06ca18b042
Adds a 'no_permission_check' option to the MailHandler.
...
Used with the 'project' option, it allows anyone to submit emails to a private inbox project (#4407 ).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3195 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-19 14:08:48 +00:00
Jean-Philippe Lang
03b57415d6
Avoid a ruby warning.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3192 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-19 12:16:45 +00:00
Jean-Philippe Lang
77aeca5d55
Fixes 'follows' relation validation.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3191 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-18 20:59:30 +00:00
Jean-Philippe Lang
beb20e7c6e
Adds 'follows' relation ( #1432 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3190 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-18 20:35:16 +00:00
Jean-Philippe Lang
6bf0723d06
By default, only show statuses that are used by the tracker on the workflow edit view.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3188 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-18 15:41:32 +00:00
Jean-Philippe Lang
bb477a3a0f
Make sure users don't get notified for thing they can not view ( #3589 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3169 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-13 14:26:54 +00:00
Jean-Philippe Lang
6610bb6b6c
Moves watchers filtering logic to ActsAsWatchable.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3168 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-13 13:06:57 +00:00
Jean-Philippe Lang
f33231181f
Makes user unwatch what he can no longer view after its permissions have changed ( #3589 ).
...
A rake task (redmine:watchers:prune) is also added to prune existing watchers.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3167 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-13 12:39:22 +00:00
Eric Davis
17512e7efd
Copy issue relations when copying a project. ( #3367 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3164 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-13 03:37:21 +00:00
Jean-Philippe Lang
21b52d2fd9
Display users then groups on project memberships view ( #4389 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3161 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-12 11:20:26 +00:00
Jean-Philippe Lang
1f47d5856e
Issue#done_ratio should not break if status is nil.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3159 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-12 11:02:53 +00:00
Jean-Philippe Lang
008f35277e
Retrieve root_url if needed ( #4377 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3158 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-12 10:35:16 +00:00
Jean-Philippe Lang
d905f2ce7e
Allow blank value for IssueStatus#default_done_ratio.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3157 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-12 10:33:12 +00:00
Jean-Philippe Lang
5c6ce51ec9
Adds workflow copy functionality ( #1727 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3154 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-12 10:06:07 +00:00
Eric Davis
ddeaf9da96
Refactor conditions.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3153 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-12 06:18:45 +00:00
Eric Davis
7959101288
Search mail addresses in Principal#like
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3152 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-12 06:18:40 +00:00
Eric Davis
4fe14e71c2
Adds a Setting to control how an Issue's done_ratio is calculated:
...
* Issue field (default) - the done_ratio field for the Issue
* Issue status - uses the Issue Status's value
#4274
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3151 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-11 18:48:34 +00:00
Jean-Philippe Lang
f2520385e4
Fixes tracker_id and custom_field_values assignment order for issues ( #4353 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3139 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-09 09:12:29 +00:00
Jean-Philippe Lang
1de2a0b7c7
Ignore subversion root_url case when extracting relative url.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3138 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-09 08:39:51 +00:00
Jean-Philippe Lang
0fe389b841
Optimize updates of issue's shared versions.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3137 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-08 20:47:52 +00:00
Jean-Philippe Lang
8f85ba79bc
No need to update issues from the version's project.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3136 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-08 16:25:27 +00:00
Jean-Philippe Lang
40e2af7ab9
Optimize issue updates when a version sharing changes.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3135 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-08 16:22:21 +00:00
Jean-Philippe Lang
517a87f8c5
Fixed: Subversion#latest_changesets ignores revision argument ( #4360 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3134 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-08 16:06:22 +00:00
Jean-Philippe Lang
5266e328c0
Fixes Project#shared_versions for descendants sharing ( #465 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3130 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-07 19:28:47 +00:00
Jean-Philippe Lang
5f8e9d7118
Version sharing ( #465 ) + optional inclusion of subprojects in the roadmap view ( #2666 ).
...
Each version of a project can be shared with:
* subprojects
* projects in the project hierarchy: ancestors + descendants (needs versions management permission on the root project)
* projects in the project tree: root project + all its descendants (same as above)
* all projects (can be set by admin users only)
Notes:
* when sharing a version of a private project with others projects, its name will be visible within the other projects
* a project with versions used by non descendant projects can not be archived
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3123 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-06 10:28:20 +00:00
Eric Davis
e178123569
Enhanced the Issue Bulk Copy feature:
...
* Add a Copy option to the Context menu for multiple issues.
* Added assigned to, status, start and due date options to the move/copy form.
* Allow Issue#move_to to change attributes on the moved/copied issue.
#4117
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3122 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-04 22:46:12 +00:00
Jean-Philippe Lang
c870a7b9ef
Do not notify users that are no longer allowed to view an issue ( #3589 , #4263 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3121 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-03 21:28:14 +00:00
Jean-Philippe Lang
346c569f98
Fixed: "None" category issue count is empty while grouping by category ( #4308 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3112 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-02 18:57:17 +00:00
Jean-Philippe Lang
25e131f176
Remove duplicate validation.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3110 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-29 20:05:15 +00:00
Jean-Philippe Lang
88fcf484d4
Enable tracker update on issue edit form ( #2405 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3108 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-29 19:46:40 +00:00
Jean-Philippe Lang
66540afc08
Adds dynamic columns selection on the issue list ( #4272 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3105 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-28 11:34:12 +00:00
Jean-Philippe Lang
99b52c8796
Rescue invalid query statement error with an error message.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3104 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-28 10:29:48 +00:00
Jean-Philippe Lang
915bbcfaff
Move issues, journals, versions queries from IssuesController to Query model.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3103 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-28 10:08:29 +00:00
Jean-Philippe Lang
4af8765f15
Reverts r3072 ( #4302 : error raised when sorting on an association not included as column).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3097 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-27 19:59:10 +00:00
Jean-Philippe Lang
43fd27fd0c
Show last update datetime (last attachment added) on document list ( #4232 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3095 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-26 20:12:20 +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
d73fb1fab8
Load roles when loading project members.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3078 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-20 13:08:17 +00:00
Jean-Philippe Lang
c9bfdc009b
Avoid useless database queries.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3077 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-20 12:57:52 +00:00
Jean-Philippe Lang
3fc655904f
Copy issue status on project copy ( #3877 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3075 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-16 20:06:37 +00:00
Jean-Philippe Lang
d84bd8edd8
Optimize associations loading on the issue list.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3072 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-16 18:28:44 +00:00
Jean-Philippe Lang
71bc44a89d
Allow issue grouping by custom field ( #2679 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3071 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-16 18:07:30 +00:00
Jean-Philippe Lang
ba7cf9c3ce
Adds custom fields for versions ( #4219 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3064 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-15 15:22:55 +00:00
Jean-Philippe Lang
6838677e30
Remove dead code.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3061 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-15 13:43:44 +00:00
Jean-Philippe Lang
534ce51154
Allow non admin users to add subprojects ( #2963 ).
...
Subprojects can be added to the projects for which the user has add_project permission.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3059 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-15 13:22:08 +00:00
Jean-Philippe Lang
28f0b5ce4a
Fixed: Project#enabled_module_names= does not test if a module is already enabled ( #4200 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3036 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-13 17:50:21 +00:00
Jean-Philippe Lang
8267ded518
Allow [#id] as subject to reply by email ( #3653 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3031 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-11 22:30:02 +00:00
Jean-Philippe Lang
c31411ec00
Fixes ApplicationHelper#link_to_user
...
* No link to a locked user page (closes #4182 )
* Translate Anonymous string
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3024 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-11 10:48:54 +00:00
Jean-Philippe Lang
8f40750ad7
Adds a link to automatically close completed versions in project settings ( #1245 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3023 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-09 18:53:12 +00:00
Jean-Philippe Lang
cc684803ba
Ignore emails received from the application emission address to avoid hell cycles ( #4139 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3022 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-08 13:51:53 +00:00
Jean-Philippe Lang
d201c54455
Adds version status to limit issue assignments ( #1245 ).
...
Available version statuses are:
* open: no restriction
* locked: can not assign new issues to the version
* closed: can not assign new issues and can not reopen assigned issues
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3020 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-08 13:03:41 +00:00
Jean-Philippe Lang
6245f49934
Fixed: Pre-filled time tracking date ignores timezone ( #4160 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3012 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-06 19:41:03 +00:00
Jean-Philippe Lang
6fedbf60d5
Allow project forums copy.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2976 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 11:23:46 +00:00
Jean-Philippe Lang
a18676b669
Prevent mass-assignment warnings.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2973 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 10:51:21 +00:00
Jean-Philippe Lang
4e73685af7
Reset timestamps and wiki page hierarchy on project copy.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2972 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 10:44:03 +00:00
Jean-Philippe Lang
875eb47ad1
Prevent mass-assignment warnings.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2971 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 10:35:59 +00:00
Jean-Philippe Lang
2e675342cb
Removes debug message.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2970 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 10:31:01 +00:00
Jean-Philippe Lang
a9fb11c0f5
Fixes project wiki copy.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2969 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 10:30:39 +00:00
Jean-Philippe Lang
9f12a14382
Wiki auto creation temporary disabled until project wiki copy is fixed (2 wikis created).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2967 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-24 16:12:13 +00:00
Jean-Philippe Lang
5b787785b4
Project copy: let the user choose what to copy from the source project (everything by default).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2966 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-24 13:30:23 +00:00
Jean-Philippe Lang
de8dcc5b26
Sets proper content type for plain text mails ( #3970 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2961 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-24 11:57:01 +00:00
Eric Davis
ff3d0fe4db
Fixed some merge bugs. #4077
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2952 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 22:35:03 +00:00
Eric Davis
37d401ac58
When a specific TimeEntryActivity are change, associated TimeEntries will be
...
re-assigned to the correct record.
* Renamed build to create since the methods now create objects.
* Removed call to Project#save that isn't needed since objects are saved directly now.
* Wrapped the activity creation and updates in a SQL transaction so TimeEntries
will remain in a consistent state if there is an error.
* When a Project's TimeEntryActivities are destroyed, they are now
reassigned to the parent TimeEntryActivity.
#4077
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2950 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 22:34:52 +00:00
Eric Davis
5833ba9f81
Added a Activities tab to Project Settings
...
* Changed Project#activities to allow getting inactive Activities also:
* Changed the Enumeration#all named_scope to exclude project specific Activities
* Changed the Project has_many time_entry_activities to include all by default
and provided an #active method to filter them to active ones only
* Split Project#activities to two methods and gave it a parameter that is used
to determine if inactive activities are included (default is no)
* Added a reset button to delete all project specific activities.
* Added ProjectsController#reset_activities to remove the project
specific activities
* Added a HTTP DELETE route for reset_activities
* Changed the permissions for managing project activities to have access to the
ProjectsController#reset_activities action
* Added a way to bulk save Project specific Activities in ProjectsController
* #save_activities will save all the changed activities, including update the
existing records
* Added helper methods to the controller which will be refactored later
* Allow the same TimeEntryActivity names on different projects
#4077
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2949 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 22:34:45 +00:00
Eric Davis
e615266e9a
Changed the Timelogs to use both the Systemwide and Project specific TimeEntryActivities
...
* Added Project#activities to return all the Systemwide and Project specific
activities, excluding Systemwide ones that are overridden.
* Added some tests for TimelogHelper.
#4077
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2948 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 22:34:39 +00:00
Eric Davis
29301c8a38
Added project specific Enumeration overrides.
...
These will be used to track if Enumeration's custom data or active state
is overridden on a project. An overridden Enumeration is one that is associated
with a parent Enumeration.
#4077
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2947 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 22:34:34 +00:00
Eric Davis
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
Eric Davis
ac4937a767
Enumerations can now have custom fields defined on them. #4077
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2945 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 22:34:22 +00:00
Eric Davis
d40756d611
Renamed Project#public named_scope so it will not override Ruby's public method
...
#4056
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2941 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 03:21:31 +00:00
Eric Davis
a150689be9
Improved Project#copy to copy more data from the source Project. #3367
...
* Versions
* Associate the copied issues with the new versions
* Wiki
* WikiPages
* WikiContents
* IssueCategories
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2934 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-19 00:07:37 +00:00
Eric Davis
6531c3f887
Preselect the issue custom fields from the source project when copying. #4045
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2933 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-19 00:07:32 +00:00
Jean-Philippe Lang
d8ba5c2a06
Fixes MailHandler for ruby1.9.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2915 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-10 15:25:34 +00:00
Jean-Philippe Lang
4e811bebd1
Fixes Repository#find_changeset_by_name with PostgreSQL ( #3937 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2903 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-02 14:49:38 +00:00
Jean-Philippe Lang
30ad78e57d
Fixed: RepositoriesController#revision may show wrong revision ( #3779 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2898 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-09-20 15:20:22 +00:00
Jean-Philippe Lang
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
Eric Davis
7b0cb6aba8
Upgraded to Rails 2.3.4 ( #3597 )
...
* Ran the Rails upgrade
* Upgraded to Rails Engines 2.3.2
* Added a plugin to let Engines override application views.
* Converted tests to use the new classes:
** ActionController::TestCase for functional
** ActiveSupport::TestCase for units
* Converted ActiveRecord::Error message to a string.
* ActiveRecord grouping returns an ordered hash which doesn't have #sort!
* Updated the I18n storage_units format.
* Added some default initializers from a fresh rails app
* Changed the order of check_box_tags and hidden_field_tags. The hidden tag
needs to appear first in Rails 2.3, otherwise it will override any value in
the check_box_tag.
* Removed the custom handler for when the cookie store is tampered with.
Rails 2.3 removed the TamperedWithCookie exception and instead Rails will not
load the data from it when it's been tampered with (e.g. no user login).
* Fixed mail layouts, 2.3 has problems with implicit multipart emails that
use layouts. Also removed some custom Redmine mailer code.
* Fixed a bug that occurred in tests where the "required" span tag would be
added to the :field_status translation. This resulted in an email string of:
<li>Status<span class="required"> *</span><span class="required"> *</span>
Instead of:
<li>Status: New</li>
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2887 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-09-13 17:14:35 +00:00
Jean-Philippe Lang
041277235b
Slight change to the visibility SQL statement.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2878 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-09-12 11:22:42 +00:00
Jean-Philippe Lang
8faa66f68f
Adds spent time to the activity view ( #3809 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2877 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-09-12 10:37:49 +00:00
Jean-Philippe Lang
275b555b09
Email handler: set a default issue subject if the email subject is blank ( #3850 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2873 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-09-12 09:33:22 +00:00
Jean-Philippe Lang
7707457145
User groups branch merged.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2869 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-09-12 08:36:46 +00:00
Eric Davis
609faba6a3
Allow referencing issue numbers in brackets. This style is used by other
...
bug trackers.
Examples:
* "[#nnn] Worked on this issue"
* "[#nnn, #mmm] Worked on these"
* "[#nnn #mmm] Working some more"
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2854 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-09-03 01:21:11 +00:00
Jean-Philippe Lang
e10577e9ed
SCM:
...
* Fixes file log for non-Git repositories (Repository#latest_changesets ignores path argument)
* No longer used Repository#changesets_for_path method removed
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2844 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-08-17 16:32:24 +00:00
Jean-Philippe Lang
6fb80efdae
Fixes argument in Repository#latest_changesets.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2842 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-08-17 14:12:51 +00:00
Eric Davis
c28b044d68
Added branch and tag support to the git repository viewer. ( #1406 )
...
Many thanks to Adam Soltys and everyone else who tested this patch.
* Updated git test repository so it has a branch with some differences from the master branch
* Moved redmine diff class into a module so as not to clash with diff-lcs gem which is required by grit
* Find changesets from all branches, not just master
* Got revision browsing working
* Got file actions working properly
* Allow browsing by short form of commit identifier
* Added a method to retrieve repository branches
* Allow browsing by branch names as well as commit numbers
* Handle the case where a git repository has no master branch
* Expand revision box and handle finding revisions by first 8 characters
* Added branches dropdown to repository show page
* Combined repository browse and show into a single action. Moved branch/revision navigation into a partial.
* Renamed partial navigation -> breadcrumbs
* Made it so latest revisions list uses branch and path context
* Preserve current path when changing branch or revision
* Perform slightly more graceful error handling in the case of invalid repository URLs
* Allow branch names to contain periods
* Allow dashes in branch names
* Sort branches by name
* Adding tags dropdown
* Need to disable both branches and tags dropdowns before submitting revision form
* Support underscores in revision (branch/tag) names
* Making file history sensitive to current branch/tag/revision, adding common navigation to changes page
* Updated translation files to include labels for 'branch', 'tag', and 'view all revisions'
* Reenable fields after submit so they don't look disabled and don't stay disabled on browser back button
* Instead of dashes just use empty string for default dropdown value
* Individual entry views now sport the upgraded revision navigation
* Don't display dropdowns with no entries
* Consider all revisions when doing initial load
* Fixed bug grabbing changesets. Thanks to Bernhard Furtmueller for catching.
* Always check the entire log to find new revisions, rather than trying to go forward from the latest known one
* Added some cleverness to avoid selecting the whole changesets table any time someone views the repository root
* File copies and renames being detected properly
* Return gracefully if no revisions are found in the git log
* Applied patch from Babar Le Lapin to improve Windows compatibility
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2840 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-08-15 22:41:40 +00:00
Eric Davis
9886827a66
Allow spaces between the keyword and colon in incoming mail. ( #3731 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2837 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-08-12 23:26:32 +00:00
Eric Davis
9ed048dc42
Include the issue status in search results and the Activity page. ( #3700 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2834 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-08-02 04:36:06 +00:00
Jean-Philippe Lang
36d8f35192
Prevent creation of project with identifier 'new' ( #3602 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2821 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-07-18 08:06:51 +00:00
Jean-Philippe Lang
6994d1c23b
Actually block issues from closing when a blocking issue isn't closed ( #1740 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2800 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-07-04 12:07:03 +00:00
Jean-Philippe Lang
a7bb63a182
Fixed: case sensitivity in issue subject filtering ( #3536 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2796 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-06-28 12:12:27 +00:00
Jean-Philippe Lang
b3afde14fa
Ability to accept incoming emails from unknown users ( #2230 , #3003 ).
...
An option lets you specify how to handle emails from unknown users:
* ignore: the email is ignored (previous and default behaviour)
* accept: the sender is considered as an anonymous user
* create: a user account is created (username/password are sent back to the user)
Permissions have to be consistent with the chosen option. Eg. if you choose 'create', the 'Non member' role must have the 'Add issues' permission so that an issue can be created by an unknown user via email. If you choose 'accept', the 'Anonymous' role must have this permission.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2789 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-06-14 14:48:34 +00:00
Jean-Philippe Lang
7642b5a9ab
Fixed: editing a message may cause sticky attribute to be NULL ( #3356 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2787 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-06-14 09:19:20 +00:00
Jean-Philippe Lang
6da0542af4
Delete previous tokens when creating a new one.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2778 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-06-02 17:24:50 +00:00
Eric Davis
62e58f26b0
Changed Enumerations to use a Single Table Inheritance
...
* Added migrations to change Enumerations to an STI relationship
* Added TimeEntryActivity model (STI)
* Added DocumentCategory model (STI)
* Added IssuePriority model (STI)
* Added Enumeration#get_subclasses to get a list of the subclasses of Enumeration
* Changed Enumeration to use the STI type field instead of the opt field
* Changed Enumeration#opt to return the old opt values but with a deprecation warning.
* Removed Enumeration::OPTIONS
* Removed the dynamic named_scopes in favor of specific named_scopes. Kept for
compatibility reasons.
* Added Enumeration#default so each subclass can easily find it's default record.
* Fixed Enumeration#default to use the STI scoping with a fake default scope for finding Enumeration's default.
* Added a 'all' named scope for getting all records in order by position.
* Added Deprecation warnings to the old named_scopes in Enumerations.
* Moved various methods off of Enumeration and onto the concrete classes
* Changed the EnumerationsController to use types
* Updated the Enumeration list template
* Added has_many relationships to the Enumeration STI classes.
* Fixes for tests.
#3007
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2777 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-30 23:30:36 +00:00
Eric Davis
ea7ff8dd76
Added hook, :model_changeset_scan_commit_for_issue_ids_pre_issue_update. #3279
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2773 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-30 22:34:27 +00:00
Jean-Philippe Lang
85ce903cfa
Ability to watch a wiki or a single wiki page ( #413 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2765 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-25 19:02:28 +00:00
Jean-Philippe Lang
bd42b7cd9e
Validate project identifier only when changed ( #3352 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2762 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-25 18:01:27 +00:00
Jean-Philippe Lang
fe8f4e5b87
Fixes code comments.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2756 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-17 15:32:48 +00:00
Jean-Philippe Lang
52b5b29203
Adds a setting to choose which role is given to a non-admin user who creates a project ( #1007 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2754 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-17 14:35:00 +00:00
Jean-Philippe Lang
8141110eb2
Ability to allow non-admin users to create projects ( #1007 ).
...
This can be enabled in permissions settings. A non-admin user who creates a project is automatically added as a project member (the first role is given, TODO: make this given role configurable).
Projects can be added from the public projects list.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2750 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-17 12:59:14 +00:00
Jean-Philippe Lang
9c9dc6e814
Adds email notification on wiki changes ( #413 ). It's disabled by default and can be enabled in application settings.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2749 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-17 09:55:13 +00:00
Jean-Philippe Lang
e9a6730f4a
Ability to use any custom field as a cross-project custom query column ( #3321 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2743 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-13 17:32:15 +00:00
Jean-Philippe Lang
b87753c90d
Do not autologin if more that one token is found ( #3351 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2742 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-13 16:56:31 +00:00
Jean-Philippe Lang
f5eb1be268
Add token value uniqueness validation ( #3351 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2741 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-13 16:55:15 +00:00
Jean-Philippe Lang
3e52383988
Use ActiveSupport::SecureRandom to generate tokens ( #3351 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2740 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-13 16:54:32 +00:00
Jean-Philippe Lang
da2854cf75
Display all users roles on project overview ( #3339 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2734 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-12 19:04:52 +00:00
Jean-Philippe Lang
88532b6817
Fixes project members copy with multiple roles.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2728 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-10 11:17:23 +00:00
Jean-Philippe Lang
682c5d1113
Follows r2720 ( #3308 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2727 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-10 11:06:29 +00:00
Jean-Philippe Lang
7dccf9fda6
Allows multiple roles on the same project ( #706 ). Prerequisite for user groups feature.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2726 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-10 10:54:31 +00:00