Skip to content

Commit

Permalink
Redo code reformatting
Browse files Browse the repository at this point in the history
As per srsgores/devel but with slightly different code style.
  • Loading branch information
richtera committed Dec 29, 2012
1 parent d687180 commit aeaa5b2
Show file tree
Hide file tree
Showing 68 changed files with 5,388 additions and 5,046 deletions.
306 changes: 169 additions & 137 deletions app.js

Large diffs are not rendered by default.

154 changes: 77 additions & 77 deletions lib/conf/default.json
Original file line number Diff line number Diff line change
@@ -1,79 +1,79 @@
{
"version":"0.3.0",
"installed":false,
"database": {
"uri":"mongodb://localhost/calipso"
},
"authentication": {
"password": true,
"migrate2pbkdf2": false
},
"server": {
"name":"Calipso",
"url":"http://localhost:3000",
"modulePath":"./modules",
"themePath":"./themes",
"cluster": {
"workers": 0,
"restartWorkers": true,
"maximumRestarts": 1
},
"events":{
"maxListeners":500
}
},
"calipso": {
"repo": {
"url":"http://calip.so/repo/api",
"defaultVersion":"master"
}
},
"performance": {
"cache":{
"enabled":false,
"ttl":600
},
"watchFiles":true
},
"session":{
"secret":"calipso"
},
"theme": {
"default":"cleanslate",
"front":"cleanslate",
"admin":"cleanslate"
},
"i18n": {
"language":"en",
"additive":true
},
"logging": {
"console": {
"enabled": true,
"level": "info",
"timestamp":true,
"colorize":true
},
"file": {
"enabled": false,
"level": "info",
"filepath": "logs/calipso.log",
"timestamp":true
}
},
"libraries":{
"stylus":{
"enable":false,
"warn":true,
"compress":false
},
"formidable":{
"keepExtensions":true
}
},
"modules": {
"admin":{
"enabled": true
}
}
"version": "0.3.0",
"installed": false,
"database": {
"uri": "mongodb://localhost/calipso"
},
"authentication": {
"password": true,
"migrate2pbkdf2": false
},
"server": {
"name": "Calipso",
"url": "http://localhost:3000",
"modulePath": "./modules",
"themePath": "./themes",
"cluster": {
"workers": 0,
"restartWorkers": true,
"maximumRestarts": 1
},
"events": {
"maxListeners": 500
}
},
"calipso": {
"repo": {
"url": "http://calip.so/repo/api",
"defaultVersion": "master"
}
},
"performance": {
"cache": {
"enabled": false,
"ttl": 600
},
"watchFiles": true
},
"session": {
"secret": "calipso"
},
"theme": {
"default": "cleanslate",
"front": "cleanslate",
"admin": "cleanslate"
},
"i18n": {
"language": "en",
"additive": true
},
"logging": {
"console": {
"enabled": true,
"level": "info",
"timestamp": true,
"colorize": true
},
"file": {
"enabled": false,
"level": "info",
"filepath": "logs/calipso.log",
"timestamp": true
}
},
"libraries": {
"stylus": {
"enable": false,
"warn": true,
"compress": false
},
"formidable": {
"keepExtensions": true
}
},
"modules": {
"admin": {
"enabled": true
}
}
}
4 changes: 1 addition & 3 deletions logo.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@

require('colors');

exports.print = function() {

exports.print = function () {
console.log("");
console.log(" _ _ ".yellow.bold);
console.log(" ___ __ _| (_)_ __ ___ ___ ".yellow.bold);
Expand All @@ -20,4 +19,3 @@ exports.print = function() {
console.log("");

};

Loading

0 comments on commit aeaa5b2

Please sign in to comment.