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 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
Michael Hackstein 0255a50b44 Frontend: Optical makeup of foxx overview 2013-03-27 13:03:21 +01:00
Michael Hackstein bb7a9f04bb Frontend: FoxxLists are now displayed in the interface (navigation still hidden) 2013-03-27 12:55:50 +01:00
Michael Hackstein 66e812ef30 Added new views to navigationbar 2013-03-27 12:12:06 +01:00
Michael Hackstein eb64994354 Frontend: Added the new views to the router 2013-03-27 12:10:33 +01:00
Michael Hackstein 23de5ec092 Added views for foxxes that display either mounts or apps 2013-03-27 12:06:31 +01:00
Frank Celler d8159a990e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-27 11:32:52 +01:00
Frank Celler be971602f2 added install and uninstall of FOXX apps 2013-03-27 11:32:39 +01:00
Michael Hackstein 6eb711cbd8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-27 11:10:10 +01:00
Michael Hackstein 021f75980a GraphViewer: Delete event for nodes now removes all edges adjacent to this node (client-side invokation) 2013-03-27 11:09:44 +01:00
Jan Steemann 2819277841 fixed printing 2013-03-27 10:49:39 +01:00
Jan Steemann 7a70cb3ed3 use property 2013-03-27 10:43:58 +01:00
Jan Steemann 59b6ef99ae finalised mimetypes 2013-03-27 10:38:34 +01:00
Jan Steemann 3fd4fd984b mimetypes w/ charsets 2013-03-27 10:31:30 +01:00
Jan Steemann e63ba48f92 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-27 10:12:14 +01:00
Jan Steemann 909c316e22 added mimetype generation file 2013-03-27 10:11:56 +01:00
Michael Hackstein a52f7debdf Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-27 09:13:01 +01:00
Michael Hackstein f6c133fa54 Frontend: Layout fix for Applications overview 2013-03-27 09:12:46 +01:00
Jan Steemann 9273ddcbad issue #461: close dialogue in case nothing changes for an unloaded collection 2013-03-27 08:55:00 +01:00
Michael Hackstein bbd2a20636 GraphViewer: JSLintified 2013-03-26 19:35:14 +01:00
Michael Hackstein fc59b21be7 Frontend: Fixed another issue with Swagger optic, swagger info-divs are not to large anymore 2013-03-26 19:29:15 +01:00
Michael Hackstein 0aba86f719 Frontend: Applications and Swagger now have the Headerbar 2013-03-26 17:24:26 +01:00
Michael Hackstein 1c9d3a482d Frontend: Foxxes are now collected from a relative path 2013-03-26 15:56:53 +01:00
Michael Hackstein 2f7bd44d45 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-26 15:33:17 +01:00
Michael Hackstein 158f7a3090 Frontend: Adapted Applications overview to first specification of _aal 2013-03-26 15:33:02 +01:00
Jan Steemann ac7c7fa561 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-26 14:40:55 +01:00
Jan Steemann 0616635e0e issue #461, #462 2013-03-26 14:40:26 +01:00
Michael Hackstein 61dbc4f9c9 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-26 14:36:59 +01:00
Michael Hackstein 3c96e947ce Front-End: Added new jquery libs (1.8.3 -> 1.9.1) however they are not loaded due to conflicts with the web shell 2013-03-26 14:36:46 +01:00
Michael Hackstein feb9590a1f Front-End: Added new jquery libs (1.8.3 -> 1.9.1) however they are not loaded due to conflicts with the web shell 2013-03-26 14:35:56 +01:00
Jan Steemann 3bb251000c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	lib/V8/v8-utils.cpp
 2013-03-26 14:13:41 +01:00
Jan Steemann 1492118545 added test cases for "fs" module 2013-03-26 14:09:20 +01:00
Michael Hackstein 4d32fb204b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-26 14:01:47 +01:00
Frank Celler a8d9a14e7d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-26 13:58:20 +01:00
Frank Celler 557184631d more fox-manager, added files section 2013-03-26 13:58:00 +01:00
Michael Hackstein 7e8607ffed GraphViewer: Fixed Bug in load Graph by Attribute. Now this works and can be used in demo 2013-03-26 13:56:00 +01:00
Michael Hackstein e2068ece03 Admin Interface: Moved invisibility of Applications to CSS-file 2013-03-26 12:48:43 +01:00
Michael Hackstein 99e8eee458 Fixed Swagger pathes to logos/icons 2013-03-26 10:52:04 +01:00
Michael Hackstein b6b57183b9 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-26 10:28:38 +01:00
Michael Hackstein 3952d6c2ce Admin-UI: Added the complete swagger output under applications/swagger 2013-03-26 10:28:27 +01:00
Jan Steemann 95efb14e7f generated file 2013-03-26 10:09:11 +01:00
Frank Celler 0f6e48a38b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/server/modules/org/arangodb/foxx.js
 2013-03-26 10:01:39 +01:00
Michael Hackstein 0f473605c0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-26 09:40:37 +01:00
Thomas Richter 0e74ef7911 work in progress 2013-03-26 09:27:24 +01:00
Michael Hackstein 0da98bd95c Removed Mac specific file 2013-03-26 08:05:29 +01:00
Michael Hackstein 7a08751f4e Renamed Aardvark -> Applications which maybe a bit more understandable for outsiders 2013-03-26 08:04:00 +01:00
Michael Hackstein e6dac39032 GraphViewer: Events can now be added to edges during runtime 2013-03-26 07:52:32 +01:00
Michael Hackstein 85420d7172 GraphViewer: Nodes are now correctly reshaped if new events are bound 2013-03-25 20:43:13 +01:00
Michael Hackstein d8c3e7f464 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-25 16:15:15 +01:00
Michael Hackstein 735e891801 Fixed the issue with multiple edit attribute-fields at the same time #456 2013-03-25 16:15:06 +01:00
Jan Steemann e3ed240e89 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-25 15:53:17 +01:00
Jan Steemann 0e6c21e4e7 removed NEW_BORN collection status in server 2013-03-25 15:51:42 +01:00
Michael Hackstein ddf1d261ea Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-25 15:41:08 +01:00
Michael Hackstein e4aceec3e6 Added a helper class to simulate mouse events in test cases, Added a test for redrawing of nodes whenever new events are bound 2013-03-25 15:40:18 +01:00
Jan Steemann 122c60055a issue #461 2013-03-25 15:09:31 +01:00
Michael Hackstein d776b5b8f4 Aardvark is now hidden 2013-03-25 14:55:09 +01:00
Frank Celler 5e473ad6df Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-25 14:10:20 +01:00
Frank Celler 877066392e foxx manager cleanup 2013-03-25 14:10:10 +01:00
Michael Hackstein 202381394e GraphViewer: Events can now be bound to edges 2013-03-25 12:26:45 +01:00
Michael Hackstein 3978441f4c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-25 12:24:16 +01:00
Jan Steemann 60fa94e5b4 fixed errors in arangosh (browser) 2013-03-25 12:00:15 +01:00
Michael Hackstein c518c8dab8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-25 08:30:34 +01:00
Michael Hackstein 45a5d4f79f Added Aarkward views + css + everything to Admin Interface, backend App is still returning fake data 2013-03-24 18:31:14 +01:00
Jan Steemann 9cbd8e4707 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-24 18:13:26 +01:00
Jan Steemann 124d7cb29f fixed file uploads 2013-03-24 18:13:13 +01:00
Michael Hackstein c35126a9ab Added the views for aarkward and swagger 2013-03-24 17:05:11 +01:00
Michael Hackstein f8ada532fd Added buttons for aarkvard and swagger in the navbar 2013-03-24 16:51:36 +01:00
Frank Celler 0a488cd84b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-24 15:03:16 +01:00
Frank Celler e3de563668 requiresLibs and requiresModels 2013-03-24 15:03:01 +01:00
Jan Steemann 071144ecc0 temporary file functons 2013-03-24 14:32:09 +01:00
Jan Steemann f58e1a4b9a sendFile 2013-03-24 11:44:29 +01:00
Frank Celler 0f16938a0b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-24 10:59:00 +01:00
Jan Steemann a118bb19f6 clean up 2013-03-24 10:48:15 +01:00
Frank Celler bc0d1180fb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/client/modules/org/arangodb/foxx.js
	js/common/bootstrap/module-internal.js
 2013-03-24 10:45:26 +01:00
Michael Hackstein e05ee003c4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-24 08:38:00 +01:00
Michael Hackstein b4b871bff7 In Documents Overview now the _key values are also clickable. Issue #458 2013-03-24 01:17:13 +01:00
Jan Steemann 2c279d9c4f fixed jslint errors 2013-03-24 01:14:58 +01:00
Jan Steemann 37f364e70e added internal.download() 2013-03-24 01:04:26 +01:00
Michael Hackstein dc7707164c Collection Selection now fires backbone event and no faked link. CollectionNames are now clickable to select the text. Issue #458 2013-03-24 00:42:47 +01:00
Michael Hackstein d23404e1bc Removed debug ooutput 2013-03-24 00:33:49 +01:00
Michael Hackstein fd39c9ffeb Add new Collection is now first Option, Issue #450 2013-03-24 00:08:37 +01:00
Michael Hackstein 78f98a20ab When deleting a docement the Total Number of documents counter is updated correctly Issue #460 2013-03-24 00:03:09 +01:00
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