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

1818 Commits

Author SHA1 Message Date
Frank Celler 0703809e00 added isIP 2014-07-07 18:46:02 +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 cbf7e27f68 added derived files 2014-07-03 17:12:56 +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
Jan Steemann 4cd20bfb7c fixed syncs across multiple files 2014-07-01 13:12:36 +02:00
Alan Plum edf850ce87 Formatting, whitespace. 2014-06-30 17:43:59 +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
Jan Steemann d6a93a5535 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 13:07:56 +02:00
Jan Steemann bda2db16da recovery and replication 2014-06-30 13:07:48 +02:00
Max Neunhoeffer 48762f3cc2 Add disabled tests. 
Disable shell-readonly test on server.
 2014-06-30 12:45:10 +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
Jan Steemann 0860012140 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-27 19:11:50 +02:00
Jan Steemann 067dbf63b2 WAL recovery 2014-06-27 19:11:41 +02:00
scottashton e6225b66c6 adjusted tests for new rewrite rules on apache 2014-06-27 17:02:02 +02:00
Thomas Schmidts 148f400991 Changed some (sub)chapters and fixed spelling errors 2014-06-27 11:02:10 +02:00
Esteban Lombeyda 5206610e18 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-26 16:39:09 +02:00
Esteban Lombeyda 5d162c0b3c moving some nonccluster tests to a new file 2014-06-26 16:38:08 +02:00
Jan Steemann a8e1aabd40 renamed test file 2014-06-26 16:19:22 +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
Jan Steemann eec6012318 increased wait time 2014-06-26 13:18:30 +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 cf14609727 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 16:12:07 +02:00
Jan Steemann f411fceb2e exposed WAL API 2014-06-24 16:10:27 +02:00
Thomas Schmidts f4c6c97488 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 16:09:27 +02:00
Frank Celler 840950c6a0 fixed printing of functions and example generation 2014-06-24 15:32:43 +02:00
Jan Steemann a289c9aa78 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 15:11:30 +02:00
Jan Steemann c4aad1e0cd added tests 2014-06-24 15:11:19 +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 3dc7188141 heal the build 2014-06-24 14:26:46 +02:00
Alan Plum d50bd571f7 Trimmed line length. 2014-06-24 13:24:32 +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
Jan Steemann 53909c0dcd adjusted tests 2014-06-23 18:45:06 +02:00
Jan Steemann f72ccde9cf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 17:46:25 +02:00
Jan Steemann 13e061bd76 fixed tests 2014-06-23 17:46:00 +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 a954b7a781 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:34:18 +02:00
Jan Steemann 6707468c95 excluded collection 2014-06-23 13:27:27 +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
Jan Steemann 82a220361c issue #919: fixed null options handling 2014-06-23 08:40:51 +02:00
Jan Steemann b5fe73270c use test-helper for unloading collections 2014-06-21 03:19:54 +02:00
Jan Steemann 16bf152c8f fully removed replication logger 2014-06-21 00:32:47 +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
Lucas Dohmen ec43e21fb7 Move `util` to node, because it is only used there 2014-06-20 16:40:33 +02:00
Michael Hackstein 426961abef Further improvements of general-graph documentation. 2014-06-20 16:21:17 +02:00
gschwab 34cd589908 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 16:19:04 +02:00
gschwab 28b5f27ca6 error added 2014-06-20 16:18:58 +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 3fb7a85ca0 error handling 2014-06-20 15:36:26 +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 44b1421f82 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 14:48:26 +02:00
Jan Steemann be0b4b8c6e remove definePeriodic 2014-06-20 14:45:14 +02:00
scottashton 7c532982d0 stabilized tests 2014-06-20 14:41:44 +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
scottashton 45b46fb45b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 14:07:56 +02:00
scottashton fda940cd1b fixed tests 2014-06-20 14:07:40 +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 6c0dcf85c4 WAL DDL markers 2014-06-19 14:33:38 +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 791c3bb67e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-18 17:01:32 +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
Frank Celler cef655eb49 ignore devel version 2014-06-18 16:04:48 +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
Lucas Dohmen 360d9c82a1 Merge pull request #910 from triAGENS/foxx_repository 
Rewrote the Foxx Repository Specs with Jasmine
 2014-06-17 21:48:09 +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
Lucas Dohmen 79f2c7f72c Jasmine Fixes 2014-06-17 17:34:54 +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 509c2c9c9f Lint, whitespace. 2014-06-17 13:30:11 +02:00
Alan Plum d43afae82a More exhaustive testing for hmac. 2014-06-17 13:29:43 +02:00
Alan Plum af49ea6c53 Added tests for hmac. 2014-06-17 13:25:07 +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 6afda915ec Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-17 09:42:46 +02:00
gschwab 1afee1b2eb fixed docu 2014-06-17 09:42:34 +02:00
Jan Steemann 297b4bfac4 added derived files 2014-06-17 00:53:36 +02:00
Jan Steemann 30460bb72c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-17 00:49:37 +02:00
Jan Steemann b303db2b50 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
 2014-06-17 00:49:18 +02:00
Jan Steemann a1177816aa modifiable AQL, final syntax 2014-06-17 00:37:08 +02:00
Jan Steemann 74fb8fe2ad issue #906: changed returned field in primary index description from `_id` to `_key`. 2014-06-16 17:08:45 +02:00