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

827 Commits

Author SHA1 Message Date
scottashton c657790bc4 cleaned up example for getConnectingEdges 2014-12-08 10:58:59 +01:00
Thomas Schmidts e799dfa8f9 Fixed #1007 spelling error fixed 2014-12-05 14:28:08 +01:00
Willi Goesgens 1024750c07 Clarify whether the test is running via arangosh or arangod. 2014-12-01 14:21:00 +01:00
scottashton 401157edd1 jslinted 2014-11-20 09:53:50 +01:00
scottashton 6a418d3a05 added new graph function _connectingEdges 2014-11-19 09:26:40 +01:00
Jan Steemann a71bf1819c issue #1099: do not fail if general-graph.remove is used inside a transaction 2014-11-17 15:47:39 +01:00
Jan Steemann 64392bfed1 fixed tests 2014-11-17 13:31:02 +01:00
Jan Steemann 675e2a0d40 fixed WITHIN_RECTANGLE for cluster 2014-11-17 12:32:43 +01:00
Jan Steemann 67356de499 issue #1098: some tests for error checking 2014-11-14 17:14:33 +01:00
Jan Steemann 2c0f5b96c9 issue #1098: added better error checking 2014-11-14 16:56:25 +01:00
Jan Steemann 025d73ae03 re-added support for fullCount 2014-11-01 15:20:05 +01:00
Jan Steemann 26c3b0174f fixed tests 2014-10-31 19:58:20 +01:00
Jan Steemann 4f68960ed7 removed Ahuacatl [skip ci] 2014-10-31 17:31:00 +01:00
Jan Steemann 4418e58315 removed old-style Doxygen sections 2014-10-30 01:16:07 +01:00
Jan Steemann cf6fcb2fc1 linted python files, regenerated derived files 2014-10-29 23:56:20 +01:00
Jan Steemann e581aa6612 fixed usage of AQL user-defined functions from web UI 2014-10-27 11:09:20 +01:00
Thomas Schmidts d79ff5d74d Fixed broken links 2014-10-24 17:49:01 +02:00
Jan Steemann edae662eb4 added res.send() and res.sendFile() 2014-10-15 17:33:10 +02:00
Jan Steemann c5c7957b5e manually merged pr #1029 by @baslr 2014-09-29 13:52:32 +02:00
Willi Goesgens ca23f467ed Evaluate the correct return code here too. 2014-09-23 13:21:41 +02:00
Jan Steemann 481a16fd7a removed bitarray indexes 2014-09-15 14:19:38 +02:00
Jan Steemann 4e6f6f2cbd finalized move to cxx 2014-09-14 00:06:00 +02:00
Michael Hackstein 9b62c7367b Deprecated _directedRelation and _undirectedRelation in general-graphs. Created _relation in general-graphs creating a _directedRelation. Handling undirected relations is now given to the user / api-implementor as arangodb itself does not offer any direction constrains which caused some confusion 2014-09-10 15:50:22 +02:00
Alan Plum b0995dfdb7 Replaced PBKDF2_HMAC with PBKDF2_HMAC_SHA1 for OSX compat. 2014-09-08 14:32:40 +02:00
Alan Plum 469af580e5 Added PBKDF2-HMAC. 2014-09-05 16:23:37 +02:00
Frank Celler 4ffec6e914 tried to silence rpmlint: remove empty files, remove unused scripts, fixed initgroups, fixed identical files, remove __DATE__ 
Conflicts:
	CHANGELOG
	Makefile.in
 2014-09-05 09:28:21 +02:00
Alan Plum 4e3659c01a Added support for sha384, sha512. 2014-09-04 23:17:58 +02:00
Alan Plum 39ba358cd8 Added JWT support for session headers. 2014-09-04 18:51:06 +02:00
Alan Plum 37888a98ea Pass on null queries. 2014-09-03 11:39:02 +02:00
Alan Plum 33db483e7f Support AQB instances as query strings. 2014-09-03 11:36:55 +02:00
Alan Plum b384563d97 Linting: tutorial, changes. 2014-09-02 22:21:45 +02:00
Alan Plum e86c98dfe2 Enabled unused: true, ported aardvark jslint to jshint. 2014-09-02 22:18:18 +02:00
Alan Plum 7b24bdba8d Enabled strict: true. 2014-09-02 22:16:07 +02:00
Alan Plum 606da1e3e8 Removed jslint headers from server/client/common modules. 2014-09-02 22:14:56 +02:00
Alan Plum 6a3386e55a Fixed jshint headers. 2014-09-02 22:12:45 +02:00
Jan Steemann cda10393f5 some traversal speedups 2014-08-27 18:56:51 +02:00
Alan Plum 601c99c6e5 Linting. 2014-08-25 20:01:18 +02:00
Alan Plum 898fad4980 Added support for JWT alg: 'none'. 2014-08-25 18:35:23 +02:00
Alan Plum d37b13ee0f Implemented crypto.jwtEncode/jwtDecode (HS256 only). 2014-08-25 18:25:48 +02:00
Frank Celler be06ef7f25 new upgrade-database (formely known as version-check) and new startup procedure 2014-08-07 14:12:19 +02:00
Jan Steemann 0e8949f8b3 unify function behavior in shell and server 2014-08-05 09:07:28 +02:00
Michael Hackstein 83d49c0d9d Fixed a minor bug where it was not allowed to remove a vertex from a graph by its key 2014-07-30 09:41:57 +02:00
Frank Celler 55e1ee43bd added createLocations 2014-07-24 16:06:06 +02:00
gschwab 0df37812e2 initial check in 2014-07-23 13:39:16 +02:00
Jan Steemann e7c18b40a6 fixed statistics interval 2014-07-23 11:39:15 +02:00
Max Neunhoeffer a8e3236560 Snapshot, legend cache started. 2014-07-22 16:59:19 +02:00
Michael Hackstein 3ecae27acd Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-15 16:57:33 +01:00
Michael Hackstein db33dd22d2 Fixed a minor bug in gharial where there was no correct error code was thrown when trying to store a vertex in a non existing graph. Also allowed the _create method of graph module to take options like waitForSync 2014-07-15 16:57:24 +01:00
Thomas Schmidts f4e60b7315 Fixed too long line 2014-07-11 09:29:31 +02:00
Thomas Schmidts de75804367 Chapters are color-coded in the documentation. Also bug fixed for Safari 2014-07-10 16:33:47 +02:00
Michael Hackstein 608dd475f6 Fixed an error in a general graph example 2014-07-10 13:38:16 +02:00
Michael Hackstein 8cf3a41a0c Used documentation generation commands in general graph documentation 2014-07-09 09:58:04 +02:00
Michael Hackstein b0722d9981 FIxed a bug in an example 2014-07-08 17:36:16 +02:00
Michael Hackstein c3a9335621 General graph module now allows to drop the collection alongside the definition of a graph 2014-07-08 17:30:14 +02:00
Michael Hackstein 1f795fec66 Improved gharial and general graph documentation. Gharial now documents waitForSync, keepNull and if-match 2014-07-08 17:18:15 +02:00
Michael Hackstein c9b14f9413 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-08 16:02:06 +02:00
Michael Hackstein 47d092cc3c Removed commented debug output 2014-07-08 16:02:01 +02:00
Thomas Schmidts c9ece0af5c @startDocuBlock removed from non used code block 2014-07-08 15:40:30 +02:00
Michael Hackstein bbda062747 Fixed a minor bug when updating the edge definitions. The currently referenced graph object was not updated properly, the stored one was. 2014-07-08 15:23:59 +02:00
Michael Hackstein f763f0aa13 Added an error for the graph module. It will be thrown on the attempt to add an orphan collection that is already used. Also alloed orphan collections for restrictions in fluentAQL 2014-07-08 13:53:39 +02:00
Michael Hackstein 9c452b826c Fixed a bug where collections where dropped although they were used as orphans in other graphs 2014-07-08 09:50:30 +02:00
Thomas Schmidts 19e750b35f Fixed some small errors in @startDocuBlock 2014-07-07 16:58:26 +02:00
Thomas Schmidts 1a78807a67 Fixed a few @startDocuBlock errors 2014-07-07 16:15:50 +02:00
scottashton 866604f93d jslinted 2014-07-07 14:47:14 +02:00
scottashton 64a72ed12b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-07 14:22:41 +02:00
scottashton c5bfe5a33c changed gharial to match php api 2014-07-07 14:21:58 +02:00
Jan Steemann c12df38eb2 fixed broken examples 2014-07-06 02:25:19 +02:00
Jan Steemann 158cdd1c7a improved printing of cursors 2014-07-06 00:44:37 +02:00
Jan Steemann 27c106e1f2 removed debug output 2014-07-03 18:51:50 +02:00
Jan Steemann 7554ead5d4 fixed recovery 2014-07-03 16:58:10 +02:00
Thomas Schmidts 0328c9a900 Fixed a few spelling and code erros and deleted last examples 2014-07-02 17:48:54 +02:00
Jan Steemann eae94f97a8 removed dead code 2014-07-02 00:21:58 +02:00
Jan Steemann 0d6ecea63f removed debug output 2014-07-01 15:58:51 +02:00
gschwab 76d6188a34 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 14:37:39 +02:00
Thomas Schmidts 6a12940da0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-30 14:07:29 +02:00
gschwab 9bd7d0bb87 fixed orphan prob 2014-06-30 13:39:02 +02:00
Jan Steemann 6d5da6d834 fixed test 2014-06-30 13:28:26 +02:00
Thomas Schmidts 7d0ab74085 Fixes make examples error 2014-06-30 11:47:42 +02:00
Thomas Schmidts 52ad8fc702 Some changes in the documentation code for gitbook 2014-06-30 09:29:02 +02:00
Thomas Schmidts 148f400991 Changed some (sub)chapters and fixed spelling errors 2014-06-27 11:02:10 +02:00
gschwab a205a49f1a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/views/graphManagementView.js
 2014-06-26 15:57:53 +02:00
gschwab 95e60c069b edit graph 2014-06-26 15:54:50 +02:00
Thomas Schmidts 3eae1a4751 Exchanged verbinclude with Arangosh for bett examples in gitbook 2014-06-26 13:41:17 +02:00
Thomas Schmidts d01417c6ed changed simple-query-common.js to read out the comments for the dcoumentation 2014-06-25 17:39:46 +02:00
Thomas Schmidts 45f27782e0 More changes in the documentation code 2014-06-25 17:27:12 +02:00
gschwab 165daa0c1e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/views/graphManagementView.js
 2014-06-25 16:33:32 +02:00
gschwab 51389fcfd6 fixed graph managment 2014-06-25 16:32:23 +02:00
Thomas Schmidts a43e8e065d Some changes in the documentation code 2014-06-25 16:29:17 +02:00
Thomas Schmidts cba9529153 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-25 16:15:36 +02:00
scottashton 9d0399ee0e new templates for graph management 2014-06-25 16:08:21 +02:00
scottashton 235a438c0c finished documentation of complexity 2014-06-25 15:51:41 +02:00
Thomas Schmidts 9d26904ffc Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-25 15:18:13 +02:00
Thomas Schmidts f005d676cb Some changes in the code documentation 2014-06-25 15:10:13 +02:00
gschwab d7520ce53c jslint 2014-06-25 15:02:47 +02:00
Thomas Schmidts f7be757b0b Some changes in the code documentation 2014-06-25 14:57:29 +02:00
gschwab 71621b9d4e fixed tests 2014-06-25 14:47:03 +02:00
gschwab 834a4a5c7c docu feedback integrated 2014-06-25 11:20:24 +02:00
gschwab 58c75a582a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-25 09:14:55 +02:00
gschwab 466d13ddd2 new graph management 2014-06-25 09:14:45 +02:00
Lucas Dohmen 9b37812da6 Review of General Graph 2014-06-24 23:44:49 +08:00
Thomas Schmidts 34e1addcfb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 17:23:54 +02:00
Jan Steemann f411fceb2e exposed WAL API 2014-06-24 16:10:27 +02:00
Thomas Schmidts 0bf957ddd7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 14:28:50 +02:00
Thomas Schmidts 0d969e6814 Changes in the gitbook, also bug fixing in code 2014-06-24 14:28:30 +02:00
scottashton 3ba8719173 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 13:13:09 +02:00
scottashton 4f01409c4b processed lucas feedback regarding aql docu 2014-06-24 13:13:01 +02:00
Alan Plum d2f0b0efc5 Added HMAC-SHA224, exposed SHA1, SHA224. 2014-06-24 12:49:20 +02:00
gschwab 5f5d6171cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 11:54:48 +02:00
gschwab e049f85b44 docu 2014-06-24 11:54:42 +02:00
Jan Steemann 31e6823daa fixed invalid regex 2014-06-24 11:24:10 +02:00
gschwab f9f73c4e51 docu 2014-06-24 10:44:06 +02:00
gschwab 62dd01fe00 docu 2014-06-24 10:41:23 +02:00
Thomas Schmidts 8d4527a8c9 Changed Documentation in code 2014-06-24 00:01:27 +02:00
Thomas Schmidts 859ad4fbb0 Changes in the code documentation 2014-06-23 16:18:58 +02:00
Michael Hackstein cff6bd9380 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
 2014-06-23 15:15:18 +02:00
Michael Hackstein 57a77b4420 Changed all examples so they use graph_module and graph as variable names 2014-06-23 15:14:39 +02:00
scottashton 4e717d5430 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 15:11:54 +02:00
scottashton e2fc348467 fixed broken links and typos in general-graph 2014-06-23 15:11:36 +02:00
gschwab b69b016f87 layout 2014-06-23 14:44:07 +02:00
gschwab 898311c23b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:44:24 +02:00
gschwab 0b09442ad9 typos 2014-06-23 13:44:04 +02:00
scottashton 7efc5b77cf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:35:01 +02:00
scottashton 371bfabf67 spellchecked gitbook for general-graph and ahuacatl 2014-06-23 13:34:44 +02:00
gschwab 35b645ba1a deleted print O.o 2014-06-23 13:23:09 +02:00
gschwab 19191b5a1b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:20:18 +02:00
gschwab 4651fbd34a deleted print 2014-06-23 13:20:12 +02:00
Michael Hackstein 658fa5cc25 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-23 13:18:06 +02:00
Michael Hackstein 273eaf95fb Added graph specific deprecation information to DEPRECATED.md 2014-06-23 13:17:20 +02:00
gschwab 8b347c6714 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:02:00 +02:00
gschwab cda1eb462c sorting for edgeDefinitions added 2014-06-23 13:01:55 +02:00
scottashton b35b19a231 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 11:37:57 +02:00
scottashton fa2084ea9b fixed bug in commonPorperties, now attributes with the value of 'false' are included in result, fixed js shell to full general-graph support 2014-06-23 11:37:43 +02:00
Michael Hackstein d0213dc516 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-23 11:01:07 +02:00
Michael Hackstein b37881c4de Fixed minor mistakes in general graph module documentation 2014-06-23 11:01:04 +02:00
gschwab 5406db3dc8 renamed _getToVertex(...) -> _toVertex(..) 2014-06-23 10:16:05 +02:00
Michael Hackstein 7bf98a463b Documentation fixes in general graph module. Fixed Example to drop a graph (drops collections in background now) 2014-06-23 09:50:19 +02:00
gschwab 69df68c54e renamed _getFromVertex(...) -> _fromVertex(..) 2014-06-23 09:47:48 +02:00
gschwab d31e8f784b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
 2014-06-23 09:13:51 +02:00
gschwab 1f02d36570 renamed _getFromVertex(...) -> _fromVertex(..) 2014-06-23 09:11:07 +02:00
Michael Hackstein b468d336c8 Fixed an error for list of graphs in the graph module 2014-06-20 17:45:37 +02:00
Michael Hackstein 76049a456a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 17:25:14 +02:00
Michael Hackstein 59010f7a68 Finished with the first run through the general graph modules documentation to add improvements 2014-06-20 17:25:05 +02:00
Michael Hackstein 7bff2d7ff7 And some more optimizations of the general graph module documentation 2014-06-20 16:57:33 +02:00
Lucas Dohmen 192a35eeca testrunner jslinted 2014-06-20 16:40:34 +02:00
Lucas Dohmen b88be851e8 JSLinted org/arangodb/extend 2014-06-20 16:40:34 +02:00
Lucas Dohmen f6b7bb23a0 Remove the stub and mock module 
This is now inside of shell-foxx until it has been converted to
Jasmine
 2014-06-20 16:40:34 +02:00
Lucas Dohmen ca6a9c02ca `backbone` is now `org/arangodb/extend` 2014-06-20 16:40:34 +02:00
Michael Hackstein 426961abef Further improvements of general-graph documentation. 2014-06-20 16:21:17 +02:00
Lucas Dohmen 95fb92b195 Move testrunner into the org/arangodb 'namespace' 2014-06-20 16:05:09 +02:00
Michael Hackstein 1db8391e42 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 16:02:00 +02:00
Michael Hackstein c0cbe73476 Futher layout optimization of FluentAQL Graph Module 2014-06-20 16:01:25 +02:00
gschwab ad6e867e9d merge 2014-06-20 15:15:16 +02:00
gschwab b311c94977 exception handling 2014-06-20 15:11:29 +02:00
Michael Hackstein 707c79d5a5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 15:07:29 +02:00
Michael Hackstein 0eff0753e8 Started improving the layout of FluentAQL Documentation in general graph module 2014-06-20 14:57:04 +02:00
Frank Celler af109c73ca Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/server/modules/org/arangodb/foxx/manager.js
 2014-06-20 14:41:13 +02:00
Frank Celler e5c0418a35 fixed issue #707: Missing exception on mounting foxx app without collection 2014-06-20 14:28:23 +02:00
Jan Steemann e51dcdb2cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/common/tests/shell-general-graph.js
 2014-06-20 13:39:51 +02:00
scottashton ec2d0e94f5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 13:00:01 +02:00
scottashton ec45a40d0b changed examples in routplanner 2014-06-20 12:59:56 +02:00
Heiko Kernbach 3c72644b00 added functionality to download and install foxx applications from github 2014-06-20 10:30:35 +02:00
scottashton 678277981c fixed merge conflict 2014-06-20 09:59:00 +02:00
scottashton b263e38a9e docu refactoring, added more functions into graph module 2014-06-20 09:58:09 +02:00
Jan Steemann e132c8ea19 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 09:45:53 +02:00
gschwab dbe0cbbf7f renamed _directedRelationDefinition(...) -> _directedRelation(..) 2014-06-20 09:01:35 +02:00
gschwab 639e657897 renamed _undirectedRelationDefinition(...) -> _undirectedRelation(..) 2014-06-20 08:56:59 +02:00
Jan Steemann 73e3fd5551 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-18 21:13:51 +02:00
Frank Celler 42b7014237 replaced @EXAMPLES 2014-06-18 19:44:32 +02:00
Frank Celler 5ea6286029 removed leading blanks 2014-06-18 19:14:34 +02:00
Jan Steemann 589ff8e208 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-18 17:26:20 +02:00
Michael Hackstein ff709e92b6 Fixed examples for graph http module 2014-06-18 16:50:14 +02:00
Jan Steemann 1d68586500 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
 2014-06-18 16:37:28 +02:00
Jan Steemann 8b9cdbe075 fixed tests 2014-06-18 16:34:11 +02:00
gschwab 10ff1d391c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-18 15:22:55 +02:00
gschwab cb649c1293 fixed collection binding 2014-06-18 15:22:49 +02:00
Alan Plum c9d7f113a6 Linting. 2014-06-18 15:19:12 +02:00
Michael Hackstein f9b16f5e23 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-18 14:49:04 +02:00
Michael Hackstein 1d503a0d2a Added the knows graph of the traversal module to graph examples. Started rewriting traversal examples for new graph module. 2014-06-18 14:44:40 +02:00
gschwab 6ff46bb068 docu fixed 2014-06-18 11:12:10 +02:00
gschwab 528b1e85cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-18 10:56:22 +02:00
gschwab dcd9cd669f graph._removeVertexCollection(...): dropCollection default set to false - docu 2014-06-18 10:56:18 +02:00
Michael Hackstein 25293a4d20 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-18 10:51:06 +02:00
gschwab 6dc18982aa graph._removeVertexCollection(...): dropCollection default set to false 2014-06-18 10:50:07 +02:00
gschwab 820d318927 graph._drop(): dropCollection default set to false 2014-06-18 09:52:49 +02:00
gschwab 7366e8a6d9 renamed removeOrphanCollection(..) -> removeVertexCollection(..) 2014-06-18 09:29:34 +02:00
gschwab 903dce0fbf renamed getOrphanCollections() -> orphanCollections() 2014-06-18 09:01:04 +02:00
Michael Hackstein 11b48ceca2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-18 08:53:29 +02:00
Alan Plum 130e7fa53b Added crypto.constantEquals. 2014-06-18 01:15:39 +02:00
Michael Hackstein 2136673e94 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-17 18:22:31 +02:00
gschwab 4f962ed379 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-17 18:18:28 +02:00
Jan Steemann acba4c8851 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	CHANGELOG
 2014-06-17 15:31:04 +02:00
Michael Hackstein 9a948ed92b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-17 13:34:42 +02:00
Alan Plum de9750cf21 Fixed hmac comments. 2014-06-17 13:25:07 +02:00
gschwab 9b68074a40 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-17 13:22:38 +02:00
gschwab 889bf312a1 docu 2014-06-17 13:22:32 +02:00
Michael Hackstein 17b088fcc8 Fixed example generation for new graph module 2014-06-17 13:22:31 +02:00
Michael Hackstein 18df651dff Fixed some graph module examples 2014-06-17 13:14:05 +02:00
scottashton d5bffb80c6 resolve merge conflict 2014-06-17 11:50:29 +02:00
scottashton 094809bdf8 more docs 2014-06-17 11:43:21 +02:00
gschwab 9176391eb6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-17 11:23:37 +02:00
Michael Hackstein 9fe3d9d2f2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-17 11:23:16 +02:00
gschwab cb18e9e8b3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-17 11:22:03 +02:00
Michael Hackstein 5f43e43979 Added more in-code documentation for the graph module 2014-06-17 11:21:22 +02:00
Jan Steemann 70fec69952 added crypto.hmac function 2014-06-17 11:20:46 +02:00
gschwab 579b55e8f6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-17 10:57:45 +02:00
gschwab 37b532d872 fixed docu examples 2014-06-17 10:57:37 +02:00
Michael Hackstein 59d8ebe830 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-17 09:53:15 +02:00
Michael Hackstein 37c006c8dc Added documentation for _create function in graph module code 2014-06-17 09:53:11 +02:00
gschwab 1afee1b2eb fixed docu 2014-06-17 09:42:34 +02:00
Jan Steemann 30460bb72c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-17 00:49:37 +02:00
gschwab 6fe06843fe manually merged docu into mdpp 2014-06-16 16:22:49 +02:00
Jan Steemann 02d171412d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
 2014-06-16 14:47:41 +02:00
gschwab 2514183982 jslint 2014-06-16 14:30:42 +02:00
gschwab 229834f5a4 fixed merge conflicts 2014-06-16 14:27:47 +02:00
gschwab 3943fdeb13 refactored orphan treatment for guacamole belongings 2014-06-16 14:16:21 +02:00
Michael Hackstein dc3e3703cc Solved uniqueness conflicts for generated examples 2014-06-15 23:12:26 +02:00
Jan Steemann 5a53dc9f44 fixed typos 2014-06-13 20:08:02 +02:00
Jan Steemann 85b92dbf21 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-13 18:16:48 +02:00
Michael Hackstein fdece972d0 Added tests for vertex and edge collection lists in http interface. Added docu for _list in general-graph module 2014-06-13 16:41:48 +02:00
Michael Hackstein 7541149200 Added functions to list all graphs and all vertex/edge collections of a specific graph to http-api 2014-06-13 15:11:59 +02:00
Jan Steemann d7f35bcc7b fixed datafile ticks issues 2014-06-13 14:46:21 +02:00
gschwab f067be5a97 orphan may only be added when not used in edge def 2014-06-13 13:56:39 +02:00
gschwab 0646677b3e orphan collections treatment added with edit edge definitions 2014-06-13 11:51:15 +02:00
Jan Steemann 9e03189fb0 added waitUnload as a test helper function 2014-06-13 11:31:14 +02:00
Jan Steemann 9e19e0c6ca don't print errors if something goes wrong 2014-06-13 02:23:13 +02:00
gschwab 1ed179cbaa some docu for orphan collections 2014-06-12 16:57:31 +02:00
gschwab c46e0df090 added CRD for orphan collections of graphs 2014-06-12 15:28:35 +02:00
gschwab 17e850f646 fixed tests 2014-06-12 13:30:21 +02:00
gschwab 3900902821 tmp repaired empty block for commit 2014-06-12 11:42:27 +02:00
gschwab d8bcfd3bbb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-12 11:36:39 +02:00
gschwab 7f9d3ffc03 fixed errors, added (standalone) vertex collection function for graphs 2014-06-12 11:36:29 +02:00
scottashton f4b67ed01d jslinted 2014-06-11 16:04:15 +02:00
gschwab 63272b8a47 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-11 15:51:41 +02:00
gschwab de08c073ab jslint 2014-06-11 15:50:30 +02:00
scottashton 5bb6a22e82 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-11 15:45:46 +02:00
scottashton 8209796f7c added documentation to ahuacatl general graph functions and refactored common_Neighbors and common_properties 2014-06-11 15:45:31 +02:00
gschwab 3556868659 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-11 14:52:10 +02:00
gschwab 4bc2905f29 added extend and edit functions for edgeDefinitions of existing graphs 2014-06-11 14:51:26 +02:00
Michael Hackstein f9628e48c2 Fixed tests for new error codes. Also implemented creation of an empty graph initially. It can be modified during runtime 2014-06-11 10:52:07 +02:00
Michael Hackstein aa659e4686 Fixed JSLint warning 2014-06-11 10:23:03 +02:00
Michael Hackstein e2ab756642 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-11 09:59:41 +02:00
Michael Hackstein d2159e8897 Added some error objects for general graph module 2014-06-11 09:59:23 +02:00
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