859bfa625d
Merge branch 'master' of git://github.com/edavis10/redmine into master-journalized
...
Conflicts:
app/models/wiki_content.rb
app/views/wiki/history.rhtml
config/locales/bg.yml
config/locales/ca.yml
config/locales/de.yml
test/integration/api_test/projects_test.rb
2010-11-03 16:03:39 +01:00
c514dd6885
Refactor: convert WikiController to a REST resource
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4303 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-28 21:25:38 +00:00
e9efa5b981
Refactor: use :id instead of :page when linking to Wiki Pages
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4296 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-27 16:27:06 +00:00
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
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
2589bec48b
Removes duplicate helper introduced in r4072.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4269 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-22 14:49:46 +00:00
c259ada6e1
Refactor: rename WikiController#index to #show, it's a single resource action
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4266 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-21 16:07:28 +00:00
d3381fb518
Refactor: change :id on WikiController to use :project_id
...
Using :id to track projects on non-project controllers is confusing and
makes routing with resources difficult.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4265 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-20 21:26:30 +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
09331ec432
Turn on ssl Gravatars for all SSL requests. #5929
...
Contributed by Felix Schäfer
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4103 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-20 02:55:14 +00:00
0d967c0572
Fix links to activity pages broken with r4047. #6392
...
Contributed by Felix Schafer
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4092 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-16 21:26:30 +00: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
c8c4fb130c
Merged r4014 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4026 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 19:49:31 +00:00
05527be943
Add RTL support to the context menu. #6012
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4014 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 19:12:21 +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
b02463184a
Merged r3911 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3961 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:30:48 +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
a544a1e57c
Added css classes to the HTML body based on the theme, controller, and action. #819
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3911 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-04 01:17:45 +00:00
9af4cb5c38
Merged r3899 from trunk
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3902 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-30 19:20:56 +00:00
ca663fcd10
Use image_path for the favicon instead to pick up asset hosts. #3301
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3899 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-30 19:18:33 +00:00
677fee310a
Merged r3894 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3896 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-29 15:03:11 +00:00
5f20bc240e
Add a favicon link with support for suburi. #3301
...
Contributed by Yuki Kita and Christian Boenning
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3894 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-29 14:58:33 +00:00
4dd4300147
Adds text formatting to documents index ( #202 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3602 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-18 20:02:17 +00:00
f741ca7269
Adds an helper for displaying the 'checked' image.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3600 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-17 20:46: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
a179f261cd
Extract parsing of inline attachments, wiki links and redmine links.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3588 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-15 19:37:01 +00:00
c03b4c2e1e
Extract CodeRay calls to Redmine::SyntaxHighlighting ( #2985 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3584 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-14 12:57:08 +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
bd5fe10c13
Adds an helper for creating the context menu.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3542 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-04 19:02:57 +00:00
3c0c0a7677
Allow multiple selected projects in #project_tree_options_for_select
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3525 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-03 03:37:40 +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
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
2ad8242ae7
Adds a setting to cache textile rendering (off by default).
...
* it uses ActionController cache store which is MemoryStore by default and can be configured with config.action_controller.cache_store
* macro processing was moved out of textile rendering so that it doesn't get cached
* no noticeable improvement is expected for small portions of text, so only texts larger than 2KB are cached
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3372 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-06 10:40:21 +00:00
b718d5dec2
Moves attachments parsing after textile parsing so that:
...
* attachments parsing does not rely on textile syntax
* textile output can be cached (#4482 )
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3253 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-27 10:52:02 +00:00
9f59cd64ab
Added the revision title to any revision links.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3216 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-22 23:23:54 +00:00
c31a671973
Added a setting to configure the day that week start on (Monday or Sunday). ( #4363 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3166 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-13 04:06:55 +00:00
d58762a52d
Roadmap: sort issues by project and prepend project name if different ( #4373 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3163 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-12 15:33:31 +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
4bdfef4dc4
Fixed roadmap progress display error ( #4255 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3082 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-21 10:50:36 +00:00
ec4ba23248
Add a setting to pick alternative Gravatar images. #2734
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3076 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-17 03:10:49 +00:00
bc37fcee74
Clean up ticket auto links.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3041 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-14 12:59:32 +00:00
cbeeaa4d4d
Refactoring ApplicationHelper#link_to_issue.
...
Now displays issue subject by default.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3040 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-14 12:53:50 +00:00
dfd0204052
Add view_issues permission ( #3187 ).
...
A migration adds this permission to all existing roles to preserve current behaviour.
This permission controls access to issues, roadmap and changelog.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3039 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-14 12:08:47 +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
b2a55bda0c
Sort the list of users to add to a group or project ( #4150 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3004 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-04 11:17:55 +00:00
Tim Felgentreff
Eric Davis
Jean-Philippe Lang
Jean-Baptiste Barth