Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:mde/geddy into passport-integration

Conflicts:
	lib/init/model.js
  • Loading branch information...
commit ac25a59ec919f28acd877292b3bc13fd302b57cc 2 parents dfc0288 + 1ae44ab
mde authored
View
5 lib/init/model.js
@@ -112,11 +112,6 @@ module.exports = new (function () {
adapter.connect();
}
model.loadedAdapters[name] = adapter;
- if (typeof adapter.createTable == 'function') {
- // FIXME -- fire-and-forget bad, need to make this
- // recursive
- adapter.createTable(name, function () {});
- }
}
model.adapters[name] = adapter;
}
View
2  package.json
@@ -7,7 +7,7 @@
"REST",
"MVC"
],
- "version": "0.5.5",
+ "version": "0.5.7",
"author": "Matthew Eernisse <mde@fleegix.org> (http://fleegix.org)",
"dependencies": {
"jake": "0.5.x",
View
2  site/app/views/layouts/application.html.jade
@@ -6,7 +6,7 @@ html(lang="en")
meta(name="description", content="")
meta(name="author", content="")
meta(name="viewport", content="width=device-width")
- title Geddy | A simple, structured Web framework for Node.
+ title Geddy | The original MVC Web framework for Node - a simple, structured way to create full stack javascript applications
// The HTML5 shim, for IE6-8 support of HTML elements
//if lt IE 9
View
4 templates/Jakefile
@@ -193,10 +193,10 @@ namespace('gen', function () {
};
var _formatModelProperties = function (properties) {
- var obj = {'default': {name: 'id', type: 'int'}};
if (!properties) {
- return obj;
+ return {};
}
+ var obj = {'default': {name: 'id', type: 'int'}};
var itemsArr = properties.split('%')
, name
Please sign in to comment.
Something went wrong with that request. Please try again.