Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,259 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

612 Commits

Author SHA1 Message Date
Michael Hackstein cd230cc1cb GraphViewer: Patch Edge/Node now uses encapsulated _data property 2013-04-09 11:27:05 +02:00
Michael Hackstein 24d452c7d0 GraphViewer: Now editing of Nodes/Edges also works (yet missing: Checks for key values, add additional key/value pairs 2013-04-09 11:22:21 +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
Michael Hackstein c208a94f52 GraphViewer: Implemented UI Dialogs for edge colouring 2013-04-04 00:30:54 +02:00
Michael Hackstein f5c523ea56 GraphViewer: Implemented test for edge colouring dialogs 2013-04-04 00:22:24 +02:00
Michael Hackstein 8ab12a75b5 GraphViewer: Node colouring added to the demo.html. Decided to forcefully set the TextColour to black, as it inherits the user defined colour-scheme otherwise and this gets unreadable quite fast 2013-04-04 00:16:49 +02:00
Michael Hackstein 8a0b79b429 GraphViewer: NodeShaper now creates UI elements to change the colouring 2013-04-03 18:06:35 +02:00
Michael Hackstein 5c9c408cb4 GraphViewer: Added tests for Node-Colour change controls 2013-04-03 17:48:12 +02:00
Michael Hackstein c62230782a GraphViewer: EdgeShaper now supports colouring by attribute value 2013-04-03 17:36:59 +02:00
Michael Hackstein f08392f592 GraphViewer: NodeShaper now supports colouring by attribute value 2013-04-03 17:27:13 +02:00
Michael Hackstein e23506662f GraphViewer: Implemented ColourMapper 2013-04-03 17:15:01 +02:00
Michael Hackstein b2750383f4 GraphViewer: Colour Mapper now returns colours directly, unfortunately the pre definition of colours in the svg does not work at all... 2013-04-03 16:33:02 +02:00
Michael Hackstein a7d9d161cb GraphViewer: Added Test for ColourMapper.reset() 2013-04-03 16:12:52 +02:00
Michael Hackstein 3ccd7a5b7b GraphViewer: Added ColourMapper and implemented tests. This class should return colours for based on attribute values 2013-04-03 16:07:02 +02:00
Michael Hackstein fa2192672a GraphViewer: Node colouring has now 2 options, single colour and colour based on expanded or not 2013-04-03 15:19:35 +02:00
Michael Hackstein 02a94c1bcd GraphViewer: Edge colouring has now 2 options, single colour and gradient colour. However gradient works only with a hack and only on Safari due to SVG problems 2013-04-03 15:05:35 +02:00
Michael Hackstein 67cd95912d GraphViewer: Added tests for colouring of Nodes/Edges 2013-04-03 14:33:31 +02:00
Michael Hackstein de5539fa5c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-03 09:32:29 +02:00
Michael Hackstein 1b9b0daaa2 GraphViewer: Added test for Edge colouring 2013-04-03 07:52:43 +02:00
Michael Hackstein db3da09be9 GraphViewer: Changed rendering of edges, they are now translated and rotated instead of giving x1/y1 and x2/y2. This works much better for labels 2013-04-03 06:54:10 +02:00
Frank Celler f810711a79 FreeBSD port 2013-04-02 18:43:10 +02:00
Frank Celler 711b5884d3 Merge branch 'devel' of github.com:triAGENS/ArangoDB into HEAD 2013-04-02 17:47:33 +02:00
Frank Celler 42b92c794f fixed error messages and tests 2013-04-02 17:46:19 +02:00
Michael Hackstein 840a85496a GraphViewer: Embedded the Edges in an own g element 2013-04-02 16:08:48 +02:00
Frank Celler 3512fa6ff0 fixed error handling 2013-04-02 15:00:55 +02:00
Michael Hackstein d5756e0436 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-02 11:31:47 +02:00
Michael Hackstein f5a018b6e4 GraphViewer: Implemented UI Button creation for the EdgeShaper 2013-04-02 11:31:17 +02:00
Michael Hackstein b2f90348a8 GraphViewer: Moved further UI funcitons to the Helper 2013-04-02 11:16:58 +02:00
Michael Hackstein 5f4a9a76d2 GraphViewer: Added test for EdgeShaper UI elements 2013-04-02 11:10:57 +02:00
Michael Hackstein 60572c4889 GraphViewer: Changed UI creation, common parts are now exported to a helper function for reusability 2013-04-02 11:07:18 +02:00
Michael Hackstein c967c27a27 GraphViewer: Added Marker-Shape to EdgeShaper, and fixed a jQuery-Selector bug, if _id contains special symbols 2013-04-02 10:44:43 +02:00
Michael Hackstein fdd630f104 GraphViewer: Fixed Demo, removed unused leftover functions 2013-04-02 09:59:09 +02:00
Thomas Richter f876e30816 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-04-02 09:38:45 +02:00
Michael Hackstein 954e54da53 GraphViewer: EventDispatcher now reacts to new EdgeShaper interface 2013-04-02 09:27:35 +02:00
Michael Hackstein b1a890a609 GraphViewer: Moved EdgeShaper interface to the same as NodeShaper now 2013-04-02 09:23:44 +02:00
Michael Hackstein 6c03247b2b GraphViewer: Adapted Tests for EdgeShaper, this will be moved to the same interface as NodeShaper 2013-04-02 08:58:27 +02:00
Michael Hackstein 8d4b9b557a GraphViewer: Updated licence to 2013 2013-04-02 07:11:39 +02:00
Michael Hackstein 861039ee85 GraphViewer: Fixed binding to update event. All Tests pass again yeah 2013-04-02 07:08:50 +02:00
Michael Hackstein 79ca70a1e7 GraphViewer: Fixed single node reshape 2013-04-02 06:59:35 +02:00
Michael Hackstein deb9bd05e9 GraohViewer: Implemented first button: Switch NodeLayout to Circle 2013-04-01 13:36:56 +02:00
Michael Hackstein a0b7f7e73c GraphViewer: Added first sepcs for the UI-Generator of the NodeShaper 2013-04-01 11:46:39 +02:00
Michael Hackstein 443a2bb766 GraphViewer: Fix for NodeShaper 2013-04-01 11:02:05 +02:00
Frank Celler d411d14aed added generated file 2013-03-31 23:32:10 +02:00
Frank Celler 3921fd07c8 no strict for assign 2013-03-31 19:32:25 +02:00
Frank Celler 7def1cf29f Merge remote-tracking branch 'origin/feature/commonjs' into devel 
Conflicts:
	apps/aardvark/manifest.json
	apps/aardvark/manifestComplete.json
	etc/arangodb/arangod.conf.in
	etc/relative/arangod.conf
	html/admin/js/bootstrap/module-internal.js
	js/apps/aardvark/assets/collections/foxxCollection.js
	js/apps/aardvark/assets/index.html
	js/apps/aardvark/assets/lib/backbone.js
	js/apps/aardvark/assets/lib/jquery.js
	js/apps/aardvark/assets/lib/underscore.js
	js/apps/aardvark/assets/models/foxx.js
	js/apps/aardvark/assets/views/foxxListView.js
	js/apps/aardvark/assets/views/foxxView.js
	js/apps/aardvark/index.html
	js/apps/aardvark/manifest.json
	js/common/bootstrap/module-internal.js
 2013-03-31 12:46:16 +02:00
Frank Celler 7031210a53 fixed browser 2013-03-31 00:10:48 +01:00
Frank Celler e1125421a9 added generated 2013-03-31 00:10:48 +01:00
Frank Celler 1467b78676 cleanup of internal, fs, console 2013-03-31 00:10:48 +01:00
Michael Hackstein 2cdd630d54 Adapted EventDispatcher to new NodeShaper Interface 2013-03-30 13:01:33 +01:00
Michael Hackstein e63d3b7133 GraphViewer: Update Event now bound differently to nodes. 2013-03-30 12:53:50 +01:00
Michael Hackstein 1507b32314 GraphViewer: Added an additional test for label switching 2013-03-30 12:51:05 +01:00
Michael Hackstein e23edd007d GraphViewer: Everything within NodeShaper is now replaceable on the fly (f.e. switch between displayed labels on button click) 2013-03-30 12:47:30 +01:00
Michael Hackstein 37997691a1 Removed unused aardvark assets 2013-03-29 13:15:54 +01:00
Michael Hackstein 17be310972 Append newlines to the end of lib files in order to avoid concatinated keywords 2013-03-29 13:13:22 +01:00
Jan Steemann a4bab2b264 framed 2013-03-29 02:01:34 +01:00
Jan Steemann 0807016cf5 printTable 2013-03-29 01:53:16 +01:00
Jan Steemann 82cbde7886 printTable() 2013-03-29 01:31:23 +01:00
Frank Celler 2ed6b0145f changed app-path and dev-app-path to be just one directory 2013-03-28 21:48:52 +01:00
Jan Steemann 096e41ad0f fixed cross-collection navigation 2013-03-28 20:58:34 +01:00
Jan Steemann 8e14661404 added sorting options for collections view in web interface 2013-03-28 20:41:57 +01:00
Jan Steemann fed6d0a64e allow using multiple searchwords 2013-03-28 20:20:19 +01:00
Michael Hackstein 0283ec4525 Frontend: Templates are now requested using a relative path 2013-03-28 16:02:25 +01:00
Michael Hackstein 34c73aa876 Arrdvark-Frontend: Adapted hardcoded image-pathes 2013-03-28 15:11:18 +01:00
Lucas Dohmen f1b5f20fab Foxx: Also using ArangoDB Mimetype Lookup for the other way around 2013-03-28 14:01:04 +01:00
Jan Steemann c3b0caaca8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-28 13:49:09 +01:00
Jan Steemann b04c33f1ec generate reverse map of mimetypes 2013-03-28 13:48:57 +01:00
Michael Hackstein 4c2991be98 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-28 13:42:51 +01:00
Jan Steemann a53a6afa92 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-28 13:27:27 +01:00
Jan Steemann ac2b7ec470 removed dead code 2013-03-28 13:27:11 +01:00
Lucas Dohmen 8261a46577 Added a Mimetype 2013-03-28 13:25:30 +01:00
Michael Hackstein e14f38e27c Frontend: Renamed Swagger to Documentation 2013-03-28 12:57:36 +01:00
Michael Hackstein d115a56485 Frontend: Changed routes to new schema: Available: Foxx known to the Arango, Installed: Foxx mounted at some path 2013-03-28 12:39:27 +01:00
Michael Hackstein acc7d2ebdd Added Save button, disabled all fields that do not yet work 2013-03-28 12:38:33 +01:00
Michael Hackstein e952cca6dc Frontend: Adapted aardvark to offer activate/deactivate and uninstall, yet only uninstall is implemented in backend 2013-03-28 12:29:33 +01:00
Michael Hackstein 79659893aa Frontend: Fixed an inconsistency. If a Modal-Dialog was open and the URL was changed manually the Dialog is kept. When closing the dialog the URL was changed but there was no redirection. Now redirection is triggered 2013-03-28 11:10:13 +01:00
Michael Hackstein 0884078a25 mend 2013-03-28 10:42:19 +01:00
Michael Hackstein ccc90d35ce Frontend: Added other Route to Modal foxx edit view 2013-03-28 10:41:58 +01:00
Michael Hackstein 93557543f0 Frontend: Added viewController for model Foxx-Edit view 2013-03-28 10:32:45 +01:00
Michael Hackstein de21a03908 Frontend: Template for modal edit Foxx view 2013-03-28 10:15:33 +01:00
Michael Hackstein b458b0e233 Frontend: Replaced Jans findWhere replacement with the correct function, which is available after update of backbone 2013-03-28 09:54:56 +01:00
Michael Hackstein 10f4a0f488 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-28 09:51:32 +01:00
Michael Hackstein 99e8b7118d Frontend: Upgraded Backbone to version 1.0.0, started implementing edit of installed foxxes 2013-03-28 09:51:11 +01:00
Jan Steemann af4cb50e59 issue #464 2013-03-28 09:38:51 +01:00
Michael Hackstein 8e52bc6143 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-28 09:06:19 +01:00
Michael Hackstein 5c1a0337fa Frontend: Added Edit-Icon to running foxxes, but no functionality yet, Foxxes are now reloaded whenever application is opened, no reload of Admin-Interface necessary anymore. 2013-03-27 19:30:18 +01:00
Michael Hackstein fa28f7ddc6 Frontend: Added badge for Foxxes 2013-03-27 19:15:04 +01:00
Michael Hackstein 26a9e5527b Frontend: Removed the ugly bar below the swagger documentation 2013-03-27 18:58:37 +01:00
Michael Hackstein 064d93f822 Applications Overview: Added a placeholder icon, will be replaced as soon as real icons are implemented 2013-03-27 18:53:20 +01:00
Michael Hackstein f081a8f50c Removed old unused views 2013-03-27 18:15:11 +01:00
Jan Steemann f3798dcf02 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-27 18:14:47 +01:00
Michael Hackstein fa3cf90321 Removed old unused views 2013-03-27 18:14:37 +01:00
Jan Steemann 0de9252f57 issue #463 2013-03-27 18:14:34 +01:00
Michael Hackstein bebc93d12f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-27 15:54:18 +01:00
Jan Steemann db432bebac Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-27 15:35:33 +01:00
Michael Hackstein eb5e181bbe Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-27 15:35:26 +01:00
Jan Steemann a67e97978e set highlighting mode to JSON for query results 2013-03-27 15:35:14 +01:00
Michael Hackstein eda54bef50 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-27 15:29:59 +01:00
Frank Celler 3ea5fbe121 added dev 2013-03-27 15:28:43 +01:00
Frank Celler 440170c144 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-27 15:05:22 +01:00
Frank Celler 7a6cdcf9b1 changing to app-id 2013-03-27 15:05:08 +01:00
Jan Steemann 07483f1274 removed location.hash 2013-03-27 15:01:17 +01:00
Michael Hackstein f90e9c5094 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-27 14:59:03 +01:00
Michael Hackstein 1859958251 Frontend: Adaption of swagger to display the Foxxes, not yet finished 2013-03-27 14:58:40 +01:00
Jan Steemann 20b6cc546a issue #454 2013-03-27 14:57:02 +01:00
Thomas Richter f77fa798c8 generateArangoshRun db._collections() error fixed 2013-03-27 14:37:28 +01:00