Dallon Feldner cc5b4246ed Merge branch 'refactor/deployment' into 0.7-feature/module-dashboard ...

Conflicts:
	bin/dpd
	lib/client/deploy.js
	lib/config-loader.js
	lib/internal-resources/dashboard.js
	lib/internal-resources/dashboard/index.ejs
	lib/internal-resources/dashboard/stylesheets/layout.less
	lib/internal-resources/dashboard/stylesheets/style.css
	lib/internal-resources/dashboard/stylesheets/style.less
	lib/internal-resources/internal-resources.js
	lib/resources/dashboard/bootstrap

2012-12-05 10:23:08 -07:00

..

client

Added lots of polish to deployment

2012-12-04 12:01:58 -07:00

internal-resources

Merge branch 'refactor/deployment' into 0.7-feature/module-dashboard

2012-12-05 10:23:08 -07:00

modules

fixed missing ctx properties in tests

2012-11-21 13:32:44 -08:00

util

Merge branch 'refactor/deployment' into 0.7-feature/module-dashboard

2012-12-05 10:23:08 -07:00

.jshintignore

Made jshint more strict (undefined globals)

2012-09-12 11:11:03 -07:00

.jshintrc

Began refactor of config-loader, type-loader

2012-11-15 14:20:45 -07:00

config-loader.js

Added cache to config loader

2012-12-05 09:13:57 -07:00

config-loader.old.js

Began refactor of config-loader, type-loader

2012-11-15 14:20:45 -07:00

context.js

fixed incorrect content-length

2012-09-19 16:54:37 -07:00

db.js

initial permissions api

2012-11-16 12:03:30 -08:00

internal-client.js

Merge branch '0.7' of github.com:deployd/deployd into 0.7

2012-11-15 11:56:12 -08:00

keys.js

Made jshint more strict (undefined globals)

2012-09-12 11:11:03 -07:00

module-loader.js

Merge branch '0.7' into 0.7-feature/module-dashboard

2012-12-05 08:49:19 -07:00

module.js

Refactored config loader to support modules

2012-11-19 11:55:18 -07:00

monitor.js

fixed process exiting without error code

2012-09-25 12:27:22 -07:00

resource.js

fixed missing ctx properties in tests

2012-11-21 13:32:44 -08:00

router.js

initial permissions api

2012-11-16 12:03:30 -08:00

script.js

added initial custom event support

2012-11-15 11:54:57 -08:00

server.js

fixed missing dir

2012-12-01 13:34:42 -08:00

session.js

fixed bugs preventing events from being emitted to users in certain connection states

2012-10-19 17:14:42 -07:00

start.js

added shared stdio with monitor child process

2012-09-19 12:02:28 -07:00