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

1697 Commits

Author SHA1 Message Date
Jan Steemann 603de4ba20 javascript cleanup 2014-05-31 01:44:47 +02:00
Jan Steemann 7b521a4c9e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/VocBase/document-collection.cpp
	arangod/VocBase/document-collection.h
 2014-05-30 12:51:20 +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
Jan Steemann 74ccb66d59 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-28 09:17:55 +02:00
Jan Steemann b876bfd34f fixed typos 2014-05-27 11:04:10 +02:00
Jan Steemann 86cecdb6a6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
 2014-05-26 17:28:16 +02:00
Esteban Lombeyda 8353af15eb renaming test method and cleaning 2014-05-26 16:07:47 +02:00
Esteban Lombeyda 5cc5d16645 Bug fix: yielding correct format for option parameters 2014-05-26 15:39:47 +02:00
Esteban Lombeyda 3df7990827 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 15:17:53 +02:00
Jan Steemann 1351de4523 fixed invalid collection / document access 2014-05-26 15:17:36 +02:00
Esteban Lombeyda c563756a35 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 13:44:12 +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
Esteban Lombeyda 7840b42358 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 12:40:21 +02:00
Esteban Lombeyda 14a7074002 Bug fix in updatebyExample 2014-05-26 11:52:11 +02:00
gschwab d01fa951c2 some error handling added 2014-05-26 11:41:35 +02:00
Esteban Lombeyda a803c16016 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 10:56:17 +02:00
gschwab 3ed6b73702 remove edge will remove other edges used as from or to recursively 2014-05-26 10:37:56 +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
Esteban Lombeyda f1c8e9e1b4 Functions ..ByExample support new signature 2014-05-23 16:26:23 +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
Michael Hackstein 9505f95abb Added some more variables to replace plain strings 2014-05-23 15:11:29 +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 6bd3c88df0 All general-graph tests are green again, even with changed interface. Yet not included: restrict and vertices execution, generated AQL is tested. 2014-05-23 13:50:19 +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 ef8536f3e5 THe starting points for general-graph fluent AQL interface now have passing tests, nextup: fixing tests for fluent follow ups 2014-05-23 11:56:57 +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
Jan Steemann 558048d267 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-23 09:34:33 +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
Esteban Lombeyda f728f5ce2b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-22 14:44:55 +02:00
Esteban Lombeyda 3e26f4384f Fix: function had used wrong signature for the test goal 2014-05-22 14:43:17 +02:00
Esteban Lombeyda bcd8490c1b Supporting new signature for remove function 2014-05-22 14:35:17 +02:00
Michael Hackstein fbdd3738b6 Further implementation of general-graph fluent interface tests, starting with edges now has tests, they fail intentionally 2014-05-22 14:20:52 +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
Jan Steemann c8340f94ac Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-22 13:14:36 +02:00
Jan Steemann 0b6b0357ed jslint 2014-05-22 13:13:38 +02:00
Jan Steemann ac7e73f6e7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-22 13:11:39 +02:00
gschwab fdb93b881d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-22 12:34:14 +02:00
gschwab c63c8c465e jslint fix 2014-05-22 12:34:08 +02:00
Esteban Lombeyda 02b8ef12e9 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-22 11:11:01 +02:00
Michael Hackstein ec1ecaa107 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-22 11:00:33 +02:00
Michael Hackstein 09f19cb13c Fixed JSLint and started implementing elaborate chaining tests 2014-05-22 11:00:29 +02:00
Jan Steemann dc742f255a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-22 10:52:37 +02:00
gschwab c820c8b264 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-22 10:41:42 +02:00
gschwab 0d25c94b62 graph._drop does not anymore drop collections used in other graphs 2014-05-22 10:41:38 +02:00
Michael Hackstein b1cdeca44c Further refactoring, another suite now based on variables and prefixed with UnitTests 2014-05-22 10:39:12 +02:00
Michael Hackstein 2aaca2fa0b Further refactoring fpr general graph 2014-05-22 10:36:27 +02:00
Esteban Lombeyda f8c330ce54 Supporting new signature for replace function 2014-05-22 10:31:01 +02:00
Michael Hackstein 1dfdcca97c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/common/tests/shell-general-graph.js
 2014-05-22 09:53:40 +02:00
Michael Hackstein 597c2e9416 Further refactoring of test for general-graph 2014-05-22 09:52:48 +02:00
Michael Hackstein 51f523525c Started test refactoring for general-graph, uses parameters now whenever possible 2014-05-22 09:48:42 +02:00
gschwab d29ebfaa3b fixed tests 2014-05-22 09:32:21 +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 bf89abb737 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-21 17:34:08 +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
Esteban Lombeyda 32aee78f7b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-21 11:53:34 +02:00
Esteban Lombeyda 0b6846e963 Supporting new signature for JS update function 2014-05-21 11:52:06 +02:00
Michael Hackstein 0904f00d77 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-21 09:55:50 +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
gschwab e20f18bb1a drop graph after tests 2014-05-21 09:46:27 +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
Jan Steemann c15acbab08 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	lib/ShapedJson/Legends.cpp
	lib/ShapedJson/Legends.h
 2014-05-20 17:03:49 +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 4080e1f681 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 15:53:24 +02:00
gschwab 0cc4969a31 jslint 2014-05-20 15:53:20 +02:00
Michael Hackstein eb7150d815 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-20 15:48:38 +02:00
Michael Hackstein 35f602fef2 Renamed collections for AQL queries to contain 'UnitTests' prefix 2014-05-20 15:48:33 +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
Michael Hackstein f89b50a72e Fixed test for directedRelationDefinition error handling 2014-05-20 13:29:00 +02:00
Max Neunhoeffer 0dab3706c5 Finish first version of JsonLegend, not activated in Makefile. 2014-05-20 13:27:57 +02:00
gschwab 3897840af5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 13:25:39 +02:00
gschwab a2460276d3 forgot to rename some variables... 2014-05-20 13:25:34 +02:00
Max Neunhoeffer 464b6720ca Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-05-20 13:25:10 +02:00
Max Neunhoeffer dbd973164b Finish first version of JsonLegend, not activated in Makefile. 2014-05-20 13:24:29 +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
Jan Steemann 52be779997 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-20 11:40:19 +02:00
Michael Hackstein 1be58a157c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-20 11:39:37 +02:00
Michael Hackstein d89ff71dbc Implemented generalGraph as a datasource for Traversal queries incl. tests 2014-05-20 11:39:33 +02:00
Jan Steemann 6ecfc44f11 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-20 11:32:02 +02:00
gschwab b3ad2e303f added tests 2014-05-20 10:37:40 +02:00
gschwab a786369d2e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 09:52:30 +02:00
gschwab 434e1009c6 changed to setUp and tearDown 2014-05-20 09:52:25 +02:00
Michael Hackstein b416f8b762 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-20 09:43:39 +02:00
Michael Hackstein 058e1dc0e8 Added setUp and tearDown to AQLQueries test suite in general graph 2014-05-20 09:43:35 +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
Jan Steemann 59aa16de0e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-19 15:50:19 +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
Jan Steemann 9453beb7cc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-19 14:25:34 +02:00
Michael Hackstein 105dde54a7 Implemented filter on general graph module and simplified test code 2014-05-19 13:12:10 +02:00
Jan Steemann 5c100bc85b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-19 12:07:26 +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
Jan Steemann 3b8d282c7b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-19 11:55:27 +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
Jan Steemann 168fdcf6ef Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	UnitTests/Basics/bson-test.cpp
	arangod/V8Server/v8-actions.cpp
	lib/Basics/BsonHelper.h
 2014-05-19 11:21:58 +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 a0985ec515 Fixed tests to use graph functions starting with _ 2014-05-19 09:34:02 +02:00
Michael Hackstein 4ac62a5461 Fixed JSLint and renamed graph functions to start with _ 2014-05-19 09:30:44 +02:00
Michael Hackstein 0ee4913d5a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-19 08:50:46 +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
Jan Steemann 0ca849efb9 emit buffer to prevent very big string allocations/reallocations 2014-05-17 00:12:32 +02:00
Jan Steemann a0ffb65b88 emit output of print function to prevent buffering of super-long strings 2014-05-16 20:11:31 +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 4824e6e914 Refactored tests to make them more dry 2014-05-16 16:27:27 +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 a40e2ebdfe pre merge commit 2014-05-16 16:17:02 +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 69eeba2403 Commented failing tests in general graph for commit. Productive code missing, but test first 2014-05-16 15:37:05 +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
Michael Hackstein 1b43b18bdc Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-16 14:56:18 +02:00
gschwab f0194b5b25 fixed jslint 2014-05-16 14:52:09 +02:00
Michael Hackstein 3c95b7564f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-16 14:50:02 +02:00
Michael Hackstein 739ab6d54c Added first tests for restrict on edges. Not working yet, preconditions are missing 2014-05-16 14:49:58 +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 658294ecb3 fixed file with conflicts 2014-05-12 17:22:09 +02:00
Jan Steemann 027ec2d3f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/V8Server/V8PeriodicTask.cpp
	arangod/V8Server/V8PeriodicTask.h
	arangod/V8Server/v8-actions.cpp
	js/common/bootstrap/module-internal.js
	js/server/server.js
	lib/Dispatcher/ApplicationDispatcher.cpp
	lib/Dispatcher/RequeueTask.cpp
	lib/GeneralServer/GeneralListenTask.h
	lib/Scheduler/ApplicationScheduler.cpp
	lib/Scheduler/PeriodicTask.cpp
	lib/Scheduler/Scheduler.cpp
	lib/Scheduler/Scheduler.h
	lib/Scheduler/Task.cpp
	lib/Scheduler/Task.h
	lib/Scheduler/TimerTask.cpp
	lib/Scheduler/TimerTask.h
 2014-05-12 16:49:20 +02:00
Jan Steemann c47058c6de issue #860: Documentation: Wrong example 2014-05-12 09:57:43 +02:00
Jan Steemann d23fe23254 added tasks manual entry 2014-05-10 02:25:59 +02:00
Jan Steemann 548a79ac4d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-10 00:43:40 +02:00
Jan Steemann cfc2d407d7 added tests for task management 2014-05-10 00:43:14 +02:00
Max Neunhoeffer 8ce1b08183 Add a ClusterMethod to truncate a collection in a cluster. 2014-05-09 23:14:41 +02:00
Jan Steemann 3becebf488 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-09 17:36:42 +02:00
Jan Steemann 82595ee169 improved periodic task management 2014-05-09 17:36:24 +02:00
Frank Celler c2d57c7909 added applicationContext and foxxFilename 2014-05-09 17:12:55 +02:00
Frank Celler 327d669741 fixed safeJoin (missing join) 2014-05-09 17:10:30 +02:00
Jan Steemann c843a12149 jshund 2014-05-09 00:42:18 +02:00
Jan Steemann 20292af75c throw different type of debug error to prevent bogus "out-of-memory" errors 2014-05-08 23:00:18 +02:00
Jan Steemann 8fa45ca181 added string task ids for periodic jobs 2014-05-08 22:59:36 +02:00
Jan Steemann f18d117228 added GC 2014-05-08 14:36:12 +02:00
Frank Celler 0ecfe5e154 added empty remark 2014-05-08 11:18:08 +02:00
Jan Steemann 7f9446f6bc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-07 18:48:44 +02:00
Jan Steemann 7d28a03782 added AQL date functions 2014-05-07 18:17:46 +02:00
Max Neunhoeffer a312d496a9 Finish server functionality for cluster dump. 2014-05-07 16:36:47 +02:00
Jan Steemann 02a532a122 added CURRENT_USER function for AQL 2014-05-02 12:00:39 +02:00
Jan Steemann ce36c94082 added test for issue #796 2014-04-22 13:04:30 +02:00
Jan Steemann 76c09f43b5 added tests 2014-04-22 11:31:35 +02:00
Frank Celler 8e9ad58f3b added cancelation of asnyc jobs 
Conflicts:
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-actions.cpp
	lib/Rest/Handler.h
 2014-04-16 20:16:22 +02:00
Jan Steemann 2050049b06 added periodic job management 
this adds functions internal.deletePeriod() and internal.getPeriodic()
functions internal.definePeriodic() now also has an extra parameter to
specify the name of a periodic job. this makes it more easy to tell
jobs apart in the result of internal.getPeriodic().
 2014-04-13 22:19:46 +02:00
Jan Steemann 90c0d0dfd6 added periodic job management 
this adds functions internal.deletePeriod() and internal.getPeriodic()
functions internal.definePeriodic() now also has an extra parameter to
specify the name of a periodic job. this makes it more easy to tell
jobs apart in the result of internal.getPeriodic().
 2014-04-11 21:33:41 +02:00
Jan Steemann c29cf874b5 transaction interface 2014-04-08 14:40:09 +02:00
Jan Steemann c1916b1825 bumped version number 2014-04-03 14:08:28 +02:00
Jan Steemann 7ee2caf94e simplified usage of arango-statement 2014-03-28 16:57:59 +01:00
Jan Steemann 55f0dc5739 logfile opening/closing fixes 2014-03-28 16:45:06 +01:00
Jan Steemann 9724cfec64 fixed failing test 2014-03-27 13:12:45 +01:00
Frank Celler d34832bbcf added changePassword attribute for users 2014-03-25 11:40:13 +01:00
Jan Steemann 7c28db24af added tests for coffee script 2014-03-21 09:22:20 +01:00
Frank Celler 11fb42e722 removed SYS_TEST_PORT from global namespace 2014-03-20 23:05:17 +01:00
Frank Celler e25945aaba fixed javascript.execute for coffee-script 2014-03-20 22:51:30 +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
Jan Steemann d10258594e issue #772: added diagnostic output for Foxx application upload 
Conflicts:
	CHANGELOG
 2014-03-14 10:50:38 +01:00
Jan Steemann f4752e8f91 added tests for error codes and messges 2014-03-13 23:56:45 +01:00
Jan Steemann f7a9023c7c fix error message & number return in arangosh 2014-03-13 22:06:06 +01:00
Frank Celler ce9c992edc removed test files 2014-03-07 12:10:19 +01:00
Jan Steemann 7664d75e6d prevent usage of _useDatabase() in web interface 2014-03-05 13:04:32 +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
Jan Steemann 65feb43294 adjusted test expectations 2014-02-28 09:29:52 +01:00
Jan Steemann 5660d6419a Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 13:27:00 +01:00
Jan Steemann c387b697e8 fixed test 2014-02-27 13:26:40 +01:00
Frank Celler 3c992b0bbe removed old files 2014-02-27 13:16:54 +01:00
Max Neunhoeffer 893e7a87b1 Adjust READMEs to reality. 2014-02-27 08:53:21 +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 fe74e030ea fixed keygen test 2014-02-26 16:47:38 +01:00
Jan Steemann 4bbfdb827d Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-26 15:04:32 +01:00
Jan Steemann 3195da8ff0 use more appropriate assertions 2014-02-26 15:04:15 +01:00
Max Neunhoeffer 89761d5c7e Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-26 14:39:20 +01:00
Max Neunhoeffer bacfafea7f Rename non-cluster tests. 2014-02-26 14:38:55 +01:00
Jan Steemann 2db3d4b42d fixed tests 2014-02-26 14:35:14 +01:00
Max Neunhoeffer 16a2fa6770 Split noncluster and general shell-keygen tests. 2014-02-26 14:27:55 +01:00
Jan Steemann 5c3d81eea3 test split 2014-02-26 13:53:23 +01:00
Jan Steemann b634aff8a8 renamed test 2014-02-26 13:45:08 +01:00
Jan Steemann bb0f87cfdc fixed bug in Graph.pathTo 2014-02-26 13:40:08 +01:00
Jan Steemann 8e05df9950 split tests 2014-02-26 13:21:10 +01:00
Max Neunhoeffer 19765bd859 Fix test for deletion of documents on cluster. 2014-02-26 10:48:48 +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
Frank Celler 569778ae10 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-25 12:07:46 +01:00
Frank Celler 42fb8244e1 added requeue 2014-02-25 12:07:16 +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
Max Neunhoeffer 3cb1784430 Reorganise unit tests. 
In JS framework we now find the available test files by directory
listing. This means one can simply drop a file in the right
directory to add a test.

We use a naming convention for filenames which is explained
in the README files in the corresponding directories.

Old unit tests do not yet use this but do use the new names and
should still work as usual.
 2014-02-21 11:24:31 +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
Jan Steemann 9577923c7a fixed jslint warnings 2014-02-20 09:55:51 +01:00
Jan Steemann dc17e63f5a fixed jslint warning 2014-02-19 14:57:08 +01:00
Frank Celler 726144ce39 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/ApplicationV8.cpp
 2014-02-19 14:30:46 +01:00
Frank Celler c779325b5d added frontend-development switch 2014-02-19 14:28:51 +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 25b622aab1 fixed jslint warnings 2014-02-17 11:21:01 +01:00
Jan Steemann 3fd053eb1e updated tests 2014-02-14 18:44:36 +01:00
Frank Celler 65d7d8fdab Merge remote-tracking branch 'origin/devel' into sharding 2014-02-14 17:23:33 +01:00
Frank Celler 6d51527fb5 check for drive letter 2014-02-14 16:51:40 +01:00
Jan Steemann 0f0ef8a33f updated index docs 2014-02-14 10:30:05 +01:00
Jan Steemann f8476ce0b0 fixed tests 2014-02-13 18:14:53 +01:00
Jan Steemann f2cd112bf5 index ids 2014-02-13 16:30:48 +01:00
Jan Steemann c9c8f4e62a added tests 2014-02-13 16:12:57 +01:00
Jan Steemann 7970881b22 single-threaded plan changes 2014-02-13 15:33:29 +01:00
Jan Steemann fc84d4c005 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 11:18:49 +01:00
Frank Celler 95472a82eb Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
 2014-02-13 11:07:01 +01:00
Jan Steemann 4fc8cae57d index creation with ids 2014-02-13 11:00:08 +01:00
Frank Celler 89b6ca0ba3 fixed test setup 2014-02-12 22:04:19 +01:00
Frank Celler 25878be3d4 added fix for absolute path 2014-02-12 13:54:32 +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
Frank Celler 5e5ace0ee3 fixed unloadAll for system modules 2014-02-12 08:32:35 +01:00
Frank Celler 289a7dc0e0 fixed unloadAll for system modules 2014-02-11 22:54:02 +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 5b7eb66c9d added iced coffee script 2014-02-11 14:49:01 +01:00
Frank Celler da0453daa6 removed moduleNames, fixed app module 2014-02-11 13:48:37 +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
Frank Celler 98ed813138 added json reading 2014-02-09 18:27:47 +01:00
Jan Steemann 078dca98ae fixed a test 2014-02-07 10:00:58 +01:00
Jan Steemann b4d9f10f17 fixed some database methods 2014-02-06 15:54:34 +01:00
Jan Steemann c38c038492 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsItemView.css
	js/apps/system/aardvark/frontend/css/graphlayout.css
 2014-02-06 13:18:52 +01:00
Jan Steemann b5550e17a6 updated tests and documentation 2014-02-06 12:11:17 +01:00
Jan Steemann dafa0a3760 added test cases 2014-02-04 17:53:38 +01:00
Jan Steemann ce9136cbfa Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-04 17:10:04 +01:00
Jan Steemann 3a783dca76 added tests 2014-02-04 17:09:58 +01:00
Max Neunhoeffer 127e7009ef Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-04 14:45:19 +01:00
Jan Steemann 35c5c9012e added test cases 2014-02-04 11:51:04 +01:00
Max Neunhoeffer 0c8de8a3ae Add fs.makeAbsolute needed by kickstarter. 2014-02-04 11:36:28 +01:00
Jan Steemann 52040eaad6 added tests, fixed segfault 2014-02-04 09:54:56 +01:00
Jan Steemann a9c1fd005e test suite for CRUD 2014-02-03 19:26:05 +01:00
Jan Steemann 67a3f306d6 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-03 18:25:13 +01:00
Jan Steemann 18b38771dc added cluster CRUD tests 2014-02-03 18:24:57 +01:00
Jan Steemann 4339d5aab6 removed unused variable 2014-02-02 09:21:43 +01:00
Jan Steemann 4a99cde395 jslintified several tests 2014-02-01 01:50:58 +01:00
Max Neunhoeffer 73f3dbc328 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-31 18:56:47 +01:00
Frank Celler 014afdf792 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-31 15:56:21 +01:00
Frank Celler 29f075cfce added external processes 2014-01-31 15:55:51 +01:00
Jan Steemann 9643469631 do not allow changing shard key attributes 2014-01-31 13:19:03 +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
Max Neunhoeffer c3f01237b0 Implement replace and update on cluster. 
This still has a freeing too early bug with TRI_json_t.
 2014-01-28 16:49:44 +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
Max Neunhoeffer 7d5723756f Implement DELETE REST method on the coordinator. 2014-01-24 21:31:58 +01:00
Jan Steemann ea2af50683 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	Documentation/ImplementorManual/HttpSystem.md
	js/apps/system/aardvark/aardvark.js
	js/apps/system/aardvark/frontend/css/buttons.css
	js/server/version-check.js
 2014-01-24 14:50:09 +01:00
Max Neunhoeffer f5c274e8c0 Fix error handling and another bug in create document for cluster. 2014-01-24 10:35:37 +01:00
Max Neunhoeffer 9230f5020c First case of create document is working on cluster. 2014-01-23 16:16:06 +01:00
Jan Steemann d4227b32ef jshund 2014-01-23 14:57:54 +01:00
Max Neunhoeffer 165d98578a First hack at create document via REST on cluster. 2014-01-23 13:00:44 +01:00
Jan Steemann d10748155f follow up for issue #738 2014-01-21 13:31:01 +01:00
Jan Steemann f99f362f07 small improvement for issue #738 2014-01-21 13:30:38 +01:00
Alan Plum 3e653e303d Added __dirname, __filename pseudo-globals. Fixes #733. 2014-01-21 13:28:46 +01:00
Jan Steemann 80e8250d54 fixed segfault 2014-01-21 12:50:35 +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
Jan Steemann a2e11e606b added graph-specific error code 2014-01-18 01:08:24 +01:00
Jan Steemann e99f813e0a follow up for issue #738 2014-01-17 22:58:43 +01:00
Jan Steemann ed08a41a11 small improvement for issue #738 2014-01-17 22:01:24 +01:00
Jan Steemann c0aa6157ff Merge branch 'globals-filename-dirname' of https://github.com/pluma/ArangoDB into devel 2014-01-17 21:41:44 +01:00
Alan Plum 371bba964b Added __dirname, __filename pseudo-globals. Fixes #733. 2014-01-17 21:31:16 +01:00
Jan Steemann c9dabaca86 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-16 15:02:44 +01:00
Max Neunhoeffer 5960c103bc Create/drop Database/Collection compiles. 2014-01-16 15:01:36 +01:00
Jan Steemann f760d056df added startupPath value to result of /_api/foxx/config 
Conflicts:
	js/actions/api-foxx.js
 2014-01-15 18:10:26 +01:00
Jan Steemann cfdbb1996e added startupPath value to result of /_api/foxx/config 2014-01-15 18:05:27 +01:00
Jan Steemann b1c4f75e50 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-14 13:29:07 +01:00
Frank Celler 13d1e5e5ab Merge pull request #727 from pluma/manifest-lib-default-local 
App requires should be module-relative by default. Fixes #721
 2014-01-11 12:02:25 +01:00
Frank Celler 2fd7bfcbc3 Merge pull request #727 from pluma/manifest-lib-default-local 
App requires should be module-relative by default. Fixes #721
 2014-01-11 02:35:31 -08: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
Frank Celler 005144ff05 Merge pull request #723 from pluma/npm-default-package-main 
Default package "main" to "index". Fixes #719.
 2014-01-09 23:07:38 +01:00
Frank Celler 9582ea8c94 Merge pull request #723 from pluma/npm-default-package-main 
Default package "main" to "index". Fixes #719.
 2014-01-09 14:05:06 -08:00
Alan Plum 1a5f4c98f2 Fixed package file resolution. Fixes #718, #720. 2014-01-09 23:03:30 +01:00
Alan Plum 3d511060ce App requires should be module-relative by default. Fixes #721 2014-01-09 22:06:57 +01:00
Alan Plum 6c0f9ef6b0 Fixed package file resolution. Fixes #718, #720. 2014-01-09 19:06:15 +01:00
Alan Plum 1b72d07efc Default package "main" to "index". Fixes #719. 2014-01-09 18:17:20 +01:00
Jan Steemann 7a3635adf9 fixed problem with AQL functions in multiple databases 2014-01-08 09:53:03 +01:00
Jan Steemann 56054d3e66 fixed problem with AQL functions in multiple databases 2014-01-08 09:51:56 +01:00
Max Neunhoeffer eb2afb2f04 Implement case distinction for create collection between cluster and not. 2014-01-03 16:17:34 +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 b903d9080d Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
 2013-12-20 15:35:50 +01:00
Jan Steemann 8bc1692d54 fixed issue #711, #687 2013-12-20 15:13:23 +01:00
Jan Steemann 55deb10126 fixed issue #711, #687 2013-12-20 15:12:21 +01:00
Jan Steemann 2c8ef0125f ported web interface changes from devel to 1.4 2013-12-18 16:22:16 +01:00
Jan Steemann 67f72b26fa split big group of statistics into 2 separate groups 
Conflicts:
	CHANGELOG
 2013-12-13 16:08:58 +01:00
Jan Steemann ed927d26c8 split big group of statistics into 2 separate groups 2013-12-13 15:58:59 +01:00
Jan Steemann 13bcc2bf7a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2013-12-11 18:39:10 +01:00
Jan Steemann 2965accb05 add current state to agency 2013-12-06 14:23:02 +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 32a247aa2f added tests for creating / dropping graphs 2013-12-02 15:12:07 +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 9a1aa7a4cc removed superfluous error codes 2013-11-22 13:49:05 +01:00
Jan Steemann 0eeac02a91 removed unused error codes 2013-11-22 13:23:23 +01:00
Lucas Dohmen 2024bdf941 Graph: Fixed `getVertices` 2013-11-20 15:37:56 +01:00
Jan Steemann cf219d92d3 added debugSegfault 2013-11-20 13:15:45 +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
Jan Steemann c5e9538547 Merge remote-tracking branch 'origin/devel' into inline-shapes 
Conflicts:
	arangod/VocBase/document-collection.c
 2013-11-14 01:01:24 +01:00
Jan Steemann 86ccaaaf45 do not pollute global namespace 2013-11-11 21:07:38 +01:00
Jan Steemann 9de514d000 removed unused file 2013-11-11 21:07:24 +01:00
Jan Steemann f68113a5d2 do not pollute global namespace 2013-11-11 21:05:05 +01:00
Jan Steemann 6933d66af9 fixed test for Windows 2013-11-11 20:31:11 +01:00
Jan Steemann 6a0d54f1ff fixed test for Windows 2013-11-11 20:30:10 +01:00
Jan Steemann dfe8d82f30 added test for #665 2013-11-11 16:44:39 +01:00
Jan Steemann 303abcc60d issue #665: Hash/skiplist combo madness bit my ass 2013-11-11 16:38:38 +01:00
Jan Steemann ae872007ac updated database creation API 2013-11-07 14:06:44 +01:00
Jan Steemann 819e9a1cb6 fixed user creation on database creation 2013-11-07 13:32:42 +01:00
Jan Steemann 7055299a6e removed shape collections 2013-11-06 17:05:16 +01:00
Jan Steemann 241ad73940 fixed test 2013-11-06 10:16:26 +01:00
Jan Steemann d30ca7b658 added `/_api/database/user` method 2013-11-06 09:34:44 +01:00
Jan Steemann 7924f657d4 added `/_api/database/user` method 2013-11-04 14:22:00 +01:00
Lucas Dohmen 7d7e014bfe Only drop vertices when dropping a graph if vertices aren't used 
elsewhere
 2013-10-31 16:41:49 +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
Frank Celler a55fe725a8 fixed version 2013-10-29 14:21:27 +01:00
Jan Steemann 0814d4de22 updated documentation for console, added section about Foxx development 2013-10-17 13:09:39 +02:00
Jan Steemann cd5d228e77 moved path checks from --upgrade to server start and database creation 2013-10-16 15:30:13 +02:00
Jan Steemann 9bb89bb654 fixed "error with AQL in user function" 2013-10-16 09:43:24 +02:00
Jan Steemann 79f70c7eea replication applier will now preferrably use collection names instead of collection ids when applying events 2013-10-14 13:45:44 +02:00
Jan Steemann 5b2820a3e8 worked around arguments.callee 2013-10-10 08:40:43 +02:00
Jan Steemann e3df92d929 fix Windows file handling 2013-10-09 14:07:21 +02:00
Jan Steemann 4c8e0db434 fixed typo in method name 2013-10-08 13:56:20 +02:00