1
0
Fork 0
Commit Graph

281 Commits

Author SHA1 Message Date
Frank Celler 4ccee5fe61 Merge remote-tracking branch 'origin/devel' into devel
Conflicts:
	js/common/modules/org/arangodb/foxx.js
2013-03-23 23:48:48 +01:00
Jan Steemann 91fbb454f3 added zipFile() 2013-03-23 22:32:59 +01:00
Frank Celler 8b0c0c7662 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	js/common/bootstrap/module-internal.js
2013-03-23 21:58:44 +01:00
Frank Celler 44806229f7 fixed jslint errors 2013-03-23 21:57:33 +01:00
Jan Steemann d97954e466 unzip 2013-03-23 20:52:33 +01:00
Frank Celler 961552b753 added trace for failed conversion 2013-03-23 17:32:32 +01:00
Frank Celler 4059f31170 return error message 2013-03-23 16:42:52 +01:00
Jan Steemann 0d2fdcae58 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	js/common/bootstrap/module-fs.js
2013-03-23 14:36:45 +01:00
Frank Celler 8a54df7419 added .arangosh.rc, added /_admin/execute 2013-03-23 14:04:08 +01:00
Frank Celler a8d5a06f57 added resetEngine 2013-03-22 18:09:01 +01:00
Frank Celler 38a5cf6a2d added development-mode 2013-03-22 17:33:25 +01:00
Heiko Kernbach 291e5bdbb6 fixes #448 2013-03-22 14:31:58 +01:00
Michael Hackstein 60416e671a Deleting nodes now works and redraws the graph, in the demo page deleting has been included 2013-03-21 15:57:36 +01:00
Michael Hackstein a4065dd30d Events can now be rebound during runtime on any object 2013-03-21 15:36:54 +01:00
Michael Hackstein 8aee0d3ed0 Minor fix in GraphViewerSpec, causing user-interaction tests to fail 2013-03-21 13:53:18 +01:00
Michael Hackstein a5df10cb50 Added creation of node to demo.html 2013-03-21 13:03:00 +01:00
Michael Hackstein 3c2f88d6ab Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-21 10:55:12 +01:00
Michael Hackstein 4d7e20a151 GraphViewer and Demo adapted to EventDispatcher 2013-03-21 10:54:57 +01:00
Michael Hackstein 4f163640b8 Finished implementing the EventDispatcher 2013-03-21 10:41:07 +01:00
Jan Steemann 6d9e82dbd3 issue #457 2013-03-20 16:52:53 +01:00
Jan Steemann 4799f3309d fixed ArangoStatement.explain() with bind variables 2013-03-20 16:52:25 +01:00
Michael Hackstein ff14ec670d Fix for return format of ArangoDB, now it is always interpreted as JSON-Object 2013-03-20 14:31:39 +01:00
Michael Hackstein c8b19823d3 Start of event dispatcher implementation 2013-03-20 14:31:02 +01:00
Jan Steemann 45906ad0a9 derived file 2013-03-20 12:12:56 +01:00
Jan Steemann 9519b69db1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-20 11:56:38 +01:00
Jan Steemann 40199d64b7 fixed handling of empty and reserved attribute names in documents
specifying an empty attribute name in a document may have led to segmentation faults
when the document was unpacked later.
2013-03-20 11:48:33 +01:00
Michael Hackstein 0f246a5a28 Moved specs for events into a combined folder 2013-03-20 10:57:18 +01:00
Michael Hackstein 9f8e969699 Improved style of EventLib code 2013-03-20 10:41:53 +01:00
Michael Hackstein a9fc8289b2 EdgeShaper now also uses arangoDBs _id as default id value 2013-03-20 10:33:55 +01:00
Michael Hackstein e755c67a3b fixed test data adapted to mirror arangoDB internal id 2013-03-20 10:11:00 +01:00
Michael Hackstein 7eb123b2c3 Fix in NodeShaper spec 2013-03-20 10:01:48 +01:00
Michael Hackstein eb5b61b6fd NodeShaper now uses arangoDB _id as default, specs adapted 2013-03-20 09:55:26 +01:00
Michael Hackstein d24d315870 added events to create/patch/delete nodes and edges to the event library 2013-03-20 09:43:43 +01:00
Jan Steemann f06d206f6c do not make input rows bigger each row 2013-03-19 16:12:58 +01:00
Jan Steemann a56d99051d fixed auto-growing textareas in document view 2013-03-19 15:47:36 +01:00
Jan Steemann 5405e3bc22 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-19 14:54:00 +01:00
Jan Steemann 281710652c prevent some errors in front end 2013-03-19 14:53:43 +01:00
Michael Hackstein 63da881aab Removed unused debug output 2013-03-19 14:39:57 +01:00
Michael Hackstein 95af25c9ce fixed inconsistent searchbar and inital load error 2013-03-19 14:26:20 +01:00
Jan Steemann 4fc2fe5635 fixed broken route 2013-03-19 14:10:29 +01:00
Jan Steemann 186e04b159 issue #451 2013-03-19 14:04:25 +01:00
Jan Steemann 834706f9e7 fixed typo in labels 2013-03-19 13:56:07 +01:00
Jan Steemann 1a387513da fixed labels, set focus when creating new collection 2013-03-19 13:54:51 +01:00
Jan Steemann 446fc2fc5c issue #447 2013-03-19 13:45:44 +01:00
Jan Steemann 00fbda082d fixed frontend bugs 2013-03-19 13:40:26 +01:00
Michael Hackstein 0ee61aae41 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-19 11:40:53 +01:00
Michael Hackstein bef8d02a95 Fixed bug causing to request centrality over and over again if it is equal to 0 2013-03-19 11:40:30 +01:00
Jan Steemann f107370ac3 fixed pretty printing 2013-03-19 11:11:10 +01:00
Michael Hackstein 8858521f04 Adapted graphViewer to new adapter interface 2013-03-19 10:50:30 +01:00
Michael Hackstein efe496b1e7 Removed unused folders 2013-03-19 10:46:35 +01:00