DallonF
|
5c75680be8
|
Merge branch 'refactor/deployment' into 0.7
Conflicts:
HISTORY.md
|
2012-12-20 10:56:33 -07:00 |
|
Dallon Feldner
|
669510d2b1
|
Merge branch '0.7' of github.com:deployd/deployd into 0.7
|
2012-12-19 09:20:10 -07:00 |
|
Dallon Feldner
|
97ce7db8c2
|
Fixed bug where custom resource events would not show up in the dashboard
|
2012-12-19 09:20:00 -07:00 |
|
Ritchie Martori
|
56f0a64e2d
|
refactored permissions into request event
|
2012-12-13 15:01:06 -08:00 |
|
Ritchie Martori
|
5371186215
|
initial globalEvent module
|
2012-12-11 09:54:28 -08:00 |
|
DallonF
|
8482a4329a
|
Added module dashboards
|
2012-12-06 12:55:36 -07:00 |
|
DallonF
|
f02871b3f9
|
Merge branch 'refactor/deployment' into 0.7-feature/module-dashboard
Conflicts:
HISTORY.md
README.md
lib/db.js
package.json
|
2012-12-06 08:51:03 -07:00 |
|
Dallon Feldner
|
3f54dd7f9d
|
Fixed some bugs in the deployment functionality
|
2012-12-05 10:48:20 -07:00 |
|
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 |
|
Dallon Feldner
|
50de68666f
|
Minor dashboard refactoring
|
2012-12-05 10:09:48 -07:00 |
|
Dallon Feldner
|
e5814e19e9
|
Added cache to config loader
|
2012-12-05 09:13:57 -07:00 |
|
Ritchie Martori
|
1a47d4c228
|
added dir to server options - for booting in other directories than process.cwd()
|
2012-12-01 13:18:00 -08:00 |
|
Dallon Feldner
|
7b9bc6b3d6
|
Added modules sidebar
|
2012-11-21 11:57:07 -07:00 |
|