1
0
Fork 0
Commit Graph

514 Commits

Author SHA1 Message Date
Jan Steemann b6925a7b7b transactions 2013-04-11 19:06:55 +02:00
Frank Celler f373615268 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	arangod/V8Server/v8-actions.cpp
2013-04-10 21:47:51 +02:00
Frank Celler 828b939053 fixed isolates, made ArangoError internal 2013-04-10 21:22:09 +02:00
Jan Steemann 5f5ee7e5e1 added error code 2013-04-10 08:50:13 +02:00
Michael Hackstein 42e7e37aaa Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-09 10:43:29 +02:00
Michael Hackstein 744f53d0bf GraphViewer: ArangoAdapter now also encapsulates attributes in _data 2013-04-09 10:43:11 +02:00
Michael Hackstein ba63620fd6 GraphViewer: JSON Adapter now encapsulates the data of nodes in _data object. Required to avoid problems with d3 internal attributes and key/values in the DB 2013-04-09 10:19:55 +02:00
Michael Hackstein ebdbd7eff8 GraphViewer: Added Dispatcher + DispatcherUI tests to runnerAll-Tests 2013-04-08 22:11:34 +02:00
Michael Hackstein 3b9c59af97 GraphViewer: Dispatcher UI almost finished. Editing of Nodes is not working yet as d3-attributes are displayed in addition to stored attributes 2013-04-08 22:04:03 +02:00
Michael Hackstein 5212b47cff GraphViewer: Tests for DispatcherUI finished 2013-04-08 18:33:11 +02:00
Frank Celler 683284340e fixed typo 2013-04-08 17:02:54 +02:00
Michael Hackstein 15a5f84fe3 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-08 14:57:09 +02:00
Michael Hackstein 937a698821 GraphViewer: JSLintified Events 2013-04-08 13:17:33 +02:00
Michael Hackstein 9cb974531b GraphViewer: EventDispatchion for edge-creation finished 2013-04-08 13:11:43 +02:00
Michael Hackstein 33abdae1f0 GraphViewer: Started implementing EventDispatcher for edge. All works except Creation of Edges. Scheme will now be changed from one function (create) to three (start, finish and cancel) 2013-04-08 12:01:45 +02:00
Michael Hackstein c9d0115594 GraphViewer: EventDispatcher now offers a better binding of events, the result of the Dispatcher can now be directly bound to buttons/nodes/edges, instead of requiring a function around that encapsulates parameters 2013-04-08 11:39:19 +02:00
Michael Hackstein a6d8eadbc2 GraphViewer: Drag-event from layouter is now piped through the eventLib, making the interface workflow more consistent 2013-04-08 09:56:51 +02:00
Michael Hackstein 922579c37b GraphViewer: Added a central class for mocked parts of the graph viewer, no functionality just useful for spies. 2013-04-08 09:39:38 +02:00
Michael Hackstein cc8560dfc7 GraphViewer: Added a rebind function to EventDispatcher, which sets the given set of events and unbinds all others 2013-04-08 09:13:38 +02:00
Frank Celler 8fc4cd77f1 fixed wrong error message 2013-04-06 23:45:58 +02:00
Frank Celler a0278476da Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	lib/Basics/StringUtils.cpp
2013-04-06 10:19:09 +02:00
Frank Celler 1d7ee507e2 added TRI_ERROR_ARANGO_DOCUMENT_KEY_MISSING 2013-04-06 10:18:29 +02:00
Michael Hackstein c59f39c1c9 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-05 17:24:09 +02:00
Michael Hackstein ea07fbb73e Frontend: Fixed a naming mistake mount -> install 2013-04-05 17:23:44 +02:00
Heiko Kernbach 9f840edcf2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-04-05 17:22:06 +02:00
Heiko Kernbach 839cdfc57b merge conflict 2013-04-05 17:21:58 +02:00
Michael Hackstein 6c2a260b83 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-05 17:15:21 +02:00
Michael Hackstein a2ca984bdb Frontend: Now Loaded App can be installed via the frontend 2013-04-05 17:14:56 +02:00
Heiko Kernbach 7d9e019d71 css changes 2013-04-05 16:19:02 +02:00
Michael Hackstein c3855a3eab Frontend: The aardvark now supports thumbnails 2013-04-05 15:53:50 +02:00
Jan Steemann 3a8783b26a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-04-05 15:35:23 +02:00
Jan Steemann edf513551f error handling 2013-04-05 15:35:08 +02:00
Michael Hackstein a8f8df00f9 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-05 14:49:48 +02:00
Frank Celler b50bc6dd24 added thumbnail 2013-04-05 14:48:15 +02:00
Michael Hackstein a5f8b6fe92 Front-end: Changed documentation overview, basePath is now determined and apps with long pathes are shown, however only last segment of path is displayed, might be a Swagger issue 2013-04-05 14:38:52 +02:00
Jan Steemann 0d1076211a fixed memleak 2013-04-05 14:26:58 +02:00
Jan Steemann ed10d9b6aa AQL user functions 2013-04-05 12:50:44 +02:00
Michael Hackstein ab45b4aa3d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-05 09:40:46 +02:00
Michael Hackstein 8fae6f2485 GraphViewer: Defined spies for Toolbox creation tests 2013-04-05 08:18:40 +02:00
Michael Hackstein 268fe16056 GraphViewer: Started implementing tests for the EventToolbox. Right now only existance of buttons is checked, and correct actions are triggered. However correctness of outcome is not yet checked 2013-04-05 08:11:05 +02:00
Michael Hackstein d1e01f49c1 GraphViewer: All events can be unbound now for Nodes and Edges 2013-04-05 07:15:38 +02:00
Michael Hackstein dc5b9c1385 GraphViewer: Added a test to unbind all events 2013-04-05 06:53:08 +02:00
Frank Celler 0ea748488b fixed url 2013-04-04 23:19:03 +02:00
Michael Hackstein 790ad37020 GraphViewer: Removed unused variable 2013-04-04 17:48:56 +02:00
Michael Hackstein ed827d77cd GraphViewer: Added/Tested default colouring of Edges and nodes 2013-04-04 16:36:16 +02:00
Michael Hackstein 2e43dbfb14 Aardvark: Adapted new Foxx interface 2013-04-04 15:56:02 +02:00
Michael Hackstein 8a9c58f6a4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-04 14:14:47 +02:00
Jan Steemann 1417def879 disallow create/drop/rename operations inside transactions 2013-04-04 09:41:44 +02:00
Michael Hackstein 2affe643d3 GraphViewer: Enlarged the Arrow Pointer, has to be changed to be relative to nodesize 2013-04-04 01:04:58 +02:00
Michael Hackstein 159c55be39 GraphViewer: EdgeColouring tested in demo.html, again the label is set to black forcefully 2013-04-04 00:46:41 +02:00