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
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
d642964035
Fixed: auto links ending with right angle bracket shouldn't include the bracket in the URL. #5652
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4287 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-23 22:35:02 +00:00
5823a71c18
Revert part of r4064.
...
Having link_to_if_authorized support urls has too many edge cases and isn't
working with sub-uris. #6195 #6513
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4257 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-15 23:11:00 +00:00
68ae2d0dfd
change issue specific journal query and show_details for journal helper
2010-09-15 12:56:33 +02:00
09ccc0f6ba
remove test helper method
2010-09-14 15:21:15 +02:00
72e7baafdf
fix various tests in mailer, wiki content and issue helper
2010-09-14 14:25:19 +02:00
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
d771fa9289
Change link_to_if_authorized to allow url paths. ( Fixes #6195 )
...
Both url paths (/issues/1234) and params hashes (:controller => 'issues')
are now supported by link_to_if_authorized. The authorize_for method
requires a controller/action pair so urls need to be parsed against the
routes to find their controller/action.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4064 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-06 00:26:08 +00:00
563c879e44
Use the built in Rails ActionView::TestCase for testing helpers.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4063 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-06 00:26:02 +00:00
fab5064643
Merged r3936 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3986 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:33:18 +00:00
c7e719fc4b
Merged r3924 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3974 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:32:06 +00:00
ff43bb1a74
Refactor: Extract a new IssueMovesController from IssuesController.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3936 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-11 14:42:10 +00:00
a1b607480a
Refactor: added link_to_project helper to handle links to projects
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3924 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-08 07:07:20 +00:00
6eea3300f8
Sanitize image links and handle nils in the toc formatter. #5445
...
Based on contribution by Yuki Kita.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3811 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-24 02:35:24 +00:00
b53de502ab
Display the link name when external links are used in the toc macro. #5445
...
Contributed by Yuki Kita and Jean-Baptiste Barth
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3786 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-19 21:39:21 +00:00
c499d2d150
Fixes broken test.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3622 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-28 14:52:33 +00:00
8cdcf308be
Escape href attribute in auto links ( #5179 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3612 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-24 20:26:22 +00:00
0e0b8e0799
Accept issue links inside brackets ( #4418 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3598 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-17 19:57:32 +00:00
6b88de1234
Close unclosed pre/code tags ( #4265 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3590 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-15 19:57:35 +00:00
7203196212
Do not parse redmine links inside pre/code tags ( #1288 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3589 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-15 19:54:50 +00:00
838f3195e7
Fixed closing tags in syntax highlighting tests.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3587 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-15 19:33:05 +00:00
ad487bf7cc
Replace the hardcoded "CodeRay" css class name for highlighted elements.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3585 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-14 13:22:50 +00:00
2f5c17a0f6
Optimization: load attachments when needed.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3581 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-14 08:33:53 +00:00
1a73f8fa0f
Added unit tests for IssuesHelper#show_detail
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3552 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-08 16:47:47 +00:00
d18fba4ffe
Fixed: Pound (#) followed by number with leading zero (0) removes leading zero when rendered in wiki ( #4872 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3451 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-18 18:53:30 +00:00
3168ee3d47
Adds projects links ( #4812 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3422 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-13 10:32:06 +00:00
3918374d5c
Add test for #4354 .
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3142 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-09 10:31:17 +00:00
b090098952
Fixed: Bulk edit of issues throws 500 if no versions are defined on the project ( #4366 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3140 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-09 09:22:16 +00:00
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
b2e4d8ad3f
Fixed some tests that where looking for specific issue urls but weren't matching
...
the css classes for the link.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3049 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-14 19:40:56 +00:00
1d8b4ee778
Fixed pre tags containing "<pre*" ( #4125 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3030 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-11 16:23:11 +00:00
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
86a9d90f07
Fixes distance of date in words calculation.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3016 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-07 09:50:16 +00:00
9943f64ff0
Fixed: inline images in wiki headings ( #4112 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2999 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-04 10:22:57 +00:00
9233a07a23
Adds a test for attached image inside a link ( #4033 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2962 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-24 12:19:22 +00:00
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
38dc4d1cf9
Sets file encoding to utf-8 for ruby 1.9.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2910 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-10 15:00:28 +00:00
21e18c1eb4
Adds missing native eol properties.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2895 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-09-20 14:06:57 +00:00
cd1e094ce8
Missing 'test_' prefix on a helper test caused it to not run.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2853 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-09-03 01:03:10 +00:00
dcba9f18e6
Allow line breaks in wiki table cells ( #2346 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2824 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-07-19 14:23:15 +00:00
bf0ddc2886
Fixes artefacts in truncated search results ( #3622 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2822 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-07-18 09:46:20 +00:00
da22a9c8d6
Do not require a non-word character after a comma in Redmine links ( #3561 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2804 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-07-04 12:48:25 +00:00
6bb5508387
Less aggressive textile image tag parsing ( #3209 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2677 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-04-21 12:49:16 +00:00
a6acc77904
Add test for r2664 ( #3127 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2665 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-04-07 17:38:52 +00:00
adbe164246
Fixing tests (sort refactoring).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2577 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-03-12 18:43:19 +00:00
2b585407cb
SortHelper refactoring:
...
* multiple columns sort feature (#2871 )
* CSS classes instead of an image tag to reflect the state of the column
* examples fixed (#2945 )
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2571 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-03-10 21:11:36 +00:00
b78349d2ca
Fixed: Undefined Method (l_YesNo) Being Called ( #2867 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2541 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-03-01 10:00:52 +00:00
fe28193e4e
Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2493 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-02-21 11:04:50 +00:00
70efee1bc5
Leave wiki links untouched if target project doesn't exist or have no wiki.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2436 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-02-10 22:54:22 +00:00
Tim Felgentreff
Jean-Baptiste Barth
Eric Davis
Jean-Philippe Lang