Fixes #36

ChangeLog.md

@@ -1,3 +1,11 @@
+Version 0.6.1, June 24th, 20114
+=============================
+
+- Due to an incompatibility with latest versions of Express 3.x (and Connect),
+  the Express version in package.json has been frozen
+- Removed some deprecation warnings
+- Fixed some problems on the welcome page
+
 Version 0.6.0, May 28th, 20114
 =============================
 

jingo

@@ -25,7 +25,7 @@ var express        = require('express')
   , Flash          = require('connect-flash')
   , program        = require('commander');
 
-program.version('0.6.0')
+program.version('0.6.1')
        .option('-c, --config <path>', 'Specify the config file')
        .option('-#, --hash-string <string>', 'Create an hash for a string')
        .option('-l, --local', 'Listen on localhost only')
@@ -128,7 +128,8 @@ app.configure(function() {
   app.use(express.logger('default'));
   app.use(express.cookieParser(app.locals.secret));
   app.use(express.cookieSession({ secret: "jingo-" + app.locals.secret, cookie: { maxAge: 30 * 24 * 60 * 60 * 1000 }})); // a Month
-  app.use(express.bodyParser());
+  app.use(express.json());
+  app.use(express.urlencoded());
   app.use(expValidator());
   app.use(express.methodOverride());
   app.use(passport.initialize());

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jingo",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "A nodejs based wiki engine (sort of Gollum port)",
   "author": "Claudio Cicali <[email protected]>",
   "keywords": [
@@ -22,17 +22,17 @@
   "dependencies": {
     "commander": "*",
     "connect-flash": "*",
-    "express": "3.x",
+    "express": "3.5.3",
     "express-validator": ">= 0.3.0",
     "gravatar": ">= 1.0.6",
     "iconv": "*",
     "jade": "*",
     "marked": ">= 0.2.x",
     "node-syntaxhighlighter": "*",
-    "passport": "*",
+    "passport": "0.1.x",
     "passport-google": "*",
     "passport-google-oauth": ">= 0.1.5",
-    "passport-local": "*",
+    "passport-local": "0.1.x",
     "yaml-js": "*"
   },
   "devDependencies": {

views/mixins/form.jade

@@ -2,7 +2,7 @@
 mixin saveAndCancel(saveText)
   .form-actions
     input(type='submit',value=saveText || 'Save').btn.btn-primary
-     
+    | 
     a(href="/").btn Cancel
 
 mixin errors(err)
@@ -15,24 +15,24 @@ mixin errors(err)
             b= v.msg || v
 
 mixin featuresStylesheets()
-  if hasFeature('markitup') 
+  if hasFeature('markitup')
     link(rel="stylesheet", type="text/css", href="/vendor/widearea/widearea.min.css")
     link(rel="stylesheet", type="text/css", href="/vendor/markitup/skins/simple/style.css")
     link(rel="stylesheet", type="text/css", href="/vendor/markitup/sets/markdown/style.css")
-  if hasFeature('codemirror') 
+  if hasFeature('codemirror')
     link(rel="stylesheet", type="text/css", href="/vendor/codemirror/lib/codemirror.css")
     link(rel="stylesheet", type="text/css", href="/vendor/codemirror/addon/display/fullscreen.css")
 
 mixin featuresJavaScripts()
-  if hasFeature('markitup') 
+  if hasFeature('markitup')
     script(src="/vendor/jquery-migrate-1.1.0.min.js")
     script(src="/vendor/markitup/jquery.markitup.js")
     script(src="/vendor/markitup/sets/markdown/set.js")
     script(src="/vendor/widearea/widearea.min.js")
     script.
      $('#editor').markItUp(markdownSettings);
      wideArea();
-  if hasFeature('codemirror') 
+  if hasFeature('codemirror')
     script(src="/vendor/codemirror/lib/codemirror.js")
     script(src="/vendor/codemirror/mode/markdown/markdown.js")
     script(src="/vendor/codemirror/addon/display/fullscreen.js")

views/welcome.jade

@@ -3,12 +3,8 @@ extends layout
 block content
 
   h2 Welcome to the wiki
-  p 
-    | This is a page 
-    b placeholder 
-    | for the home page.
-  p You should first 
-    a(href="/login") login 
-    | and then you'll be redirected to the editor so that you can create the front page.
-  p The 
-    b Jingo authors
+
+  #content
+    h3 Hi there!
+    p This page doesn't (yet) exist. You should first <a href="/login">login</a> and then you'll be redirected to the editor so that you can create the front page.
+    p Enjoy!