diff options
| -rw-r--r-- | build.moxie | 2 | ||||
| -rw-r--r-- | build.xml | 5 | ||||
| -rw-r--r-- | releases.moxie | 8 | ||||
| -rw-r--r-- | src/site/roadmap.mkd | 8 | ||||
| -rw-r--r-- | src/site/siteindex.mkd | 5 |
5 files changed, 4 insertions, 24 deletions
diff --git a/build.moxie b/build.moxie index c5210ef1..e5f7c739 100644 --- a/build.moxie +++ b/build.moxie @@ -19,7 +19,7 @@ releaseDate: 2014-10-28 # Project urls url: 'http://gitblit.com' -issuesUrl: 'http://code.google.com/p/gitblit/issues/list' +issuesUrl: 'https://github.com/gitblit/gitblit' socialNetworkUrl: 'https://plus.google.com/114464678392593421684' forumUrl: 'http://groups.google.com/group/gitblit' mavenUrl: 'http://gitblit.github.io/gitblit-maven' @@ -553,8 +553,6 @@ <page name="release history" out="releases.html">
<template src="releasehistory.ftl" data="${releaselog}" />
</page>
- <divider />
- <page name="roadmap" src="roadmap.mkd" />
</menu>
<menu name="downloads">
@@ -585,7 +583,6 @@ <link name="Github" src="${project.scmUrl}" />
<link name="Issues" src="${project.issuesUrl}" />
<link name="Discussion" src="${project.forumUrl}" />
- <link name="Google+" src="${project.socialNetworkUrl}" />
<link name="Twitter" src="https://twitter.com/gitblit" />
<link name="Ohloh" src="http://www.ohloh.net/p/gitblit" />
<divider />
@@ -593,7 +590,6 @@ <link name="Gitblit SSH and Plugin Management asciicast" src="https://asciinema.org/a/9342" />
<link name="GitMinutes #29: James Moger on Gitblit" src="http://episodes.gitminutes.com/2014/05/gitminutes-29-james-moger-on-gitblit.html" />
<divider />
- <link name="+JamesMoger" src="https://plus.google.com/+JamesMoger" />
<link name="@JamesMoger" src="https://twitter.com/JamesMoger" />
</menu>
<divider />
@@ -897,7 +893,6 @@ <link name="Github" src="${project.scmUrl}" />
<link name="Issues" src="${project.issuesUrl}" />
<link name="Discussion" src="${project.forumUrl}" />
- <link name="Google+" src="${project.socialNetworkUrl}" />
<link name="Ohloh" src="http://www.ohloh.net/p/gitblit" />
</menu>
</structure>
diff --git a/releases.moxie b/releases.moxie index 3de8e9cd..7a3927d7 100644 --- a/releases.moxie +++ b/releases.moxie @@ -7,12 +7,7 @@ r27: { date: ${project.buildDate} note: ~ html: ~ - text: '' - The new gitblit.properties file "includes" defaults.properties which is the original - gitblit.properties file. You may continue using your existing gitblit.properties file - as before, however, you might find future upgrades simpler by adopting the new "include" - design. - '' + text: ~ security: ~ fixes: - Fix exception when viewing a ticket with a patchset where the integration branch does not exist (issue-521, ticket-212) @@ -40,6 +35,7 @@ r27: { - Support for chain-loading properties files (ticket-110) - Add Priority & Severity fields for tickets (pr-220, ticket-157) - Add Maintenance ticket type (pr-223, ticket-206) + - Add commitdiff option to ignore whitespace (ticket-233) - Add configurable tab length for blob views (ticket-253) - Implement image diffs (pr-229) - Add support for configurable HTTP proxy host/port in PluginManager (pr-235) diff --git a/src/site/roadmap.mkd b/src/site/roadmap.mkd deleted file mode 100644 index ea643218..00000000 --- a/src/site/roadmap.mkd +++ /dev/null @@ -1,8 +0,0 @@ -## Roadmap
-
-This is not exactly a formal roadmap but it is a priority list of what might be implemented in future releases.
-This list is volatile and may not reflect what will be in the next release.
-
-* Add support for Project owners/administrators (ticket-75)
-* Add Project create/update pages
-* Integrate improvements for git-flow (ticket-55)
diff --git a/src/site/siteindex.mkd b/src/site/siteindex.mkd index ae954bfa..aec5c42a 100644 --- a/src/site/siteindex.mkd +++ b/src/site/siteindex.mkd @@ -23,12 +23,9 @@ <tbody>
<tr><th>License</th><td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a></td></tr>
<tr><th>Sources</th><td><a href="${project.scmUrl}">GitHub</a></td></tr>
- <tr><th>Issues</th><td><a href="${project.issuesUrl}">GoogleCode</a></td></tr>
+ <tr><th>Issues</th><td><a href="${project.issuesUrl}">GitHub</a></td></tr>
<tr><th>Discussion</th><td><a href="${project.forumUrl}">Gitblit Group</a></td></tr>
- <tr><th>Google+</th><td><a href="${project.socialNetworkUrl}">Gitblit+</a></td></tr>
<tr><th>Ohloh</th><td><a target="_top" href="http://www.ohloh.net/p/gitblit"><img border="0" width="100" height="16" src="http://www.ohloh.net/p/gitblit/widgets/project_thin_badge.gif" alt="Ohloh project report for Gitblit" /></a></td></tr>
- <tr><th>Donations</th><td>If you enjoy Gitblit and want to support its development, please consider making a donation to <a href="http://www.stjude.org">St. Jude Children's Research Hospital</a>.
- <a href="http://www.stjude.org" alt="St. Jude Children's Research Hospital"><img style="padding-top:10px;" src="stjude_150x150.gif"/></a></td></tr>
</tbody>
</table>
</div>
|