Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
OHR Support
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
97
Issues
97
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
OHR Support
Commits
c8a6f804
Commit
c8a6f804
authored
Jun 27, 2011
by
Eric Davis
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release-v1.5.0' into stable
parents
aae1abde
967d0e6b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
5 deletions
+11
-5
index.html.erb
app/views/auth_sources/index.html.erb
+4
-4
show.rhtml
app/views/wiki/show.rhtml
+1
-0
CHANGELOG.rdoc
doc/CHANGELOG.rdoc
+5
-0
version.rb
lib/redmine/version.rb
+1
-1
No files found.
app/views/auth_sources/index.html.erb
View file @
c8a6f804
...
...
@@ -15,10 +15,10 @@
<tbody>
<%
for
source
in
@auth_sources
%>
<tr
class=
"
<%=
cycle
(
"odd"
,
"even"
)
%>
"
>
<td>
<%=
link_to
source
.
name
,
:action
=>
'edit'
,
:id
=>
source
%>
</td>
<td
align=
"center"
>
<%=
source
.
auth_method_name
%>
</td>
<td
align=
"center"
>
<%=
source
.
host
%>
</td>
<td
align=
"center"
>
<%=
source
.
users
.
count
%>
</td>
<td>
<%=
link_to
(
h
(
source
.
name
),
:action
=>
'edit'
,
:id
=>
source
)
%>
</td>
<td
align=
"center"
>
<%=
h
source
.
auth_method_name
%>
</td>
<td
align=
"center"
>
<%=
h
source
.
host
%>
</td>
<td
align=
"center"
>
<%=
h
source
.
users
.
count
%>
</td>
<td
class=
"buttons"
>
<%=
link_to
l
(
:button_test
),
:action
=>
'test_connection'
,
:id
=>
source
%>
<%=
link_to
l
(
:button_delete
),
{
:action
=>
'destroy'
,
:id
=>
source
},
...
...
app/views/wiki/show.rhtml
View file @
c8a6f804
...
...
@@ -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
%>
...
...
doc/CHANGELOG.rdoc
View file @
c8a6f804
= ChiliProject changelog
== 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
...
...
lib/redmine/version.rb
View file @
c8a6f804
...
...
@@ -3,7 +3,7 @@ require 'rexml/document'
module
Redmine
module
VERSION
#:nodoc:
MAJOR
=
1
MINOR
=
4
MINOR
=
5
PATCH
=
0
TINY
=
PATCH
# Redmine compat
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment