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

753 Commits

Author SHA1 Message Date
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
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
Jan Steemann 4173e5a8b5 removed temp file 2013-03-19 10:36:35 +01:00
Jan Steemann 8f8598ed1e new web interface 2013-03-19 10:35:20 +01:00
Jan Steemann 8155718a4c new web interface 2013-03-19 10:33:23 +01:00
a-brandt ad90a65c3a deleted 2012 from copyright message 2013-03-13 16:53:06 +01:00
Jan Steemann 0206076fda stringifying collections should honor colors 2013-03-08 17:38:20 +01:00
Jan Steemann 2b97f97765 issue #212 2013-03-08 12:18:32 +01:00
Jan Steemann fdcbbf6cfd derived file 2013-03-07 18:12:33 +01:00
Jan Steemann d1edc4ddb2 added replaceByExample() and updateByExample() methods 
added optional "limit" parameter for removeByExample() method
 2013-02-19 11:38:55 +01:00
Jan Steemann e760627c83 closed issue #413 
the problem seems to have been caused by issue #410
 2013-02-18 16:46:24 +01:00
Frank Celler 3f9869ab27 fixed issue #350: XMLMISSING in wiki references 2013-02-10 16:11:35 +01:00
Jan Steemann a4eb737dbe fixed some jslint warnings 2013-02-06 11:46:59 +01:00
Jan Steemann cae80dfa45 applied Franks fix 2013-02-05 14:08:25 +01:00
Jan Steemann b451fd5f0a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-02-04 23:05:42 +01:00
Frank Celler e66a466966 fixed gui 2013-02-02 16:09:15 +01:00
Frank Celler 31baa7ae70 added GraphArray to make calls easier - no map needed 2013-02-02 15:57:03 +01:00
Jan Steemann 452b9c3bc2 revmoed tabs 2013-02-01 17:07:23 +01:00
Jan Steemann 6c64dbd105 some more cleanup 2013-02-01 15:29:37 +01:00
Jan Steemann 992a035049 added derived file 2013-01-30 10:03:21 +01:00
Jan Steemann e46417bba1 fixed a typo 2013-01-30 09:44:23 +01:00
Frank Celler 62e00c81bf fixed traversal to be independent of vertex/edge structure 2013-01-29 17:49:23 +01:00
Frank Celler 307b125035 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/actions/system/api-graph.js
 2013-01-29 14:17:13 +01:00
Frank Celler 6bd4bc5525 client side graph 2013-01-29 14:15:35 +01:00
Jan Steemann 6e81f7f6fa return collection ids, cursor ids, and index ids as stringified integers, too 2013-01-28 20:11:29 +01:00
Jan Steemann 1de10d6ea4 make collection id be returned as a string so it cannot overflow 2013-01-28 18:30:48 +01:00
Jan Steemann 64377fb161 honor waitForSync parameter from arangosh, too 2013-01-25 11:47:43 +01:00
Jan Steemann 17530a5e45 added number of shapes in return value of figures() 2013-01-25 10:19:02 +01:00
Frank Celler 4261bc8b7f getEdges and anybound 2013-01-23 16:14:57 +01:00
Jan Steemann 4b433a511a added followEdges property for AQL TRAVERSE() function 2013-01-23 11:28:33 +01:00
Jan Steemann 7c5203cfea added documentation and test cases for db.collection.removeByExample 2013-01-22 19:20:11 +01:00
Jan Steemann 532bf0eef8 adding derived file 2013-01-21 16:55:14 +01:00
Jan Steemann 3998fd34de added derived file change 2013-01-21 12:53:37 +01:00
Jan Steemann eca5ea177f issue #361 2013-01-21 10:53:50 +01:00
Jan Steemann 068eaf0dd6 derived file 2013-01-18 17:55:45 +01:00
Frank Celler 784302b19d fixed jslint warnings 2013-01-18 15:51:51 +01:00
Frank Celler dab85633dd fixed WeakDictionary 2013-01-18 13:27:40 +01:00
Frank Celler 75765bb939 fixed browser shell 2013-01-18 12:34:29 +01:00
Frank Celler 53487c8d62 fixed includes and help 2013-01-18 10:56:46 +01:00
Frank Celler 61c6433c1c fixed building of html/admin/js files 2013-01-18 10:27:25 +01:00
Jan Steemann 52309cf188 fixed tests & segfault during tests 2013-01-18 00:58:14 +01:00
Jan Steemann d5cd3ee5d1 adding derived js 2013-01-14 00:58:48 +01:00
Frank Celler 128cb67c8b Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	Documentation/Examples/shell-read-document-bad-handle
	Makefile.in
	arangod/Documentation/shell-document.dox
	configure
	js/actions/system/api-collection.js
	js/actions/system/api-index.js
	js/actions/system/api-system.js
	js/common/bootstrap/modules.js
	js/common/bootstrap/print.js
	js/server/ArangoCollection.js
	lib/V8/v8-utils.cpp
 2013-01-09 15:30:21 +01:00
Frank Celler fb881581e1 fixed GUI 2013-01-06 01:31:32 +01:00
Frank Celler 3826a4603e removed print.js 2013-01-06 00:23:40 +01:00
Jan Steemann f2ceb8d734 some more layout frickeling 2013-01-03 17:07:22 +01:00
Jan Steemann a63ba7add4 a bit of UI frickeling 2013-01-03 16:41:22 +01:00
Jan Steemann 9bb15dcf45 issue #337 2013-01-02 18:56:08 +01:00
Jan Steemann 1cd0404798 updated CHANGELOG 2013-01-02 18:52:45 +01:00
Jan Steemann 300289d662 issue #327 2013-01-02 11:57:48 +01:00
Jan Steemann 2dbece18e2 issue #327 2013-01-02 11:51:14 +01:00
Jan Steemann b48d039e3f issue #327 2012-12-27 18:26:04 +01:00
Jan Steemann e28d9b9a93 issue #327: fixed javascript parse errors 2012-12-27 18:05:02 +01:00
Jan Steemann fb4afd0353 fulltext index 2012-12-10 12:16:48 +01:00
Jan Steemann 1ffa8e702c more tests and documentation for fulltext indexes 2012-12-05 16:12:33 +01:00
Jan Steemann 30d46e87ad improved error message 2012-12-03 10:14:11 +01:00
Jan Steemann ccae675b09 improved error message 2012-12-03 10:12:49 +01:00
Jan Steemann 634f20ed4e issue #307 2012-12-01 01:26:37 +01:00
Jan Steemann a36846f365 issue #307 2012-12-01 01:10:40 +01:00
Jan Steemann bb8709a380 adjusted collection API 2012-11-30 23:55:19 +01:00
Jan Steemann f07e2c8005 test 2012-11-30 10:02:27 +01:00
Jan Steemann 58f330fa5e test 2012-11-30 10:00:34 +01:00
Jan Steemann bc1cf800d0 issue #304 2012-11-30 01:45:32 +01:00
Jan Steemann b12f4d7e2d issue #304 2012-11-30 01:40:40 +01:00
Jan Steemann 9c6e5c6102 issue #301 2012-11-29 20:57:54 +01:00
Jan Steemann 0791934893 issue #301 2012-11-29 20:53:54 +01:00
Jan Steemann cbad6b526a make collections accesible via name instead of id. 
this allows using the collection name instead of ids in _from, _to, _id etc.
 2012-11-28 13:16:15 +01:00
Frank Celler 249492a89c Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	CHANGELOG
	Documentation/Manual/GlossaryCollectionName.md
	Documentation/Manual/NewFeatures11.md
	Documentation/UserManual/FirstStepsArangoDB.md
	VERSION
	arangod/Documentation/api-blueprints.dox
	arangod/HashIndex/hasharray.c
	arangod/RestHandler/RestVocbaseBaseHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	configure.ac
	html/admin/js/master.js
	js/server/ahuacatl.js
	js/server/arango-upgrade.js
	lib/BasicsC/voc-errors.h
	lib/V8/V8LineEditor.cpp
	lib/V8/v8-utils.cpp
 2012-11-27 12:34:58 +01:00
Jan Steemann 8ff9eefdbe fixed update in web interface 2012-11-23 10:39:11 +01:00
Jan Steemann 92b3c7c35d fixed web interface updates 2012-11-23 10:37:23 +01:00
Heiko Kernbach 797fcada47 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-11-22 18:00:17 +01:00
Heiko Kernbach ee5c6673cd removed wrong hash string 2012-11-22 18:00:09 +01:00
Heiko Kernbach 6414850cfa removed wrong hash string 2012-11-22 17:59:04 +01:00
Jan Steemann 8b8ecc40b4 mark values as read-only 2012-11-22 17:52:59 +01:00
Jan Steemann dfcc53c865 fixed web interface 2012-11-22 17:48:42 +01:00
Heiko Kernbach edeb2e2651 frontend: devel -> 1.1 2012-11-22 16:55:17 +01:00
Jan Steemann cfc8fc0a2c prettified 2012-11-22 16:35:55 +01:00
Jan Steemann 58caf59a57 fixed error messages 2012-11-22 16:04:48 +01:00
Jan Steemann 2a863836a7 fixed web interface paging etc. 2012-11-22 15:39:05 +01:00
Jan Steemann 26b847dda6 collection type 2012-11-22 13:58:19 +01:00
Jan Steemann 89a16e8e12 display collection type 2012-11-22 13:57:15 +01:00
Jan Steemann 03fa01b699 added collection type label to web interface 2012-11-22 12:23:51 +01:00
Jan Steemann 6ba6711392 added collection type label to web interface 2012-11-22 12:20:01 +01:00
Jan Steemann bda92a8c64 finally 2012-11-22 12:06:36 +01:00
Jan Steemann d7ab82b524 finally 2012-11-22 12:05:22 +01:00
Jan Steemann d762a5420e issue #282 2012-11-22 11:56:23 +01:00
Jan Steemann 362a21a1f7 issue #282 2012-11-22 11:54:02 +01:00
Jan Steemann c3602440d0 issue #282 2012-11-22 11:49:02 +01:00
Jan Steemann 5b537d221c issue #282 2012-11-22 11:17:58 +01:00
Jan Steemann 0880a1e90f issue #282 2012-11-22 11:14:31 +01:00
Jan Steemann f73364354d updaded upgrading notes in documentation 2012-11-21 19:26:33 +01:00
Jan Steemann ad855bd2bd fixed doxygen errors 2012-11-21 18:10:45 +01:00
a-brandt 9acc4c1625 added "_key" attribute 2012-11-19 16:15:04 +01:00
Heiko Kernbach 00073097eb improvements 2012-11-16 18:20:58 +01:00
Heiko Kernbach 301b5fc0d8 css fixes 2012-11-09 16:50:00 +01:00
Heiko Kernbach 68a2f2117f Revert " css fixes" 
This reverts commit 66534df409b4a34e955c1f0c24f8f9a802594d48.
 2012-11-09 16:31:19 +01:00
Heiko Kernbach 4ea6c62294 css fixes 2012-11-09 15:56:29 +01:00
Frank Celler c1b0c37480 added module org/arangodb, added convinient functions 2012-10-18 15:39:00 +02:00
Jan Steemann 2bb0407826 issue #235: fixed broken web front end 2012-10-11 21:32:15 +02:00
Jan Steemann 3b8ad1835e harmonise API between client and server versions 
this adds db._createStatement() on the server side, furthermore it provides GeneralArrayCursor.elements()
 2012-10-08 18:11:45 +02:00
Heiko Kernbach 3864f41856 changed statistics design 2012-09-17 12:48:13 +02:00
Frank Celler 55824fa836 fixed issue #197: HTML web interface calls /_admin/user-manager/session 2012-09-13 13:42:53 +02:00
Jan Steemann fc162b0413 added changed derived file 2012-09-10 18:15:31 +02:00
Heiko Kernbach f03a91fac4 removed console.log 2012-09-07 16:05:05 +02:00
Heiko Kernbach d3e96d9576 added mean statistics to bytesSent/bytesReceived 2012-09-07 15:56:43 +02:00
Heiko Kernbach 725aef286e test 2012-09-07 13:15:45 +02:00
Heiko Kernbach 588f38a2e8 fixed missing json parse 2012-09-07 12:33:02 +02:00
Jan Steemann fa5712005f removed mostly unused bogus tests 2012-09-04 17:13:34 +02:00
Jan Steemann 2c62d52c88 forgot to commit 2012-08-31 18:20:22 +02:00
Jan Steemann f70cdc8fcb issue #169: adjusted documentation 2012-08-31 18:08:36 +02:00
Jan Steemann e4e73a7a56 issue #169: missing argument for simple queries 2012-08-31 17:32:53 +02:00
Jan Steemann b8e7d5634d issue #153: edge collection should be a flag for a collection 2012-08-28 10:48:24 +02:00
Frank Celler dc858ce842 Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	html/admin/css/layout.css
	html/admin/js/master.js
 2012-08-18 09:09:44 +02:00
Frank Celler aef20e2887 Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Makefile.local
	arangod/Documentation/command-line-options.dox
	arangod/RestServer/ArangoServer.cpp
	build.sh
	html/admin/js/master.js
 2012-08-05 22:46:55 +02:00
Frank Celler ce5480ad09 removed wrong version number 2012-08-03 14:33:27 +02:00
Heiko Kernbach 97a38b243d optimized statistics 2012-08-01 12:59:13 +02:00
Heiko Kernbach b67cd9947a stat interface changes 2012-07-30 14:04:17 +02:00
Heiko Kernbach bff3727e19 dashboard changes 2012-07-27 14:07:22 +02:00
Heiko Kernbach 20845ab4ce Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into 1.1 2012-07-27 10:40:16 +02:00
Heiko Kernbach d49ab8e8cd changed dashboard 2012-07-27 10:40:09 +02:00
Frank Celler 4605fbba9a Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 
Conflicts:
	CHANGELOG
	Doxygen/Examples.ArangoDB/startup1
	Makefile.in
	arangod/Documentation/command-line-options.dox
	arangod/Documentation/install-manual.dox
	arangod/Makefile.files
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/auth.h
	arangosh/V8Client/arangosh.cpp
	html/admin/css/layout.css
	lib/Basics/ssl-helper.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/ApplicationHttpServer.h
	lib/HttpServer/HttpServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.h
 2012-07-24 22:56:03 +02:00
Heiko Kernbach 675cfa0f44 stat interface changes 2012-07-24 13:20:46 +02:00
Heiko Kernbach e2afd5d42e stat windows now complete draggable resizable 2012-07-24 10:43:21 +02:00
Heiko Kernbach 1d104db59e added resizable/dragable/pointable/hideable/ statistic functionalities 2012-07-20 13:43:37 +02:00
Heiko Kernbach e2d7293987 added statistics charts 2012-07-17 14:32:20 +02:00
Heiko Kernbach 0644bd1a6f style/colorscheme changes 2012-07-06 12:38:13 +02:00
Heiko Kernbach 206a091588 changed autogrow settings 2012-07-05 12:18:38 +02:00
Heiko Kernbach da1080d66f added autogrow function for editable textarea 2012-07-05 11:28:38 +02:00
Jan Steemann b906dd95b7 issue #121: fixed and simplified size reporting in HTML admin front end 2012-07-04 13:44:23 +02:00
Jan Steemann 4d75d9013f fixed escaping and unescaping of strings in source edit mode 2012-07-04 11:13:50 +02:00