793 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ritchie Martori	cc4df85a41	Merge branch '0.6' of github.com:deployd/deployd into 0.6	2012-08-08 11:48:35 -07:00
Ritchie Martori	1973089170	new docs	2012-08-08 11:48:22 -07:00
DallonF	08056becab	Removed dates as a supported property type	2012-08-08 11:03:01 -07:00
DallonF	974d29bbe9	Removed testing "sort properties" button	2012-08-08 10:27:28 -07:00
DallonF	fa7c2b9832	Added sortable properties to collection editor	2012-08-08 09:55:38 -07:00
Ritchie Martori	19bdf748fd	removed old docs	2012-08-08 07:35:37 -07:00
DallonF	c6c73b81ef	Merge branch '0.6' of github.com:deployd/deployd into 0.6	2012-08-07 14:12:46 -07:00
DallonF	8d21a2e1e6	Added utility function to load scripts	2012-08-07 14:12:27 -07:00
Ritchie Martori	e34354cbe2	removed log from test	2012-08-07 13:59:27 -07:00
Ritchie Martori	1d931aadf4	fixed property renaming, added external prototype to Resources	2012-08-07 13:56:58 -07:00
DallonF	06d5ba92de	Added default event editor	2012-08-07 13:31:32 -07:00
Ritchie Martori	660ac48288	fixed property renaming not updating all values in dashboard	2012-08-07 08:21:41 -07:00
Ritchie Martori	beb8d0fc72	Merge branch '0.6' of github.com:deployd/deployd into 0.6	2012-08-06 15:26:35 -07:00
Ritchie Martori	b3a897e5c3	fixed documentation	2012-08-06 15:26:24 -07:00
DallonF	12191996e3	Added Ctrl-S support to Ace editors	2012-08-06 15:09:04 -07:00
DallonF	4f418c9a0c	Editing properties no longer saves automatically	2012-08-06 14:48:58 -07:00
DallonF	352626453e	Fixed checkbox bug	2012-08-06 14:36:48 -07:00
DallonF	e7b4ab5fc5	Changed basic dashboard auto-saving to save/cancel buttons	2012-08-06 14:29:44 -07:00
DallonF	106577ef48	Updated dashboard to use precompiled LESS	2012-08-06 14:00:44 -07:00
DallonF	cd4ac47b5d	Updated basicDashboard sample	2012-08-06 12:57:45 -07:00
Ritchie Martori	ca40a46b32	Merge branch 'refactor/resource-event-emitter' into 0.6	2012-08-06 10:30:18 -07:00
Ritchie Martori	b732361119	refactored Resource to inherit from EventEmitter, added changed and deleted events	2012-08-06 10:29:29 -07:00
Ritchie Martori	bab171afd6	fixed internal calls being canceled()	2012-08-03 13:11:40 -07:00
Ritchie Martori	4df9e76a16	Merge branch 'refactor/execListener' into 0.6	2012-08-03 11:38:05 -07:00
Ritchie Martori	ccd5c1891c	updated tests after removing execListener	2012-08-03 11:34:35 -07:00
Ritchie Martori	3be267e1cc	removed execListener from collection	2012-08-03 11:11:50 -07:00
Ritchie Martori	6bad11a5d2	Merge branch '0.6' of github.com:deployd/deployd into refactor/execListener	2012-08-03 10:37:36 -07:00
Ritchie Martori	4a8a7e23d6	script tests	2012-08-03 10:37:19 -07:00
Ritchie Martori	cc47d0886f	initial script refactor	2012-08-03 10:36:41 -07:00
DallonF	f37782dcbb	Merge branch '0.6' of github.com:deployd/deployd into 0.6	2012-08-02 14:03:53 -07:00
DallonF	0eb059987f	Fixed some bugs found while working on S3 project	2012-08-02 14:03:43 -07:00
Ritchie Martori	f75f573da7	merged upstream	2012-08-02 10:11:21 -07:00
DallonF	3081125ab4	Merge branch '0.6' of github.com:deployd/deployd into 0.6 ... Conflicts: test/support/keys.json	2012-08-02 09:58:35 -07:00
DallonF	9ec61c91c3	Fixed tests	2012-08-02 09:58:12 -07:00
DallonF	28020bf7ab	Renamed settings.json to config.json and fixed bugs relating to renaming resources	2012-08-02 09:41:17 -07:00
Ritchie Martori	29a650b99a	resolved conflicts	2012-08-02 09:33:26 -07:00
Ritchie Martori	ba5bb67b92	merged upstream	2012-08-01 15:30:31 -07:00
DallonF	f523e7067f	Merge branch '0.6' of github.com:deployd/deployd into 0.6	2012-08-01 14:35:47 -07:00
DallonF	8bcfa63f67	Updated dashboard for new resource loading, fixed some workflow bugs	2012-08-01 14:32:35 -07:00
DallonF	76c7b1e047	Refactored resource loading to be more flexible	2012-08-01 13:14:16 -07:00
Ritchie Martori	7870f302b8	removed internal check from collection	2012-08-01 10:56:28 -07:00
Ritchie Martori	2f0a73d8a4	cleaned up tabs, instrumented db with debugging	2012-08-01 10:52:59 -07:00
DallonF	e758572a39	Merge branch '0.6' of github.com:deployd/deployd into 0.6 ... Conflicts: test-app/resources/empty/settings.json	2012-07-31 09:49:52 -07:00
DallonF	fba0442fa0	Fixed property saving for checkboxes and numbers	2012-07-31 09:18:20 -07:00
Ritchie Martori	d430abab69	fixed resource renaming path	2012-07-31 09:09:45 -07:00
DallonF	b3226b6e86	Merge branch '0.6' of github.com:deployd/deployd into 0.6	2012-07-31 09:02:12 -07:00
Ritchie Martori	99f6fbf6ea	fixed incorrect path when saving resources	2012-07-31 09:00:43 -07:00
DallonF	5b6db88d5e	Basic dashboard loads previous values	2012-07-31 08:57:40 -07:00
Ritchie Martori	9c93bdf024	updated gitignore to only ignore root node_modules folder	2012-07-31 08:54:27 -07:00
Ritchie Martori	b6cc4fee07	resource instances now live in the resource folder and resource types live in the node modules folder	2012-07-30 19:16:43 -07:00