708 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Ritchie Martori	f03e18b3a5	fixed resource path renaming	2012-07-30 18:19:58 -07:00
Ritchie Martori	832513e079	added more custom resources to test-app	2012-07-30 16:38:01 -07:00
DallonF	5cff7e7274	Added basic dashboard	2012-07-30 14:48:50 -07:00
DallonF	7ae0b1cfc3	Loaded CSS with custom resources	2012-07-30 12:54:28 -07:00
DallonF	dc17b617ee	Made default editor able to remove settings	2012-07-30 12:32:08 -07:00
DallonF	f29a04040f	Added default editor	2012-07-30 12:11:42 -07:00
DallonF	4141a5a25a	Reversed arrow shortcuts in property editor	2012-07-30 11:23:56 -07:00
DallonF	05b1cbf3b8	Fixed API page bug	2012-07-30 11:21:59 -07:00
DallonF	3876b64dee	Added redirects when you rename or delete the current resource	2012-07-30 11:17:01 -07:00
DallonF	b6452df2a5	Added overlay to modals	2012-07-27 13:49:19 -07:00
DallonF	2fccf0d218	Added API page	2012-07-27 13:43:55 -07:00
DallonF	2dcae9727f	Styling improvements	2012-07-27 13:11:11 -07:00
Ritchie Martori	b9a5fba679	bump version	2012-07-27 12:49:20 -07:00
Ritchie Martori	0f8c4164be	Release v0.5.1 v0.5.1	2012-07-27 12:45:54 -07:00
Ritchie Martori	9594c06809	fixed a bug where cancel() was not canceling an event after internal event-io occured	2012-07-27 12:45:20 -07:00
DallonF	b39462e618	Hide resources sidebar until loaded	2012-07-27 10:56:01 -07:00
DallonF	a1e0487db0	Improved resource creation	2012-07-27 10:52:25 -07:00
DallonF	0ceea10d27	Improved keyboard property type shortcuts	2012-07-27 10:41:49 -07:00
DallonF	00ba84f252	Added middle-click/deep-link support	2012-07-27 10:12:11 -07:00
DallonF	339b8114cc	Property, Data, and Event editors don't appear until they're fully loaded	2012-07-27 10:02:27 -07:00
DallonF	e53f43b91e	Added event editor	2012-07-27 09:46:26 -07:00
DallonF	24a7deca6d	Fixed data editor	2012-07-27 08:39:10 -07:00
DallonF	8bf93ba4f5	Added Data editor	2012-07-26 16:59:30 -07:00
DallonF	7998c7ba43	Updated styling in dashboard	2012-07-26 15:50:01 -07:00
DallonF	99794e5321	Added property editor	2012-07-26 14:54:40 -07:00
DallonF	4fc4dbf06e	Added custom dashboard loading	2012-07-26 11:31:38 -07:00
DallonF	82ff098b3a	Added navigation + subpages to resource sidebar	2012-07-26 09:28:43 -07:00
DallonF	6bc99ab90b	Fixed error displays	2012-07-25 15:29:27 -07:00
DallonF	cf097196e8	Added empty view to resource sidebar	2012-07-25 15:22:10 -07:00
DallonF	c341259303	Finished resource sidebar	2012-07-25 15:17:03 -07:00
Ritchie Martori	fc1ed57132	updated test app with event source files	2012-07-24 17:21:07 -07:00
Ritchie Martori	e6be63bf77	updated test-app to use new config structure	2012-07-24 16:00:09 -07:00
Ritchie Martori	8666859812	initial config refactor	2012-07-24 15:51:38 -07:00
Ritchie Martori	60ce9ea7ac	Merge branch '0.6' of github.com:deployd/deployd into 0.6	2012-07-24 13:40:15 -07:00
Ritchie Martori	d3eb325410	fixed regressions on tests due to emitToAll and resource caching	2012-07-24 13:37:43 -07:00