1
0
Fork 0
Commit Graph

840 Commits

Author SHA1 Message Date
Frank Celler 57bb47185b moved try/catch block to the top of routing chain 2014-06-10 22:57:10 +02:00
gschwab 866709a434 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-10 13:30:13 +02:00
gschwab 4bcca3408a - added function to remove a single edge definition from a graph\n- some docu 2014-06-10 13:30:07 +02:00
Frank Celler 4354d3e77c added example-users 2014-06-10 13:16:05 +02:00
Michael Hackstein af735550fb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-06 16:32:35 +02:00
Michael Hackstein e13164e247 Fixed duplicated names for examples 2014-06-06 16:32:32 +02:00
gschwab dda28bc102 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-06 15:41:50 +02:00
gschwab ee46c3bdaa fixed jslint 2014-06-06 15:41:46 +02:00
gschwab 682d85a948 renaming of getIn/OutVertex to getFrom/ToVertex, documentation 2014-06-06 15:40:51 +02:00
Michael Hackstein 920cf4b7c3 Added fetchFromGithub to server-side foxx manager. Makes it a lot easier to update an already installed foxx from aardvark 2014-06-06 15:00:26 +02:00
Michael Hackstein 87b4124dfc Updated fluent AQL query interface documentation 2014-06-05 17:36:12 +02:00
scottashton e6b4fff2f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-05 16:59:53 +02:00
scottashton fe621c1723 finished measurements 2014-06-05 16:59:43 +02:00
Michael Hackstein 9e4a983d2f Simplified some general graph tests 2014-06-05 11:45:20 +02:00
Michael Hackstein bcbcf635e4 Further improvements in FluentAQL docu. It is now at least readable 2014-06-04 19:03:19 +02:00
Michael Hackstein 6da48f6ae8 Removed _.neighbors from general graph module. The way to get neighbors is to first select the set of start vertices and then execute neighbors 2014-06-04 17:17:20 +02:00
Michael Hackstein d1ef96a801 Added further docu to general graph and removed unused functions 2014-06-04 14:32:47 +02:00
Michael Hackstein d17d1908e9 Made internal attributes of general graph objects non-enumerable to hide them from the user. 2014-06-04 14:10:20 +02:00
Michael Hackstein 808a34510f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-04 13:49:53 +02:00
Michael Hackstein 44a3dd1db1 Added start of documentation move to gitbooks in general graphs 2014-06-04 13:06:31 +02:00
gschwab 73c3d9cfec Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-04 12:36:29 +02:00
gschwab 7590652d57 fixed neighbors 2014-06-04 12:36:21 +02:00
Michael Hackstein decd8e0c91 Added documentation for cursor behaviour in fluent AQL interface for graphs 2014-06-04 10:57:29 +02:00
Michael Hackstein ef94b4a9bb Added more documentation to fluent AQL interface in graphs 2014-06-04 10:47:27 +02:00
gschwab d4058d5aba Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-03 16:08:48 +02:00
gschwab 6166c6bff5 path function for fluent interface added 2014-06-03 16:08:42 +02:00
Thomas Schmidts 87e0d54f04 small changes for new documentation in code-docu 2014-06-03 14:55:39 +02:00
Michael Hackstein f0084fa116 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	js/actions/api-simple.js
2014-06-02 17:35:15 +02:00
Michael Hackstein 3e00b6aa30 Started with the documentation of the fluent interface in graphs module. Added documents accordingly. 2014-06-02 17:32:50 +02:00
gschwab 062c6649e2 remove is transactional now 2014-06-02 16:57:20 +02:00
Michael Hackstein 2ad5a1971a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-02 10:39:14 +02:00
Michael Hackstein 3ccac40d50 Added _PRINT for Graph and Fluent AQL Interface 2014-06-02 10:38:59 +02:00
gschwab 638940dd54 jslint 2014-06-02 09:46:09 +02:00
gschwab efd057f021 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-02 09:43:57 +02:00
gschwab 0169a4817d error handling 2014-06-02 09:43:55 +02:00
Jan Steemann f5eb65c96c javascript cleanup 2014-05-31 01:53:30 +02:00
Jan Steemann 603de4ba20 javascript cleanup 2014-05-31 01:44:47 +02:00
Michael Hackstein 5228984679 Fixed graph tests 2014-05-28 21:48:22 +02:00
gschwab 1fc4060899 edgeCollection may only be used in equal edge definitions 2014-05-28 15:45:03 +02:00
gschwab 8373ae3c28 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-28 13:38:12 +02:00
gschwab 59e61298ea removing an vertex will now remove its edges recursively 2014-05-28 13:38:05 +02:00
scottashton 504a167077 added commonNeighbors and commonProperties to ahuacatl and general-graph 2014-05-28 09:59:10 +02:00
Esteban Lombeyda 5cc5d16645 Bug fix: yielding correct format for option parameters 2014-05-26 15:39:47 +02:00
Jan Steemann 1351de4523 fixed invalid collection / document access 2014-05-26 15:17:36 +02:00
gschwab ec7c7659e7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-26 13:43:51 +02:00
gschwab c6c9335442 fixed check 2014-05-26 13:43:47 +02:00
Michael Hackstein 63113a84ad Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 13:10:37 +02:00
Michael Hackstein f49826afd9 Better integrated neighbors into fluent AQL of graphs. Yet missing in AQL: Give examples of target verticies 2014-05-26 13:10:23 +02:00
gschwab d01fa951c2 some error handling added 2014-05-26 11:41:35 +02:00
gschwab ba6e70f5c6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-26 09:45:17 +02:00
Frank Celler ea49ba807c fixed cluster statistics
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/showClusterView.js
2014-05-25 23:34:25 +02:00
Frank Celler ecd5641d03 added i/o stats 2014-05-25 23:11:03 +02:00
Frank Celler 0e0773a161 added gc for statistics 2014-05-25 23:10:56 +02:00
Frank Celler 4c160be4a6 remove old stats 2014-05-25 23:10:49 +02:00
Frank Celler db2a843252 fixed cluster view and history 2014-05-25 23:10:24 +02:00
Frank Celler d097755324 cleanup of statistics, new css, merge css, view and template, added long/short history, exclude all statistics collections, added clusterId
Conflicts:
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/_resizing.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/statistics.js
2014-05-25 23:10:10 +02:00
gschwab 315aa52053 jslint 2014-05-23 17:22:11 +02:00
gschwab 49253e338b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	js/common/tests/shell-general-graph.js
2014-05-23 17:15:50 +02:00
gschwab 1423197564 removing edges: recursive remove, when edge is used as vertex 2014-05-23 17:10:44 +02:00
Michael Hackstein 03c91573c1 Merged my offline state for general graphs and included all the tests, everything is green. Fluent interface is on a good way 2014-05-23 15:54:39 +02:00
scottashton f7a78f354d added tests for GRAPH_VERTICES 2014-05-23 15:08:35 +02:00
scottashton 51cc041052 added GRAPH_VERTICES 2014-05-23 14:29:53 +02:00
Michael Hackstein b59033cc94 Improved the restrict statement, it is now not so restricted any more. Now .edges().filter().restrict() is allowed 2014-05-23 14:05:01 +02:00
Michael Hackstein fef7fd355e Finished tests against AQL for current state of fluent interface in general graph module. 2014-05-23 12:51:28 +02:00
Michael Hackstein 0a4877b71a Changed interface of graph._edges(). It now expectes examples for edges instead of examples for connected verticies. This fits better for chaining either start with a couple verticies or a couple of edges 2014-05-23 11:46:41 +02:00
Michael Hackstein 742e05d06b Further implementation of tests against generated AQL in general-graph module 2014-05-23 11:25:48 +02:00
Michael Hackstein 7a55d89363 Started implementing checks against chained AQL statements in general-graph. 2014-05-23 10:48:49 +02:00
Michael Hackstein 6f6091a846 Fixed most tests of the simple suites in general_graph. The restrict test fails right now, some error in AQL 2014-05-23 10:16:19 +02:00
Michael Hackstein 2296f15bef Made the general-graph code a bit more DRY 2014-05-23 00:06:38 +02:00
scottashton 25d6bf15f1 cleaned up merge conflict 2014-05-22 17:54:13 +02:00
scottashton 3bec9b4c93 refactored aql 2014-05-22 17:49:20 +02:00
Thomas Schmidts e5d4642193 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-22 15:48:28 +02:00
Thomas Schmidts 33b8a3b05c issue #849: A few changes 2014-05-22 15:47:44 +02:00
Michael Hackstein fe62bc8609 Added tests for chains in fluent aql interface for general graphs 2014-05-22 15:21:08 +02:00
gschwab 4bb40d8de5 removing a vertex will remove all edges where this vertex is used in all graphs 2014-05-22 15:14:45 +02:00
Michael Hackstein 790046b177 Started implementing more elaborate tests for chaining. Initial vertex tests are implemented but will intentionally fail now, corresponding AQL implementation is yet missing 2014-05-22 14:03:58 +02:00
gschwab c63c8c465e jslint fix 2014-05-22 12:34:08 +02:00
gschwab 0d25c94b62 graph._drop does not anymore drop collections used in other graphs 2014-05-22 10:41:38 +02:00
scottashton 0353483339 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-22 09:17:54 +02:00
scottashton 247fea8cef neighbors 2014-05-22 09:17:43 +02:00
gschwab 56f0576f99 implemented _extendEdgeDefinitions() 2014-05-22 09:05:47 +02:00
gschwab c0a7aa2d28 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-22 08:32:37 +02:00
gschwab 3947574805 renamed edgeDefinitions -> _edgeDefinitions 2014-05-22 08:32:34 +02:00
Michael Hackstein 75d5a04ae7 Embedded cursors into fluent AQL interface for graphs. 2014-05-21 18:22:30 +02:00
Michael Hackstein 852c4da742 Added an example for Example generation in code to general graph module 2014-05-21 17:34:03 +02:00
Michael Hackstein 27474a7960 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
2014-05-21 09:55:37 +02:00
Michael Hackstein ed14083e6f Implemented a wrapper around collections in graph module. Old collection functionality is now preserved 2014-05-21 09:45:53 +02:00
gschwab acb43a202f fixed remove for vertexColelctions 2014-05-20 16:51:54 +02:00
Michael Hackstein d03a8fa11b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-20 16:22:47 +02:00
Michael Hackstein dddc5cbd9e Added an _exists function to the general-graph module, which checks if there is a graph with given name to avoid error throwing within apps 2014-05-20 16:22:44 +02:00
gschwab 0cc4969a31 jslint 2014-05-20 15:53:20 +02:00
gschwab de2fd3ff69 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 15:35:13 +02:00
gschwab 072b00c54b edges of a vertex will be removed, when vertex is removed 2014-05-20 15:35:09 +02:00
Michael Hackstein bb9aaaeb4e Fixed error handling on restrict. It will now throw an error if query is restricted to an unkown collection 2014-05-20 14:43:42 +02:00
gschwab ef1665391a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 12:56:41 +02:00
gschwab ad10fc85e6 added drop function for graphs 2014-05-20 12:56:33 +02:00
Jan Steemann 9513227449 test fuxx 2014-05-20 12:44:51 +02:00
Michael Hackstein d89ff71dbc Implemented generalGraph as a datasource for Traversal queries incl. tests 2014-05-20 11:39:33 +02:00
gschwab 3c0fdae6f7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 08:57:48 +02:00
gschwab bfb5610426 x-edges tests 2014-05-20 08:57:44 +02:00
Michael Hackstein ff54178f22 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-19 17:47:47 +02:00
Michael Hackstein b798c4f23a Enabled tests against AQL execution in graph module 2014-05-19 17:47:42 +02:00
Jan Steemann b06e89da54 simplified 2014-05-19 17:44:56 +02:00
Michael Hackstein af96bf0b70 Fixed jslint warning, missing semicolon 2014-05-19 16:19:22 +02:00
Michael Hackstein 6a33a9f9e3 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-19 16:17:34 +02:00
Michael Hackstein 39b38ae159 Commented part of the fluent AQL interface in graphs, there is some conception necessary. Implemented a filter alternative instead 2014-05-19 16:17:30 +02:00
gschwab 81c4982380 added tests for vertex and edges - fixed jslint 2014-05-19 15:15:58 +02:00
gschwab 37f7002c75 added tests for vertex and edges - fixed jslint 2014-05-19 15:06:15 +02:00
gschwab c38a455760 added tests for vertex and edges 2014-05-19 15:04:19 +02:00
Michael Hackstein 105dde54a7 Implemented filter on general graph module and simplified test code 2014-05-19 13:12:10 +02:00
Michael Hackstein 044f094139 Fixed a bug in graph module aql generation. For in was missing 2014-05-19 12:02:21 +02:00
Michael Hackstein 8bf9922693 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-19 11:46:25 +02:00
Michael Hackstein deb477b453 Implemented restrict on edges/inEdges/outEdges in general graph module 2014-05-19 11:46:19 +02:00
Michael Hackstein 5255e8f26b Added tests for restriction on edges call in general graph module 2014-05-19 11:08:23 +02:00
Michael Hackstein d558fa8fbd Started implementing fluent AQL interface. Right now allows edges 2014-05-19 10:55:16 +02:00
scottashton d9951b9642 finished tests for _create and _graph 2014-05-19 09:47:37 +02:00
scottashton 58eefee6b5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-19 09:45:49 +02:00
scottashton 0c0c2773fa finished tests for _create and _graph 2014-05-19 09:45:43 +02:00
Michael Hackstein 4ac62a5461 Fixed JSLint and renamed graph functions to start with _ 2014-05-19 09:30:44 +02:00
scottashton 1ac649cf94 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-19 08:43:01 +02:00
scottashton 4dbbc550df work in progress 2014-05-19 08:42:37 +02:00
Michael Hackstein 0a73cd6823 Implemented restrict interface on edges, right now implementation is not optimized, missing cursor functionality 2014-05-17 11:27:47 +02:00
Michael Hackstein 20d33b80a5 Bound collections by name to graph object. graph.v === db.v 2014-05-16 17:22:32 +02:00
Michael Hackstein f490018530 Renamed internal functionality to '_' and internal variables with equal names to '__' 2014-05-16 16:50:11 +02:00
Michael Hackstein fd939bdca2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
2014-05-16 16:28:03 +02:00
Michael Hackstein 1e9e5d3254 Fixed a bug where only collections with the name 'relationName' could be created 2014-05-16 16:26:45 +02:00
scottashton 1a0b0e4a49 pre merge commit 2014-05-16 16:16:48 +02:00
gschwab 55c494c81d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
2014-05-16 16:12:40 +02:00
gschwab 1960ce34f4 added vertex and edge methods 2014-05-16 16:10:22 +02:00
Michael Hackstein e404d070f4 Fixed merge conflict on general graph tests 2014-05-16 15:31:39 +02:00
scottashton 47dfdcd75c first version of create graph 2014-05-16 15:19:16 +02:00
scottashton 11faa956a7 first version of create graph 2014-05-16 15:17:54 +02:00
gschwab f0194b5b25 fixed jslint 2014-05-16 14:52:09 +02:00
Jan Steemann 7b44fd92f9 fixed db.collection.geo documentation 2014-05-16 14:46:13 +02:00
gschwab 6451af1cb4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
2014-05-16 13:10:31 +02:00
gschwab 24871b64ef start implement edges() 2014-05-16 13:08:33 +02:00
scottashton fd944eee8e fixed jslint 2014-05-16 13:02:56 +02:00
scottashton 266f72a253 initial checkin for new graph module 2014-05-16 11:29:22 +02:00
scottashton 700480f20a adjusted all require(org/arangodb/graph) to new graph-blueprint module 2014-05-15 10:33:20 +02:00
Jan Steemann ee8fe74a8a removed tabs 2014-05-14 17:41:00 +02:00
scottashton 37f81ee9d6 added new "old" module graph-blueprint and directed to that whenever graph has been required 2014-05-14 17:11:59 +02:00
Jan Steemann c47058c6de issue #860: Documentation: Wrong example 2014-05-12 09:57:43 +02:00
Jan Steemann cfc2d407d7 added tests for task management 2014-05-10 00:43:14 +02:00
Jan Steemann 7ee2caf94e simplified usage of arango-statement 2014-03-28 16:57:59 +01:00
Frank Celler d34832bbcf added changePassword attribute for users 2014-03-25 11:40:13 +01:00
Frank Celler e3df90d2c3 coffee script fix
Conflicts:
	js/server/modules/org/arangodb/foxx/manager.js
2014-03-20 19:36:42 +01:00
Frank Celler ce9c992edc removed test files 2014-03-07 12:10:19 +01:00
scottashton 6fb391eb3f jslint hints fixed 2014-03-04 13:32:39 +01:00
Frank Celler 5c816ec808 added clusterId in statistics 2014-03-04 10:30:17 +01:00
Jan Steemann fd08bb0feb use indexes in AQL 2014-02-28 13:50:39 +01:00
Frank Celler 3c992b0bbe removed old files 2014-02-27 13:16:54 +01:00
Jan Steemann 3d5149b022 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	arangosh/V8Client/arangosh.cpp
2014-02-26 21:34:34 +01:00
Jan Steemann bb0f87cfdc fixed bug in Graph.pathTo 2014-02-26 13:40:08 +01:00
Jan Steemann 23ba186b0d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/CapConstraint/cap-constraint.c
	js/apps/system/aardvark/frontend/scss/_tiles.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/frontend/scss/style.scss
	js/common/modules/org/arangodb/users-common.js
2014-02-25 17:21:14 +01:00
Jan Steemann 8fe19fa897 fixed index tests 2014-02-25 11:55:39 +01:00
Jan Steemann 7f236650ff fix database name in prompt 2014-02-24 14:46:58 +01:00
Jan Steemann 870f969933 added user validation API at POST `/_api/user/<username>` 2014-02-24 11:12:37 +01:00
Max Neunhoeffer f7e57a5b47 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/manifest.json
	lib/Rest/EndpointIp.cpp
	lib/Rest/EndpointUnixDomain.cpp
	lib/V8/v8-utils.cpp
2014-02-21 15:28:21 +01:00
Jan Steemann 35c00ce592 jslint ist unser freund 2014-02-21 09:07:22 +01:00
Frank Celler b01d9d77e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
	js/apps/system/aardvark/frontend/scss/generated.css
	js/server/version-check.js
	lib/Dispatcher/Job.h
	lib/GeneralServer/GeneralServerJob.h
2014-02-20 21:02:07 +01:00
Frank Celler 38f1e55f99 ignore cache 2014-02-20 20:35:18 +01:00
Frank Celler 730da7623a added periodic tasks and statistics historian 2014-02-20 20:29:55 +01:00
Jan Steemann 29c09e1ef7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-20 10:04:43 +01:00
Jan Steemann a0c3a7fe56 improved users API 2014-02-20 10:04:13 +01:00
Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding
Conflicts:
	arangod/VocBase/document-collection.c
	arangosh/CMakeLists.txt
	js/apps/system/aardvark/test/karma/karma.conf.js
2014-02-18 08:50:27 +01:00
Heiko Kernbach 899fa52876 added api-cmd for getting a complete user list 2014-02-17 16:37:50 +01:00
Jan Steemann 3fd053eb1e updated tests 2014-02-14 18:44:36 +01:00
Jan Steemann 5270f994c9 Merge remote-tracking branch 'origin/devel' into sharding
Conflicts:
	js/apps/system/aardvark/frontend/css/layout.css
	js/server/modules/org/arangodb/arango-collection.js
2014-02-12 12:53:08 +01:00
Jan Steemann 10b406b0e9 flush the user authentication cache after any modifications 2014-02-12 09:12:48 +01:00
Michael Hackstein bc16cfae86 Merge remote-tracking branch 'origin/devel' into sharding
Conflicts:
	Documentation/InstallationManual/Installing.md
	arangosh/CMakeLists.txt
2014-02-11 15:52:49 +01:00
Frank Celler c6ce5c7406 made module loader more node compatible, added coffee script support 2014-02-11 13:26:11 +01:00
Frank Celler 7528779137 Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	CMakeLists.txt
	VERSION
	arangod/Ahuacatl/ahuacatl-functions.c
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/vocbase-defaults.c
	build.h
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/frontend/css/buttons.css
	js/apps/system/aardvark/frontend/css/documentsView.css
	js/apps/system/aardvark/frontend/js/templates/applicationsView.ejs
	js/apps/system/aardvark/frontend/js/templates/documentsView.ejs
	js/server/modules/org/arangodb/ahuacatl.js
	js/server/tests/ahuacatl-graph.js
2014-02-09 18:39:11 +01:00
Jan Steemann b5550e17a6 updated tests and documentation 2014-02-06 12:11:17 +01:00
Jan Steemann 48e3a5828c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
2014-01-31 11:31:09 +01:00
Jan Steemann 4ead86d0f7 removed some unused variables 2014-01-31 11:23:27 +01:00
Jan Steemann a5d4b1b5a1 make change for issue #755 less strict 2014-01-31 02:07:27 +01:00
Jan Steemann ea7772295b issue #755 2014-01-31 02:02:25 +01:00
Jan Steemann b7ad436d19 issue #755: TRAVERSAL does not use strategy, order and itemOrder options 2014-01-31 01:52:07 +01:00
Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsView.css
	js/apps/system/aardvark/frontend/css/layout.css
	js/apps/system/aardvark/frontend/js/routers/router.js
2014-01-30 19:40:21 +01:00
Jan Steemann 0a2d61a42a added SHORTEST_PATH AQL function, allow user-defined functions for filtering in TRAVERSAL etc. 2014-01-28 01:51:27 +01:00
Jan Steemann 64417d4423 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
2014-01-21 09:29:45 +01:00
Jan Steemann 4f5052f469 issue #730: initial implementation of A* 2014-01-18 01:46:24 +01:00
Michael Hackstein 9f3479f5b6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	utils/Makefile.files
2014-01-10 17:41:52 +01:00
Jan Steemann 03b55488b6 fixed client-side implementation of function registration 2014-01-03 13:58:35 +01:00
Jan Steemann 3023521535 fixed client-side implementation of function registration 2014-01-03 13:58:01 +01:00
Jan Steemann 91c52a3a2e fixed potential deadlock in global context execution 2014-01-03 13:47:11 +01:00
Jan Steemann ef84ba6705 fixed potential deadlock in global context execution 2014-01-03 13:45:43 +01:00
Michael Hackstein 920f5e6d4b Updated JSUnity, now equalitycheck for objects does not care for ordering anymore 2014-01-02 18:05:21 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Jan Steemann 2c8ef0125f ported web interface changes from devel to 1.4 2013-12-18 16:22:16 +01:00
Jan Steemann 44b3237882 moved server-only tests to js/server/tests
this hopefully removes some future confusion about the tests
also moved some graph stuff into js/common as client-side graphs did not fully work

make logfile path accessible
2013-12-04 22:05:00 +01:00
Jan Steemann 28110b01e3 issue #671: make more graph-methods work client-side, too 2013-11-25 10:23:46 +01:00
Jan Steemann 6cf0fa2b4a issue #671: make other graph methods work client-side, too 2013-11-25 10:22:36 +01:00
Jan Steemann 319f5f8dbd removed unused variables 2013-11-18 11:41:57 +01:00
Jan Steemann 5d9cd13c4f issue #671: Method graph.measurement does not exist 2013-11-18 10:39:39 +01:00
Jan Steemann 018bbaa01d issue #671: Method graph.measurement does not exist 2013-11-18 10:28:09 +01:00
Lucas Dohmen 6049ef11fb Graph: Replace a given edge by ID 2013-10-31 15:16:58 +01:00
Lucas Dohmen 04c7cfce33 Graph: Replace a given vertex by ID 2013-10-31 15:16:58 +01:00
Lucas Dohmen b1f36e41f8 Graph Module: Alternatively provide ID instead of Vertex in addEdge 2013-10-31 13:14:51 +01:00
Lucas Dohmen c7b5549b08 Graph Refactoring: Determination of ID pushed to Common 2013-10-31 12:30:14 +01:00
Lucas Dohmen 37b7630efb Code Style 2013-10-31 12:27:50 +01:00
Jan Steemann 08855d5990 added collection status "loading" 2013-10-29 22:35:07 +01:00
Jan Steemann 4c8e0db434 fixed typo in method name 2013-10-08 13:56:20 +02:00
Jan Steemann 3e85159700 jslintified 2013-09-16 18:55:47 +02:00
Lucas Dohmen 70c6b403b2 Pushed the constructor mocking to the module 2013-09-16 15:08:57 +02:00
Jan Steemann ca6244ccc5 jslintified 2013-09-16 13:54:33 +02:00
Lucas Dohmen 27f522aa03 expect docs 2013-09-16 13:28:52 +02:00
Lucas Dohmen 25b87ed3dc Mock: Take arguments instead of array 2013-09-16 13:28:52 +02:00
Lucas Dohmen ae8d0e2be2 expect with fluent interface 2013-09-16 13:28:51 +02:00
Lucas Dohmen 2301cdc930 Converted allow to fluent interface 2013-09-16 13:28:51 +02:00
Lucas Dohmen c1bf1b1d11 Moved stub_and_mock to its own module 2013-09-16 13:28:51 +02:00
Jan Steemann b4efb78f7c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-04 15:58:49 +02:00
Lucas Dohmen 69286b5742 Foxx: Foxx Transformer is now Foxx Preprocessor 2013-09-04 15:08:15 +02:00
Jan Steemann 897412b4de initial dropping of databases 2013-09-04 13:04:13 +02:00
Jan Steemann bae9f097fc added _dropDatabase() 2013-09-02 18:04:19 +02:00
Jan Steemann 32ff2f7d39 improve assertion counter 2013-08-27 15:07:41 +02:00
Jan Steemann b598d3443e dirtified jsunity 2013-08-27 12:19:58 +02:00
Jan Steemann 5056512a37 mimetypes for fonts 2013-08-20 10:03:38 +02:00
Jan Steemann ec1a18aac5 fixed jslint warnings 2013-08-19 18:59:22 +02:00
Jan Steemann 9eb1752a7e use AQL LIMIT but still return the unlimited count value
Still needs documentation and tests
2013-08-19 18:41:00 +02:00
Frank Celler 8ed7a0115b added transformation 2013-08-07 11:41:49 +02:00
Frank Celler f5016a2ce9 cleanup 2013-07-26 22:46:53 +02:00
Jan Steemann 94051a74c3 return error code from foxx-manager 2013-07-26 14:58:03 +02:00
Jan Steemann aa9209b888 fixed thumbnails 2013-07-26 14:46:33 +02:00
Jan Steemann 4dfdb13d4d improved tabular output 2013-07-26 13:03:59 +02:00
Jan Steemann e359dc29dd INCOMPATIBLE CHANGE: changed AQL user function namespace resolution operator from `:` to `::`
AQL user-defined functions were introduced in ArangoDB 1.3, and the namespace resolution
operator for them was the single colon (`:`). A function call looked like this:

    RETURN mygroup:myfunc()

The single colon caused an ambiguity in the AQL grammar, making it indistinguishable from
named attributes or the ternary operator in some cases, e.g.

    { mygroup:myfunc ? mygroup:myfunc }

The change of the namespace resolution operator from `:` to `::` fixes this ambiguity.

Existing user functions in the database will be automatically fixed when starting ArangoDB
1.4 with the `--upgrade` option. However, queries using user-defined functions need to be
adjusted on the client side to use the new operator.
2013-07-18 12:02:28 +02:00
Jan Steemann 9d2a016c5b make jslint happy 2013-07-01 15:50:51 +02:00
Lucas Dohmen 7e7a90753a Fixing the build (this time: Really)
Sorry, seems like I shouldn't code today 😊
2013-06-28 19:38:30 +02:00
Lucas Dohmen ccf56dd702 Fix the build 2013-06-28 18:34:26 +02:00
Lucas Dohmen 79a6772667 Code Review: Common Graph Module 2013-06-28 18:14:23 +02:00
Jan Steemann 93f7122099 added missing count() method for server-side cursor 2013-06-24 13:50:03 +02:00
Lucas Dohmen f64c227b16 Graph Module: Even more in Graph Common 2013-06-19 17:09:19 +02:00
Lucas Dohmen 6a84d4726b Graph Module: Pulled Iterator into Common
Also adjusted it to be useful for the Server Side.
2013-06-19 17:09:19 +02:00
Lucas Dohmen 38327183e8 Graph Module: Edge almost entirely pulled into Common 2013-06-19 17:09:18 +02:00
Lucas Dohmen 294b31e839 Further Refactoring of GraphCommon 2013-06-14 10:13:17 +02:00
Lucas Dohmen c357fa1133 Pulled addVertex into Common + tiny style fixes 2013-06-14 10:13:17 +02:00
Lucas Dohmen a81a0f0728 Tiny Refactoring of GraphCommon 2013-06-14 10:11:19 +02:00
Lucas Dohmen 222db29812 More functionality for the tiny is.x library 2013-06-14 10:11:19 +02:00
Jan Steemann b1bc9b3285 adjust traversal docs and examples 2013-06-13 13:06:48 +02:00
Jan Steemann 9599a021b9 moved some graph traversal validation into the traversal module
- that simplifies some of the traversal-calling routines
- make returning error codes more consistent (specific 404 errors when
referring to unknown collections instead of simple 400 errors)
- optionally limit traversals to a certain number of iterations so they
  don't run endlessly in cyclic graphs
2013-06-12 17:04:47 +02:00
Lucas Dohmen 567a548cff Tearing appart Graph#addEdge and fixing the build even harder 2013-06-07 14:56:08 +02:00
Jan Steemann fe26fa593e jslint 2013-06-07 14:20:50 +02:00
Lucas Dohmen 5aadaf1b99 Restructering Graph Module, fixing the build 2013-06-07 13:51:22 +02:00
Lucas Dohmen 8e27de26a7 Fix for #546 2013-06-07 10:19:37 +02:00
Jan Steemann c2ff93e99d issue #531 (warning) 2013-05-17 14:58:22 +02:00
Jan Steemann ede177aa55 issue #507, issue #508 2013-05-06 09:40:28 +02:00
Jan Steemann eef611b1da fixed some compiler & jslint warnings 2013-05-03 11:09:45 +02:00
Lucas Dohmen e14c8800cc Added Underscore as Module for now
We want it to work, so be it.
2013-04-30 09:27:17 +02:00
Frank Celler 186694dc22 added safety check for packages which define main with .js 2013-04-23 22:42:11 +02:00
Frank Celler cbc2ab93ba fixed _shallowCopy, fixed creating of unknown attributes 2013-04-22 16:48:36 +02:00
Frank Celler d02d79ce1c added coffee-script 2013-04-21 22:57:19 +02:00
Frank Celler 7bfce45ece added more node modules 2013-04-21 22:00:54 +02:00
Jan Steemann 7d9777f8c5 extended API for user-defined AQL functions 2013-04-16 18:32:19 +02:00
Jan Steemann 15026e9a96 fixed examples 2013-04-16 16:16:28 +02:00
Jan Steemann 997c14e032 fixed jslint warnings 2013-04-11 20:24:09 +02:00
Frank Celler 828b939053 fixed isolates, made ArangoError internal 2013-04-10 21:22:09 +02:00
Frank Celler b71f31bcbb fixed wrong error message 2013-04-06 23:43:25 +02:00
Frank Celler 71bf83be1b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-05 13:25:04 +02:00
Frank Celler 0ea88d8ebf use different sandbox 2013-04-05 13:24:55 +02:00
Jan Steemann ed10d9b6aa AQL user functions 2013-04-05 12:50:44 +02:00
Lucas Dohmen d4d2957d9a Foxx: Introducing Model 2013-04-04 11:17:22 +02:00
Frank Celler a6be9ceaa3 added node assert module 2013-04-03 16:48:38 +02:00
Frank Celler e68080a638 fixed wrong call to length 2013-04-03 16:31:53 +02:00
Frank Celler 0c1e20cb1b fixed wrong import 2013-04-02 18:28:35 +02:00
Frank Celler 7e7eefe4f6 use function to set result 2013-04-02 18:25:54 +02:00
Frank Celler 3512fa6ff0 fixed error handling 2013-04-02 15:00:55 +02:00
Frank Celler 74166761a1 Merge branch 'feature/commonjs' of github.com:triAGENS/ArangoDB into devel 2013-03-31 12:50:18 +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 07bd4b2585 new module/package mechanism 2013-03-31 12:25:12 +02:00
Frank Celler 7031210a53 fixed browser 2013-03-31 00:10:48 +01:00
Frank Celler 1467b78676 cleanup of internal, fs, console 2013-03-31 00:10:48 +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 b04c33f1ec generate reverse map of mimetypes 2013-03-28 13:48:57 +01:00
Lucas Dohmen 8261a46577 Added a Mimetype 2013-03-28 13:25:30 +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 909c316e22 added mimetype generation file 2013-03-27 10:11:56 +01:00
Frank Celler 557184631d more fox-manager, added files section 2013-03-26 13:58:00 +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
Jan Steemann 0e6c21e4e7 removed NEW_BORN collection status in server 2013-03-25 15:51:42 +01:00
Frank Celler 877066392e foxx manager cleanup 2013-03-25 14:10:10 +01:00
Frank Celler a8557091b8 new foxx loader 2013-03-25 10:22:35 +01:00
Frank Celler e3de563668 requiresLibs and requiresModels 2013-03-24 15:03:01 +01:00
Lucas Dohmen 44a97317ba Fuxx: We now always need an urlPrefix 2013-03-24 13:27:31 +01:00
Lucas Dohmen 9c9739af80 Foxx: Fixed the JSLint errors caused by @fceller 2013-03-24 13:15:55 +01:00
Lucas Dohmen 4bded1da55 Foxx: Fix for the Frank 2013-03-24 13:13:57 +01:00
Lucas Dohmen d6498a2b8d Foxx: Yes! Foxx is back on track. Like a sir. 2013-03-24 12:57:53 +01:00
Lucas Dohmen 3948e2a0d6 Foxx: Before and After work again 2013-03-24 12:57:53 +01:00
Lucas Dohmen fd45c765a7 Foxx: BaseMiddleware is now tested again
This is such a relief ☺️
2013-03-24 12:57:53 +01:00
Lucas Dohmen 53a7d0eda6 Foxx: Tiny Commits as a Service 2013-03-24 12:57:53 +01:00
Frank Celler 34477c290e added installApp 2013-03-24 12:35:43 +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
Jan Steemann 2c279d9c4f fixed jslint errors 2013-03-24 01:14:58 +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
Lucas Dohmen 4f43bed2f6 Foxx, special @fceller edition 2013-03-23 22:01:13 +01:00
Frank Celler 44806229f7 fixed jslint errors 2013-03-23 21:57:33 +01:00
Lucas Dohmen 9971a4bfb5 Ohhhhh. 2013-03-23 18:49:02 +01:00
Lucas Dohmen 5e0da254f3 Oh man... Strings. 2013-03-23 18:34:59 +01:00
Lucas Dohmen af07fdf6ad Fix? 2013-03-23 18:11:24 +01:00
Frank Celler 8012a23744 added foxx api 2013-03-23 17:09:26 +01:00
Lucas Dohmen 0f2cfa75c6 Reality. 2013-03-23 16:53:46 +01:00
Lucas Dohmen 0dd44d82aa Foxx: Added the params function 2013-03-23 16:01:21 +01:00
Lucas Dohmen 55ab432c4b Foxx: Request Body 2013-03-23 14:09:59 +01:00
Lucas Dohmen abb2ed0476 Always use strict. 2013-03-23 14:09:59 +01:00
Lucas Dohmen 61ac216571 Low and behold, there is Foxx#start 2013-03-23 13:25:20 +01:00
Lucas Dohmen ef8e467420 Foxx: Code Style 2013-03-21 12:36:28 +01:00
Lucas Dohmen 52258ebbfa Renamed Fuxx to Foxx
Frank, Fuxx, Foxx. Call it however you want.
I will now refer to it as F*.
2013-03-21 11:49:45 +01:00
Lucas Dohmen db93a6677f Merge branch 'codename_frank' into devel 2013-03-21 09:43:17 +01:00
Lucas Dohmen 42147e5876 Fuxx: Renamed Frank to FuxxApplication
And reviewed the entire documentation.
Bye Frank.
2013-03-21 09:41:55 +01:00
Lucas Dohmen 6d0adcbd39 Fuxx: Adjusted the JSLint statement
There were 50% too many globals.
Dude.
You know...
What if everyone did that?
2013-03-21 09:41:55 +01:00
Lucas Dohmen 9524db93b9 Fuxx: Added `accepts` to app 2013-03-21 09:41:54 +01:00
Lucas Dohmen d71b459d58 Fuxx: Added support for default in FormatMiddleware 2013-03-21 09:41:54 +01:00
Lucas Dohmen 51f75fbb08 Fuxx: First version of the FormatMiddleware 2013-03-21 09:41:54 +01:00
Lucas Dohmen 58155fe84b Frank: Introducing View Helpers 2013-03-21 09:41:42 +01:00
Lucas Dohmen 03c278ce0f Frank: Add Before and After Hooks
I think this will be quite useful.
For logging for example.
Or dancing in the rain.
(Does anybody read this?)
2013-03-21 09:41:42 +01:00
Lucas Dohmen 28c24b1d0c Frank: Add the middleware to the routing info 2013-03-21 09:41:42 +01:00
Lucas Dohmen c926955541 Frank: Some clarifications about Request and Response. 2013-03-21 09:41:42 +01:00
Lucas Dohmen 915b9e9f8d Frank: Documenting Frank like I'm a Pythonista
Run Docco on it, and you will see a beautiful
documentation.
2013-03-21 09:41:34 +01:00
Lucas Dohmen 87c5638e41 Frank: Adjusting to the correct syntax for Function Actions 2013-03-21 09:41:34 +01:00
Lucas Dohmen 7c4ca742e2 Frank is no longer sloppy and doesn't like plusplus
* He's classy. Classy doesn't go with sloppy.
* No plusplus in here
2013-03-21 09:40:59 +01:00
Jan Steemann 0206076fda stringifying collections should honor colors 2013-03-08 17:38:20 +01:00
Jan Steemann a4708f806b issue #441 2013-03-07 17:34:16 +01:00
Lucas Dohmen 7861fc873a Codename: Frank.
Like Swordfish, but more classy.
2013-03-05 16:16:34 +01:00
a-brandt e41847c336 moved random generators and nonce functions to internal and crypto module 2013-03-04 16:18:00 +01:00
Jan Steemann f2e3ac9528 fixed doxygen errors 2013-02-22 08:56:52 +01:00
Jan Steemann 3e095ab0d0 split users module in client- and server-specific parts 2013-02-21 17:41:38 +01:00
Jan Steemann 35f6b3f054 fix cloning 2013-02-21 15:12:50 +01:00
Frank Celler 36da27ac6f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	Documentation/DbaManual/Authentication.md
	Documentation/DbaManual/UserManagementTOC.md
	js/common/modules/org/arangodb/users.js
2013-02-20 13:52:20 +01:00
Frank Celler a259580989 documentation cleanup 2013-02-20 13:47:28 +01:00
Jan Steemann 3fdebb38ee issue #393, issue #128
Added a REST API for user management
The REST API exposes the functionality available in module "users" for HTTP access.

The following methods are available:
* GET /_api/user/username: fetch user information
* POST /_api/user: create new user
* PUT /_api/user: replace an existing user
* PATCH /_api/user: (partially) update an existing user
* DELETE /_api/user: remove an existing user

Additionally, a module "crypto" is introduced and exposed for Javascript actions.
The crypto module provides the following functions:
* require("org/arangodb/crypto").md5();
* require("org/arangodb/crypto").sha256();
* require("org/arangodb/crypto").rand();
2013-02-20 11:56:26 +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
Frank Celler 3f9869ab27 fixed issue #350: XMLMISSING in wiki references 2013-02-10 16:11:35 +01:00
Frank Celler 9bf9862f2b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-02-09 13:15:34 +01:00
Frank Celler 8cca06127c moved .dox to .md 2013-02-09 13:15:28 +01:00
a-brandt 7c0dd75415 use colors in jsunity tests 2013-02-08 15:40:34 +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 31baa7ae70 added GraphArray to make calls easier - no map needed 2013-02-02 15:57:03 +01:00
Jan Steemann f9c14611a4 remove tabs 2013-02-01 15:46:27 +01:00
Frank Celler 695303e432 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-02-01 10:52:24 +01:00
Frank Celler 4466ccc06a cosmetics 2013-01-31 13:52:41 +01:00
Jan Steemann d43e9b89ca issue #381: lifted restrictions on usernames 2013-01-31 13:20:39 +01:00
Frank Celler b10154ff25 fixed jslint 2013-01-30 09:48:42 +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