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

5221 Commits

Author SHA1 Message Date
Esteban Lombeyda 4e7af1f2e6 using correct parameter name (jslint thanks) 2014-05-26 16:15:38 +02:00
Esteban Lombeyda 8353af15eb renaming test method and cleaning 2014-05-26 16:07:47 +02:00
Esteban Lombeyda decb3944b2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 15:42:33 +02:00
Esteban Lombeyda e665a4cce8 bug fix: wrong parameter name 2014-05-26 15:41:55 +02:00
Esteban Lombeyda 5cc5d16645 Bug fix: yielding correct format for option parameters 2014-05-26 15:39:47 +02:00
gschwab 43009ce97c added update for _graphs to replace old graph definitions to new ones (containing edgeDefinitions) 2014-05-26 15:22:17 +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 0f70998408 fixed merge errors 2014-05-25 23:47:29 +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
Claudius Weinberger 7c00fad11a cluster dashboard changes 2014-05-25 23:33:38 +02:00
Claudius Weinberger 15c594dc67 cluster dashboard changes 2014-05-25 23:33:29 +02:00
Michael Hackstein 841f01e390 Added a close button to cluster popup 
Conflicts:
	js/apps/system/aardvark/frontend/scss/_modals.scss
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-05-25 23:33:05 +02:00
Claudius Weinberger e6ff2d135d cluster dashboard changes 2014-05-25 23:32:20 +02:00
Claudius Weinberger 68e9316a12 cluster dashboard changes 
Conflicts:
	js/apps/system/aardvark/frontend/scss/cluster.css
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-05-25 23:32:07 +02:00
Michael Hackstein dd28af0d3a Fixed style of new dashboard in cluster overview on click 
Conflicts:
	js/apps/system/aardvark/frontend/scss/cluster.css
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-05-25 23:25:51 +02:00
Michael Hackstein b57192aee3 Fixed position of enlarge button, and added option to show it for other charts, all enabled now because of missing history 2014-05-25 23:14:36 +02:00
Claudius Weinberger d8a46ce84c dashbaord design changes 2014-05-25 23:14:16 +02:00
Claudius Weinberger 4728a7cd45 dashbaord design changes 
Conflicts:
	js/apps/system/aardvark/frontend/js/config/dygraphConfig.js
 2014-05-25 23:13:56 +02:00
Michael Hackstein 73c27fcd36 Moved the enlarge icon of dashboard-charts to top right corner 
Conflicts:
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-05-25 23:12:42 +02:00
Michael Hackstein a87330e4a6 Fixed a bug in dashboard. The legend in Modalviews was selected before they existed 2014-05-25 23:11:10 +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 aa3a0c2896 cleanup cluster dashboard 2014-05-25 23:10:34 +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
Frank Celler 1a9b7056c7 generated files 2014-05-25 23:02:39 +02:00
Heiko Kernbach c6225a659e jslint 2014-05-23 18:56:30 +02:00
Heiko Kernbach f409dc86a9 added collectionsitemviewspec karma 2014-05-23 18:50:41 +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
Heiko Kernbach 540f5b53c2 added missing shortcuts event 2014-05-23 17:09:33 +02:00
Esteban Lombeyda f1c8e9e1b4 Functions ..ByExample support new signature 2014-05-23 16:26:23 +02:00
Heiko Kernbach b6f316e4e6 merge 2014-05-23 16:22:02 +02:00
Heiko Kernbach 820d47a790 added jasmine spec for shell view 2014-05-23 16:20:22 +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 caff3fac1a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-23 14:30:24 +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
Heiko Kernbach d19302e50e #853 - fixed disabled info icon issue 2014-05-23 10:19:14 +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
Esteban Lombeyda c6228daa90 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-22 15:55:00 +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
Esteban Lombeyda 9774991e31 strong examination of function parameters 2014-05-22 15:41:21 +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 e345129987 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-22 10:36:31 +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
Thomas Schmidts 4d76ff399e issue #867: added declaration for several methods 2014-05-22 10:20: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
Thomas Schmidts 166d010b35 added declaration in update vertex 2014-05-21 14:25:21 +02:00
Esteban Lombeyda 4af97257b9 Buf fix: Java Script Syntax error 2014-05-21 12:51:25 +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 11ea87f8fc issue #866: Recurrent/obtrusive "No statistical data yet" popup 2014-05-20 17:48:39 +02:00
Jan Steemann ecf08da0cf cleanup 2014-05-20 17:44:52 +02:00
Jan Steemann 15c37a6def Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 17:09:58 +02:00
Jan Steemann 369ffd7788 issue #866: Recurrent/obtrusive "No statistical data yet" popup 2014-05-20 17:08:47 +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
scottashton 88e8ea849f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 16:45:27 +02:00
scottashton a8cacef57d added GRAPH_NEIGHBORS 2014-05-20 16:45:22 +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
scottashton 3b076c4629 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 15:55:35 +02:00
scottashton c99ce5167d traversal aql 2014-05-20 15:55:07 +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
Max Kerp 13c3b80976 clean up 2014-05-20 15:17:51 +02:00
Max Kerp b11cffa1c9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 14:53:48 +02:00
Max Kerp 8dd3babebd fixed scss-lint 2014-05-20 14:53:05 +02:00
Michael Hackstein f8d2faf8d5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-20 14:43:47 +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
scottashton b1ce2058fd Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 13:50:40 +02:00
scottashton 009f83026a finished GRAPH_PATHS in aql 2014-05-20 13:50:34 +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 7d7396a0a8 added derived file 2014-05-20 11:50:42 +02:00
Max Kerp 5b630fb01b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 11:40:47 +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
Max Kerp 9ca0447b69 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 11:39:18 +02:00
Max Kerp a1feb3e19e implemented a form-validation for text-inputs, now 
prohibiting the user to save custom AQl queries containing special html
characters.
 2014-05-20 11:36:18 +02:00
Jan Steemann 6ecfc44f11 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-20 11:32:02 +02:00
Max Kerp 9a2566ad4c fixed the bug that the number of total documents wasn't updated 
when deleting a document and modified the test.
 2014-05-20 11:24:31 +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
scottashton 4d2939de17 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-19 16:42:34 +02:00
scottashton 0f68fa982d fixed bug in edges 2014-05-19 16:42:30 +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
scottashton 35b34e4804 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-19 15:28:16 +02:00
scottashton 256868bdc2 aql function edges 2014-05-19 15:28:05 +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 aec7099a3e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-19 09:34:06 +02:00
Michael Hackstein a0985ec515 Fixed tests to use graph functions starting with _ 2014-05-19 09:34:02 +02:00
Jan Steemann 295870565b issue #864: Inconsistent behavior of AQL REVERSE(list) function 2014-05-19 09:31:39 +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
Jan Steemann 2cb694b2d5 make test restartable 2014-05-17 13:13:30 +02:00
Jan Steemann bed37d7d11 slightly less comparisons 2014-05-17 12:04:54 +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 e532223fcd small optimizations 2014-05-17 01:38:39 +02:00
Jan Steemann 63b287157f jshund 2014-05-17 00:55:37 +02:00
Jan Steemann 0ca849efb9 emit buffer to prevent very big string allocations/reallocations 2014-05-17 00:12:32 +02:00
Jan Steemann 1c6f63bad0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-16 20:13:33 +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
Heiko Kernbach 6582ce9b8a merge 2014-05-16 20:02:29 +02:00
Heiko Kernbach 71f8619ede karma 2014-05-16 20:01:26 +02:00
Heiko Kernbach 8aa7120dbb jslint 2014-05-16 20:01:07 +02:00
Heiko Kernbach 8172666dbb added new indicator for shortcuts help 2014-05-16 19:47:43 +02:00
Heiko Kernbach 2eaac09ec4 added hotkey modal template to manifest.json 2014-05-16 19:36:57 +02:00
Heiko Kernbach e14c87f0d7 added template for hotkeys modal 2014-05-16 19:36:37 +02:00
Heiko Kernbach 9d3b292183 new scss file for hotkeys modal 2014-05-16 19:36:23 +02:00
Heiko Kernbach a0bbd238c3 added global shortkey helper - press question mark + shift 2014-05-16 19:35:51 +02:00
Heiko Kernbach 02680a4c15 fixed arangoSpec 2014-05-16 19:35:25 +02:00
Jan Steemann 51e9059e3e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-16 19:06:26 +02:00
Jan Steemann e3f7df878e added derived file 2014-05-16 19:06:16 +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 a6b238c8f3 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-16 15:43:30 +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
Heiko Kernbach b4ecbff331 fixed collections logs spec 2014-05-16 15:35:56 +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
Heiko Kernbach bb92ebe4fc merge 2014-05-16 13:12:23 +02:00
Heiko Kernbach 70a7f1a45c removed shellviewspec from json 2014-05-16 13:11:21 +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
Heiko Kernbach 969826af27 jslint 2014-05-16 13:01:34 +02:00
Heiko Kernbach 4cb82ee0b1 logs bugfix 2014-05-16 12:58:25 +02:00
Heiko Kernbach fc8003b4d7 fixed logs spec 2014-05-16 12:26:47 +02:00
Heiko Kernbach 903b3aaaeb temp commented out 2014-05-16 12:21:21 +02:00
Heiko Kernbach e5115fabfd removed console logs 2014-05-16 12:19:19 +02:00
Heiko Kernbach f5c1fcd25f added shellViewSpec, invertet order of logs showing up @ frontend 2014-05-16 12:18:19 +02:00
scottashton 266f72a253 initial checkin for new graph module 2014-05-16 11:29:22 +02:00
scottashton b74a0b18e6 added tests to new jsoneditor function 2014-05-15 16:44:30 +02:00
Jan Steemann 978c6b1991 giving up 2014-05-15 16:28:14 +02:00