summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-07-09 20:26:04 -0400
committerJules Laplace <jules@okfoc.us>2014-07-09 20:26:04 -0400
commit4bd53b79465d6bdc653d7857752732cc93b4ad27 (patch)
tree9550dfc0068f71047fb1fe1a510352706a459dc5 /server
parente687ae58246b67cc909d8f7b695f30c069f51ede (diff)
loading users; login; logout
Diffstat (limited to 'server')
-rw-r--r--server/api/user.js2
-rw-r--r--server/models/User.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/server/api/user.js b/server/api/user.js
index 49f70ff..ceac2bc 100644
--- a/server/api/user.js
+++ b/server/api/user.js
@@ -5,7 +5,7 @@ var _ = require('lodash'),
module.exports = {
all: function (req, res) {
- User.all().success(function(users){
+ User.all({ order: 'name ASC' }).success(function(users){
res.json(users)
})
},
diff --git a/server/models/User.js b/server/models/User.js
index 9ea5a41..42f2389 100644
--- a/server/models/User.js
+++ b/server/models/User.js
@@ -14,7 +14,7 @@ var User = db.sequelize.define('user', {
access: Sequelize.INTEGER,
emailhidden: Sequelize.BOOLEAN,
hostid: Sequelize.INTEGER,
- blurb: Sequelize.BLOB,
+ blurb: Sequelize.TEXT,
})
User.sync()