Commits on Dec 28, 2014
Commits on Nov 29, 2014
  1. removed gen folder

    Ondrej Brinkel committed Nov 29, 2014
  2. Merge branch 'generator-revamp' of github.com:geddy/geddy into genera…

    …tor-revamp
    Ondrej Brinkel committed Nov 29, 2014
  3. Merge remote-tracking branch 'origin' into generator-revamp

    Conflicts:
    	gen/base/public/css/bootstrap.css
    	gen/base/public/css/bootstrap.min.css
    	gen/base/public/css/style.css
    	gen/base/public/js/bootstrap.js
    	gen/base/public/js/bootstrap.min.js
    	gen/base/public/js/jquery.min.js
    	gen/base/realtime/views/ejs/layouts/application.html.ejs
    	gen/base/realtime/views/ejs/main/index.html.ejs
    	gen/base/realtime/views/handlebars/layouts/application.html.hbs
    	gen/base/realtime/views/handlebars/layouts/layout_header.html.hbs
    	gen/base/realtime/views/handlebars/main/index.html.hbs
    	gen/base/realtime/views/jade/layouts/application.html.jade
    	gen/base/realtime/views/jade/layouts/layout_header.html.jade
    	gen/base/realtime/views/jade/main/index.html.jade
    	gen/base/realtime/views/mustache/layouts/application.html.hbs
    	gen/base/realtime/views/mustache/layouts/layout_header.html.hbs
    	gen/base/realtime/views/mustache/main/index.html.hbs
    	gen/base/realtime/views/swig/layouts/application.html.swig
    	gen/base/realtime/views/swig/main/index.html.swig
    	gen/base/views/ejs/layouts/application.html.ejs
    	gen/base/views/ejs/layouts/layout_header.html.ejs
    	gen/base/views/ejs/main/index.html.ejs
    	gen/base/views/handlebars/layouts/application.html.hbs
    	gen/base/views/handlebars/layouts/layout_header.html.hbs
    	gen/base/views/handlebars/main/index.html.hbs
    	gen/base/views/jade/layouts/application.html.jade
    	gen/base/views/jade/layouts/layout_header.html.jade
    	gen/base/views/jade/main/index.html.jade
    	gen/base/views/mustache/layouts/application.html.hbs
    	gen/base/views/mustache/layouts/layout_header.html.hbs
    	gen/base/views/mustache/main/index.html.hbs
    	gen/base/views/swig/layouts/application.html.swig
    	gen/base/views/swig/main/index.html.swig
    	gen/scaffold/realtime/views/ejs/add.html.ejs.ejs
    	gen/scaffold/realtime/views/ejs/edit.html.ejs.ejs
    	gen/scaffold/realtime/views/ejs/form.html.ejs.ejs
    	gen/scaffold/realtime/views/ejs/index.html.ejs.ejs
    	gen/scaffold/realtime/views/ejs/show.html.ejs.ejs
    	gen/scaffold/realtime/views/handlebars/add.html.hbs.ejs
    	gen/scaffold/realtime/views/handlebars/edit.html.hbs.ejs
    	gen/scaffold/realtime/views/handlebars/index.html.hbs.ejs
    	gen/scaffold/realtime/views/handlebars/show.html.hbs.ejs
    	gen/scaffold/realtime/views/jade/add.html.jade.ejs
    	gen/scaffold/realtime/views/jade/edit.html.jade.ejs
    	gen/scaffold/realtime/views/jade/form.html.jade.ejs
    	gen/scaffold/realtime/views/jade/index.html.jade.ejs
    	gen/scaffold/realtime/views/jade/show.html.jade.ejs
    	gen/scaffold/realtime/views/mustache/add.html.ms.ejs
    	gen/scaffold/realtime/views/mustache/edit.html.ms.ejs
    	gen/scaffold/realtime/views/mustache/index.html.ms.ejs
    	gen/scaffold/realtime/views/mustache/show.html.ms.ejs
    	gen/scaffold/realtime/views/swig/add.html.swig.ejs
    	gen/scaffold/realtime/views/swig/edit.html.swig.ejs
    	gen/scaffold/realtime/views/swig/index.html.swig.ejs
    	gen/scaffold/realtime/views/swig/show.html.swig.ejs
    	gen/scaffold/views/ejs/add.html.ejs.ejs
    	gen/scaffold/views/ejs/edit.html.ejs.ejs
    	gen/scaffold/views/ejs/form.html.ejs.ejs
    	gen/scaffold/views/ejs/index.html.ejs.ejs
    	gen/scaffold/views/ejs/show.html.ejs.ejs
    	gen/scaffold/views/handlebars/add.html.hbs.ejs
    	gen/scaffold/views/handlebars/edit.html.hbs.ejs
    	gen/scaffold/views/handlebars/form.html.hbs.ejs
    	gen/scaffold/views/handlebars/index.html.hbs.ejs
    	gen/scaffold/views/handlebars/show.html.hbs.ejs
    	gen/scaffold/views/jade/add.html.jade.ejs
    	gen/scaffold/views/jade/edit.html.jade.ejs
    	gen/scaffold/views/jade/form.html.jade.ejs
    	gen/scaffold/views/jade/index.html.jade.ejs
    	gen/scaffold/views/jade/show.html.jade.ejs
    	gen/scaffold/views/mustache/add.html.ms.ejs
    	gen/scaffold/views/mustache/edit.html.ms.ejs
    	gen/scaffold/views/mustache/form.html.ms.ejs
    	gen/scaffold/views/mustache/index.html.ms.ejs
    	gen/scaffold/views/mustache/show.html.ms.ejs
    	gen/scaffold/views/swig/add.html.swig.ejs
    	gen/scaffold/views/swig/edit.html.swig.ejs
    	gen/scaffold/views/swig/index.html.swig.ejs
    	gen/scaffold/views/swig/show.html.swig.ejs
    	gen/views/ejs/add.html.ejs.ejs
    	gen/views/ejs/edit.html.ejs.ejs
    	gen/views/ejs/index.html.ejs.ejs
    	gen/views/ejs/show.html.ejs.ejs
    	gen/views/handlebars/add.html.hbs.ejs
    	gen/views/handlebars/edit.html.hbs.ejs
    	gen/views/handlebars/index.html.hbs.ejs
    	gen/views/handlebars/show.html.hbs.ejs
    	gen/views/jade/add.html.jade.ejs
    	gen/views/jade/edit.html.jade.ejs
    	gen/views/jade/index.html.jade.ejs
    	gen/views/jade/show.html.jade.ejs
    	gen/views/mustache/add.html.ms.ejs
    	gen/views/mustache/edit.html.ms.ejs
    	gen/views/mustache/index.html.ms.ejs
    	gen/views/mustache/show.html.hbs.ejs
    	gen/views/mustache/show.html.ms.ejs
    	gen/views/swig/add.html.swig
    	gen/views/swig/edit.html.swig
    	gen/views/swig/index.html.swig
    	gen/views/swig/show.html.swig
    Ondrej Brinkel committed Nov 29, 2014
Commits on Nov 8, 2014
  1. @mde

    Merge pull request #657 from vishi0/master

    Update to Bootstrap 3
    mde committed Nov 7, 2014
Commits on Nov 7, 2014
  1. Fixing navbar for tablets and smaller devices

    Vishi committed Nov 7, 2014
Commits on Sep 26, 2014
  1. @mde
  2. @mde

    Merge branch 'v13'

    mde committed Sep 26, 2014
  3. @mde

    Removed Node 0.8 support

    mde committed Sep 26, 2014
  4. @mde

    Merge pull request #642 from vieiralucas/patch-2

    Fix a very little typo
    mde committed Sep 26, 2014
  5. @vieiralucas

    Fix a very little typo

    "Status must be 'open' or 'done.'" to "Status must be 'open' or 'done'."
    vieiralucas committed Sep 26, 2014
Commits on Sep 18, 2014
  1. @mde
  2. @mde

    Merge branch 'v13'

    mde committed Sep 18, 2014
  3. @mde

    Version 13.0.4

    mde committed Sep 18, 2014
  4. @mde

    Silently ignore undefined options

    mde committed Sep 18, 2014
Commits on Sep 2, 2014
  1. @mde

    Merge pull request #634 from saturnxxi/master

    Update package.json
    mde committed Sep 2, 2014
  2. @saturnxxi

    Update package.json

    new version of socket.io
    saturnxxi committed Sep 2, 2014
Commits on Aug 21, 2014
  1. @mde

    Use whitelist for ad-hoc props

    mde committed Aug 20, 2014
  2. @mde

    Use whitelist for ad-hoc props

    mde committed Aug 20, 2014
  3. @mde

    Remove whitespace

    mde committed Aug 20, 2014
  4. @mde

    Whitespace change to poke tests

    mde committed Aug 20, 2014
  5. @mde

    Revert "Revert "fixes #627: added noPrefix option to styleLink and sc…

    …riptLink helpers that will prevent auto prefixing of paths with css/ or/js""
    
    This reverts commit dc01af7.
    mde committed Aug 20, 2014
  6. @mde

    Revert "fixes #627: added noPrefix option to styleLink and scriptLink…

    … helpers that will prevent auto prefixing of paths with css/ or/js"
    
    This reverts commit 67fcf08.
    mde committed Aug 20, 2014
  7. @mde

    Restore ad-hoc prop test

    mde committed Aug 20, 2014
  8. @mde

    Comment out ad-hoc prop test

    mde committed Aug 20, 2014
  9. @mde

    Version 13.0.3

    mde committed Aug 20, 2014
  10. @mde
Commits on Aug 20, 2014
Commits on Aug 13, 2014
  1. @mde

    Merge branch 'v13'

    mde committed Aug 13, 2014
  2. @mde

    Version 13.0.2

    mde committed Aug 13, 2014
  3. @mde

    Merge branch 'v0.12' into v13

    Conflicts:
    	lib/controller/base_controller.js
    	package.json
    mde committed Aug 13, 2014
  4. @mde
Commits on Aug 12, 2014
  1. Merge remote-tracking branch 'origin/generator-revamp' into generator…

    …-revamp
    Ondrej Brinkel committed Aug 12, 2014