diff --git a/.gitignore b/.gitignore index ed747f6..95c58ff 100644 --- a/.gitignore +++ b/.gitignore @@ -17,18 +17,6 @@ pom.xml.asc smeagol.log* /node_modules/ .DS_Store -.clj-kondo/ -.idea/ -.calva/ -.lsp -.eastwood -smeagol.iml resources/public/content/uploads/ - -.eastwood - -resources/public/content/Populating a game world.md - -*.iml diff --git a/README.md b/README.md index 8be0e54..bb9a92e 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,6 @@ # Welcome to Smeagol! Smeagol is a hackable, extensible Wiki engine which is reasonably user-friendly. It uses [Markdown](http://daringfireball.net/projects/markdown/) as its text format, and [Git](http://git-scm.com/) to provide versioning and backup. -**NOTE** Smeagol is no longer actively maintained; I have moved on to using [Cryogen](http://cryogenweb.org/) as my preferred system for generating websites. There's a lot of good ideas in Smeagol, but doing markdown to HTML conversion every time a document is requested puts load on the server which isn't really merited. If anyone else would like to take on the project, they would be welcome to do so. - ## Using Smeagol Read the [[User Documentation]] for an introduction to all Smeagol's features. diff --git a/project.clj b/project.clj index 31fac6d..f3d5602 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject smeagol "1.0.4a" +(defproject smeagol "1.0.4" :description "A simple Git-backed Wiki inspired by Gollum" :url "https://github.com/simon-brooke/smeagol" :license {:name "GNU General Public License,version 2.0 or (at your option) any later version" @@ -23,7 +23,7 @@ [me.raynes/fs "1.4.6"] [noir-exception "0.2.5"] [org.clojars.simon_brooke/internationalisation "1.0.3"] - [org.clojure/clojure "1.10.0"] + [org.clojure/clojure "1.8.0"] [org.clojure/core.memoize "0.5.9"] [org.clojure/data.json "0.2.6"] [org.clojure/tools.logging "0.4.0"] @@ -50,13 +50,13 @@ [lein-npm "0.6.2"] [lein-ring "0.12.5" :exclusions [org.clojure/clojure]]] - :npm {:dependencies [[mermaid "8.13.8"] + :npm {:dependencies [[simplemde "1.11.2"] + [vega "5.8.0"] + [vega-embed "6.2.2"] + [vega-lite "4.1.1"] + [mermaid "8.4.6"] [photoswipe "4.1.3"] - [simplemde "1.11.2"] - [tablesort "5.3.0"] - [vega "5.21.0"] - [vega-embed "6.20.5"] - [vega-lite "5.2.0"]] + [tablesort "5.2.0"]] :root "resources/public/vendor"} :docker {:image-name "simonbrooke/smeagol" diff --git a/resources/passwd b/resources/passwd index 3744ac1..07bf1d9 100644 --- a/resources/passwd +++ b/resources/passwd @@ -1 +1 @@ -{:admin {:admin true, :email "info@weft.scot", :password "admin"}} \ No newline at end of file +{:admin {:admin true, :email "info@weft.scot", :password "admin"}, :simon {:email "simon@journeyman.cc", :admin true, :password "$s0$f0801$sqhbxtzK6nx9RnVUhwtQlg==$dMIUbof8esjsGyiB+zb3gMH21L/WSCR+wD3vIag4EVc="}} \ No newline at end of file diff --git a/resources/public/content/Introduction.md b/resources/public/content/Introduction.md index 711ddcc..bb9a92e 100644 --- a/resources/public/content/Introduction.md +++ b/resources/public/content/Introduction.md @@ -18,7 +18,7 @@ Smeagol has built in internationalisation. Currently it has translation files fo ## Images You can (if you're logged in) upload files, including images, using the **Upload a file** link on the top menu bar. You can link to an uploaded image, or to other images already available on the web, like this: -![Smeagol](/img/smeagol.png) +![Smeagol](http://vignette3.wikia.nocookie.net/lotr/images/e/e1/Gollum_Render.png/revision/latest?cb=20141218075509) ## Running Smeagol You can run Smeagol from the [[Docker Image]]; alternatively you can run it from an executable jar file or as a war file in a servlet container. Read how about [[Configuring Smeagol]] and [[Deploying Smeagol]]. @@ -35,3 +35,5 @@ license, please contact me; I'm open to dual licensing it. ## Phoning home Smeagol does currently fetch one image from my home site. Read more about [[Phoning Home]], and how to prevent it (if you want to). +## Advertisement +If you like what you see here, I am available for work on open source Clojure projects.