kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into release-v2.0.0 

Conflicts:
	doc/CHANGELOG.rdoc
	lib/redmine/version.rb
This commit is contained in:
Eric Davis 2011-07-01 21:46:38 -07:00
parent 2fab2de517 39be3ac130
commit 30bcd6c66b
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/wiki/show.rhtml
View File

@ -49,6 +49,7 @@
<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
<%= f.link_to 'HTML', :url => {:id => @page.title, :version => @content.version} %>
<%= f.link_to 'TXT', :url => {:id => @page.title, :version => @content.version} %>
<%= call_hook(:view_wiki_show_other_formats, {:link_builder => f, :url_params => {:id => @page.title, :version => @content.version}}) %>
<% end if User.current.allowed_to?(:export_wiki_pages, @project) %>
<% content_for :header_tags do %>

5
doc/CHANGELOG.rdoc
View File

@ -83,6 +83,11 @@
** Patch #7598: Extensible MailHandler
** Patch #7795: Internal server error at journals#index with custom fields
== 2011-06-27 v1.5.0
* Bug #490: XSS in app/views/auth_sources/index.html.erb
* Feature #488: Hook for additional formats on Wiki#show page
== 2011-05-27 v1.4.0
* Bug #81: Replace favicon