Merge branch 'release/0.5.0-rc3'

This commit is contained in:
simon 2016-09-16 13:44:18 +01:00
commit 832d72e009
3 changed files with 3 additions and 4 deletions

View file

@ -6,8 +6,7 @@ Smeagol is a simple Wiki engine inspired by [Gollum](https://github.com/gollum/g
So at this stage Smeagol is a Wiki engine written in Clojure which uses Markdown as its text format, which does have user authentication, and which uses Git as its versioning and backup system.
## Status
Smeagol is now a fully working small Wiki engine, and meets my own immediate needs. There are some obvious
things which could be improved - see **TODO** list below - but it works now and doesn't seem to have any major problems.
Smeagol is now a fully working small Wiki engine, and meets my own immediate needs.
## Markup syntax
Smeagol uses the Markdown format as provided by [markdown-clj](https://github.com/yogthos/markdown-clj), with the addition that anything enclosed in double square brackets, \[\[like this\]\], will be treated as a link into the wiki itself.

View file

@ -1,4 +1,4 @@
(defproject smeagol "0.5.0-rc2"
(defproject smeagol "0.5.0-rc3"
:description "A simple Git-backed Wiki inspired by Gollum"
:url "https://github.com/simon-brooke/smeagol"
:dependencies [[org.clojure/clojure "1.7.0"]

View file

@ -126,7 +126,7 @@
:page page
:content (util/local-links (util/md->html file-name))
:editable true})))
true (response/redirect (str "edit?page=" page)))))
true (response/redirect (str "/edit?page=" page)))))
(defn history-page