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

5824 Commits

Author SHA1 Message Date
Lucas Dohmen 9bf547374d JSLint 😊 2014-06-24 13:47:41 +08:00
Lucas Dohmen 04ddc2ba3c Review of GraphOperations 2014-06-24 13:29:14 +08:00
Lucas Dohmen d625e38acf Foxx Model: Also update whitelisted attributes 2014-06-24 13:29:14 +08:00
Jan Steemann 8d8dfe5cd0 added derived files 2014-06-24 00:44:25 +02:00
Jan Steemann 5ce280b5f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 00:38:33 +02:00
Jan Steemann d56719ae4d simplification of signatures 2014-06-24 00:32:40 +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 dac7bef3fc Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-23 16:19:09 +02:00
Thomas Schmidts 859ad4fbb0 Changes in the code documentation 2014-06-23 16:18:58 +02:00
Michael Hackstein 7e3d0be402 Beautified examples of gharial 2014-06-23 15:53:31 +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
gschwab e799d7d04a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 15:14:21 +02:00
gschwab 56d8db54aa docu 2014-06-23 15:14:16 +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
Thomas Schmidts 10a5b782fd Some changes in the documentation code 2014-06-23 14:55:14 +02:00
gschwab 70ebd88298 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 14:52:05 +02:00
gschwab b69b016f87 layout 2014-06-23 14:44:07 +02:00
Lucas Dohmen c67b1d9d5a Foxx: Fix Model.fromClient 2014-06-23 14:43:58 +02:00
Lucas Dohmen f62ce6cd7f Foxx: Fix error for `body()` when body is empty 2014-06-23 14:16:13 +02:00
Frank Celler 34908e450b hidden for http examples 2014-06-23 14:04:16 +02:00
Lucas Dohmen 8831f91f9d Foxx Model: Allow to access the whitelisted attributes from ancestor 2014-06-23 13:52:29 +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 7e3bebead7 Sorted export ordering of graph functions in ahuacatl. First deprecated modules are exported, afterwards general graph functions 2014-06-23 13:18:00 +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
Frank Celler c21c1d9a46 added underscore 2014-06-23 10:44:16 +02:00
gschwab 542a4263e6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 10:16:10 +02:00
gschwab 5406db3dc8 renamed _getToVertex(...) -> _toVertex(..) 2014-06-23 10:16:05 +02:00
Thomas Schmidts c11417cbdb Fixed some some issues with the appearance of the Foxx Chapter 2014-06-23 09:56:08 +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
scottashton 62fd91ce3d changed return value of common properties so only the matching attributes are returned 2014-06-23 07:27:20 +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
Jan Steemann c1b24339ae fixed examples for rotate 2014-06-20 23:39:32 +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
Heiko Kernbach 07f01f90d3 jslint 2014-06-20 17:21:54 +02:00
Heiko Kernbach 6770ddd9c9 merge 2014-06-20 17:04:00 +02:00
Heiko Kernbach 8c66875f97 alerting user now when newest version of github foxx app is already installed 2014-06-20 17:03:24 +02:00
scottashton 1cef1a0cd7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 16:59:58 +02:00
scottashton fb7c608f6c refactored ahuacatl docs 2014-06-20 16:59:51 +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
Heiko Kernbach 6afee10309 jslint 2014-06-20 16:11:43 +02:00
Heiko Kernbach fcb4d7c513 merge 2014-06-20 16:09:33 +02:00
Heiko Kernbach 7aaaa88f85 added github update for foxx applications via frontend 2014-06-20 16:09:13 +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
Frank Celler 248b3e3329 fixed typo 2014-06-20 15:59:59 +02:00
gschwab 5eda67d643 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 15:36:33 +02:00
gschwab 3fb7a85ca0 error handling 2014-06-20 15:36:26 +02:00
Lucas Dohmen 30e82a8cbb Removed deprecated `/_api/collection/<identifier>/parameter` 2014-06-20 15:35:00 +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
Frank Celler 5ac431a453 generated files 2014-06-20 15:06:18 +02:00
Heiko Kernbach 5ef874f8f3 merge 2014-06-20 14:58:30 +02:00
Michael Hackstein 0eff0753e8 Started improving the layout of FluentAQL Documentation in general graph module 2014-06-20 14:57:04 +02:00
Heiko Kernbach ff6877fdc9 added functionality to identify and inform about github information of a foxx 2014-06-20 14:55:22 +02:00
Heiko Kernbach ac9be731aa added new foxx route for git information about foxx app 2014-06-20 14:54:21 +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 9c38f0a1af Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 14:41:55 +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
Lucas Dohmen b8e0d95b69 Removed `apps` as an alias for `controllers` in Foxx manifest files 2014-06-20 14:39:48 +02:00
Jan Steemann b9c688d117 removed doxygen comments 2014-06-20 14:39:05 +02:00
Frank Celler e5c0418a35 fixed issue #707: Missing exception on mounting foxx app without collection 2014-06-20 14:28:23 +02:00
Frank Celler 2cd0e6d77e Merge pull request #913 from triAGENS/foxx-authentication-options 
Foxx Authentication accepts all options that we support
 2014-06-20 14:27:21 +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
Jan Steemann 3353066f65 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 13:38:10 +02:00
Frank Celler 9c33dec659 verbose comment 2014-06-20 13:34:22 +02:00
Frank Celler 4458393655 added missing description 2014-06-20 13:33:52 +02:00
Michael Hackstein 44297f43c0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 13:02:06 +02:00
Michael Hackstein c7eeee59b1 Fixed return codes of traversal api 2014-06-20 13:02:02 +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 39cf260ff2 better usability for foxx github installer 2014-06-20 11:40:38 +02:00
Lucas Dohmen 03b4a01037 Foxx Authentication accepts all options that we support 2014-06-20 11:12:56 +02:00
Heiko Kernbach 6191403181 jslint 2014-06-20 10:35:40 +02:00
Esteban Lombeyda 809d951a50 formating 2014-06-20 10:34:14 +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 2e734b6a9a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 09:53:32 +02:00
Jan Steemann 218d23d761 fixed jslint warning 2014-06-20 09:53:01 +02:00
Jan Steemann e132c8ea19 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 09:45:53 +02:00
Michael Hackstein 72b785568b Fixed indention of sublists in api-traversal docu 2014-06-20 09:31:57 +02:00
Michael Hackstein 09f6b6be1f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 09:28:24 +02:00
Michael Hackstein e6519fd292 Started generation of traversal api documentation. Still not successful 2014-06-20 09:20:33 +02:00
Jan Steemann cc35e4696c added more tests 2014-06-20 09:20:27 +02:00
gschwab dbe0cbbf7f renamed _directedRelationDefinition(...) -> _directedRelation(..) 2014-06-20 09:01:35 +02:00
gschwab ff3e0442a9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 08:57:04 +02:00
gschwab 639e657897 renamed _undirectedRelationDefinition(...) -> _undirectedRelation(..) 2014-06-20 08:56:59 +02:00
Michael Hackstein 79ad6f60af Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 08:38:11 +02:00
Michael Hackstein 407496c111 Added new version of traversal and general graph to web ui shell. Needs testing 2014-06-20 08:38:07 +02:00
Jan Steemann c60bde28b6 added crash tests 2014-06-20 08:36:36 +02:00
Jan Steemann 86def51c51 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 08:22:04 +02:00
Jan Steemann 6c0dcf85c4 WAL DDL markers 2014-06-19 14:33:38 +02:00
Lucas Dohmen 049067dbc4 Merge pull request #874 from triAGENS/foxx-doc-generator-improvements 
Foxx API Documentation explorer doesn't show POST/PUT/PATCH bodies without bodyParam
 2014-06-19 11:53:48 +02:00
Lucas Dohmen 96866a0d9f Some tweaks to the Foxx.Repository documentation 2014-06-19 10:28:36 +02:00
Lucas Dohmen e83d05d3b2 Foxx.Repository#count 2014-06-19 10:28:36 +02:00
Lucas Dohmen ca41f74a63 Foxx.Repository#updateById 2014-06-19 10:28:35 +02:00
Lucas Dohmen 473566a4e2 Foxx.Repository#updateByExample 2014-06-19 10:28:35 +02:00
Lucas Dohmen 94e2d0e9a4 Foxx.Repository#replaceByExample 2014-06-19 10:28:35 +02:00
Lucas Dohmen 3bfff286d0 Foxx.Repository#remove 2014-06-19 10:28:35 +02:00
Lucas Dohmen 4b769867be Foxx.Repository#all 2014-06-19 10:28:35 +02:00
Lucas Dohmen b9d4a96652 Add simple documentation for methods without bodyParam 
post, put and patch requests without a bodyParam will now be documented
with an undocumented bodyParam. This will allow people to try out this
undocumented field in the Swagger documentation in the admin interface.
 2014-06-19 10:28:16 +02:00
Jan Steemann bded33eec8 fixed typos 2014-06-18 21:48:29 +02:00
Jan Steemann 73e3fd5551 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-18 21:13:51 +02:00
Jan Steemann e39737f99e no error but a warning 2014-06-18 21:13:25 +02:00
Jan Steemann 44ad4eea48 added tests for AQL write operations 2014-06-18 20:43:08 +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 b0f176c37a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-18 17:16:48 +02:00
Frank Celler 8cd9e257db ignore devel version for version check 2014-06-18 17:06:15 +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 eb698dfb63 Fixed a merging error in api-traversal 2014-06-18 17:00:11 +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 c18b219a1f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-18 16:12:42 +02:00
Frank Celler cef655eb49 ignore devel version 2014-06-18 16:04:48 +02:00
Michael Hackstein e37167674b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/actions/api-traversal.js
 2014-06-18 15:56:55 +02:00
Michael Hackstein 4305c8e67b Examples in traversal module now use new graph module 2014-06-18 15:55:35 +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 ba61e07e02 More linting. 2014-06-18 15:21:29 +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
Frank Celler 900aa7f33b moved gharial from /system to /_api 2014-06-18 14:08:06 +02:00
Lucas Dohmen d9e88ce5bb Merge pull request #911 from pluma/foxx-controller-di 
Foxx Controller dependency injection
 2014-06-18 12:55:23 +02:00
gschwab 6ff46bb068 docu fixed 2014-06-18 11:12:10 +02:00
Alan Plum 40f3e268dd Adjusted injector naming. 2014-06-18 11:09:40 +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 282be72c5c Implemented controller dependency injection. 2014-06-18 01:17:10 +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 5057400e18 Repository#all 2014-06-17 17:34:55 +02:00
Lucas Dohmen df658a0648 A spec for the existing Foxx Repository functionality 2014-06-17 17:34:55 +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
Jan Steemann 091491d13b crash recovery tests 2014-06-17 15:30:11 +02:00
Lucas Dohmen 3c3f4b0b8f Foxx: Reorder and update the tests of Repository 2014-06-17 15:19:19 +02:00
Lucas Dohmen d57f88507b Foxx: Add examples for each of the methods of Repository 2014-06-17 15:19:19 +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
Frank Celler f794ee8368 fixed datafile debugger 
Conflicts:
	CHANGELOG
 2014-06-17 09:22:56 +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
Michael Hackstein e6d6e25a7f Fixed frontend tests, corrected id of svg element to real version. Is now required in code 2014-06-16 23:19:38 +02:00
Frank Celler 89dbc6d04a Merge pull request #902 from triAGENS/foxx_repository 
[WIP] Foxx.Repository should provide more methods
 2014-06-16 20:16:56 +02:00
Jan Steemann 7f1c67b964 recovery tests 2014-06-16 17:22:20 +02:00
Jan Steemann 02d1cf3ea4 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-16 17:09:58 +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
Michael Hackstein 294758a20b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-16 17:05:01 +02:00
scottashton ef6ed992f1 fixed typos in docs 2014-06-16 16:58:42 +02:00
Jan Steemann ff494cc897 added recovery tests (not functional yet) 2014-06-16 16:52:26 +02:00
scottashton 9917d68129 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-16 16:33:46 +02:00
scottashton cc3eff2a1e added documentation for ahuacatl 2014-06-16 16:33:40 +02:00
Lucas Dohmen dbfbd994cb Merge pull request #905 from triAGENS/jasmine 
[WIP] Add Support for Jasmine in our ArangoDB JavaScript Tests
 2014-06-16 16:32:55 +02:00
Michael Hackstein f0d65ce57b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-16 16:29:38 +02:00
Michael Hackstein f8969a5de2 Added more code examples to the graph module 2014-06-16 16:28:48 +02:00
gschwab d8bd638951 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-16 16:22:54 +02:00
gschwab 6fe06843fe manually merged docu into mdpp 2014-06-16 16:22:49 +02:00
Lucas Dohmen 5abece1642 Make the output format configurable from the outside 2014-06-16 15:59:49 +02:00
Lucas Dohmen 8e22d4ef42 Refactoring Jasmine Wrapper 2014-06-16 15:55:45 +02:00
Esteban Lombeyda 19d851c3cb Merge branch 'mjmh' of github.com:triAGENS/ArangoDB into mjmh 2014-06-16 15:24:54 +02:00
Esteban Lombeyda 2405a5ffa2 read-only: unit tests for client and server side 2014-06-16 15:24:12 +02:00
Lucas Dohmen 912b2cfd93 Jasmine: Execute in sandbox 2014-06-16 15:13:23 +02:00
scottashton 252d320795 jslinted code 2014-06-16 15:03:54 +02:00
scottashton b8d2c7f0f6 resolve merge conflict 2014-06-16 14:59:14 +02:00
Jan Steemann 2c4faa21b4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-16 14:49:08 +02:00
Jan Steemann 9690c26d67 jslint 2014-06-16 14:48:52 +02:00
Jan Steemann 59a5c1fda6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-16 14:47:47 +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
scottashton 99be3816b3 optimized dijsktra search 2014-06-16 14:44:34 +02:00
Alan Plum ef0210830b Fixed appContext reference in manifest cfg. 2014-06-16 14:43:11 +02:00
Lucas Dohmen 403cdd80b6 Refactor Test Runner 2014-06-16 14:39:40 +02:00
Lucas Dohmen b5764513d9 Extracted the test runner from jsunity 2014-06-16 14:39:40 +02:00
Lucas Dohmen f939c8de08 Removed the unused Coverage functionality 2014-06-16 14:39:40 +02:00
Lucas Dohmen db5470ae6c Execute Jasmine specs via arangod --javascript.unit-test 2014-06-16 14:39:40 +02:00
Lucas Dohmen b0ce561546 Implemented `pending` 2014-06-16 14:39:40 +02:00
Lucas Dohmen 61fb82bb45 Refactoring of Jasmine functionality 2014-06-16 14:39:40 +02:00
Lucas Dohmen 4b1097a110 Status Code 2014-06-16 14:39:39 +02:00
Lucas Dohmen bf34e5f870 Reporter can now also have a dot format 2014-06-16 14:39:39 +02:00
Lucas Dohmen 7ca09cbf85 Really fancy reporter 2014-06-16 14:39:39 +02:00
Lucas Dohmen eade04cb17 Cleaned up and prettified the reporter 2014-06-16 14:39:39 +02:00
Lucas Dohmen 8c8fd7b72b First steps towards integrating Jasmine 2014-06-16 14:39:39 +02:00
Jan Steemann 2a0e0b18d0 added many tests 2014-06-16 14:39:26 +02:00
gschwab 7318417cf8 made make 2014-06-16 14:36:28 +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
Frank Celler 50b6533d0d added configuration to manifest, install and mount 
Conflicts:
	js/server/modules/org/arangodb/foxx/manager.js
 2014-06-16 12:57:17 +02:00
Esteban Lombeyda 51d86d8351 Merge branch 'mjmh' of github.com:triAGENS/ArangoDB into mjmh 2014-06-16 11:44:46 +02:00
Esteban Lombeyda 9af2994eb9 read-only: unit-tests 2014-06-16 10:47:48 +02:00
Michael Hackstein fdd2b6f791 Moved newest version of general graph into web interface 2014-06-16 09:09:05 +02:00
Michael Hackstein dc3e3703cc Solved uniqueness conflicts for generated examples 2014-06-15 23:12:26 +02:00
Michael Hackstein b8e96d54ba Started adding examples to the http graph module 2014-06-15 22:42:51 +02:00
Jan Steemann ae6ac271e3 index rework 2014-06-14 23:40:56 +02:00
Jan Steemann 3301813f3c added missing client-side function 2014-06-13 21:39:35 +02:00
Jan Steemann 18f3471325 disabled transaction failure tests 2014-06-13 20:26:11 +02:00
Jan Steemann 713b69f1f5 fixed tests 2014-06-13 20:18:55 +02:00
Jan Steemann 5a53dc9f44 fixed typos 2014-06-13 20:08:02 +02:00
Jan Steemann 34389a10d3 added AQL TRANSLATE function 2014-06-13 19:53:58 +02:00
Jan Steemann 85b92dbf21 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-13 18:16:48 +02:00
Jan Steemann 96385080bc fixed test 2014-06-13 18:16:42 +02:00
Jan Steemann 0c5950507c fixed test 2014-06-13 17:50:44 +02:00
Michael Hackstein b986d7baf6 Fixes #894 in Safari + Chrome. Firefox is broken due to a bug in our jQuery version (offset is returning a random value...). IE to be tested. 2014-06-13 17:32:28 +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
Lucas Dohmen 80ab3968bd Foxx: Adjust structure & content of documentation and code of Repository 2014-06-13 15:47:52 +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
Michael Hackstein 8e9ffb5950 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/server/modules/org/arangodb/foxx.js
	js/server/modules/org/arangodb/foxx/request_context.js
 2014-06-13 13:23:56 +02:00
Jan Steemann fabc51f889 fixed wrong ASSERT usage 2014-06-13 12:10:35 +02:00
gschwab 121b667078 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-13 11:51:23 +02:00
gschwab 0646677b3e orphan collections treatment added with edit edge definitions 2014-06-13 11:51:15 +02:00
Jan Steemann d592591a06 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-13 11:31:59 +02:00
Jan Steemann 9e03189fb0 added waitUnload as a test helper function 2014-06-13 11:31:14 +02:00
Lucas Dohmen 08efa7025d Merge branch 'devel' of github.com:triagens/arangodb into devel 2014-06-13 11:01:38 +02:00
Lucas Dohmen 120ecaa000 JSLint 2014-06-13 11:00:57 +02:00
Jan Steemann 1eb39674ef added is.js to frontend 2014-06-13 10:22:18 +02:00
Michael Hackstein ecc0768bf3 Fixed JSLint warnings 2014-06-13 09:56:07 +02:00
Michael Hackstein ba3a3914fa Included change of existing edge definition in graph-http-module 2014-06-13 09:49:33 +02:00
Michael Hackstein 7e8f63add2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-13 09:33:21 +02:00
Michael Hackstein 66bb4e2047 Corrected API documentation of old graph-api and regenerated api-docs for frontend 2014-06-13 09:33:14 +02:00
Jan Steemann 9e19e0c6ca don't print errors if something goes wrong 2014-06-13 02:23:13 +02:00
Jan Steemann d5e695e63f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/RestServer/ArangoServer.h
	arangod/VocBase/server.cpp
	js/common/bootstrap/errors.js
 2014-06-13 02:23:03 +02:00
Jan Steemann 1b94fbf904 fixed crash in dump 2014-06-13 01:53:44 +02:00
Jan Steemann 8843761c0e fixed issue #900 2014-06-12 17:15:35 +02:00
gschwab baabd0d7ca Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-12 16:57:35 +02:00
gschwab 1ed179cbaa some docu for orphan collections 2014-06-12 16:57:31 +02:00
Lucas Dohmen 87987b7a14 Merge pull request #897 from pluma/foxx-context-collection-method 
Added `collection` method to Foxx applicationContext
 2014-06-12 16:41:50 +02:00
Lucas Dohmen 4dbaa665ac Merge pull request #895 from pluma/sugary-foxx-exports 
More sugary Foxx exports
 2014-06-12 16:39:57 +02:00
Alan Plum 477cec53aa Cleaned up stray whitespace. 2014-06-12 15:57:39 +02:00
Alan Plum 475daa1ed2 Removed tests for deprecated code. 2014-06-12 15:54:27 +02:00
Alan Plum c935ea6d20 Fixed reference to context. 2014-06-12 15:54:01 +02:00
Lucas Dohmen d12e993289 Merge pull request #896 from pluma/foxx-no-required-controllers 
Allow controller-free Foxx apps
 2014-06-12 15:38:20 +02:00
Michael Hackstein e9f161c061 Added a route to add an additional edge definition to the graph 2014-06-12 15:32:50 +02:00
gschwab abd8000009 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-12 15:29:55 +02:00
gschwab 1ef948a410 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-12 15:28:41 +02:00
gschwab c46e0df090 added CRD for orphan collections of graphs 2014-06-12 15:28:35 +02:00
Alan Plum 251f237184 Renamed Foxx.app -> Foxx.requireApp. 2014-06-12 15:14:09 +02:00
Alan Plum fdea995b6e Deprecated Foxx.Controller#collection. 2014-06-12 15:12:05 +02:00
Alan Plum 41a82d9726 Added friendlier wrapper for manager.mountedApp. 2014-06-12 15:09:02 +02:00
Alan Plum 9857fa571e Allow controller-free apps. 2014-06-12 15:08:46 +02:00
Alan Plum e7f6aecaf5 Added collection method to Foxx applicationContext. 2014-06-12 15:07:18 +02:00
Lucas Dohmen 38bf144496 Foxx: Documentation for extended bodyParam functionality 2014-06-12 15:02:47 +02:00
Lucas Dohmen c0bfeee04e Test multiple element functionality 2014-06-12 15:02:47 +02:00
Lucas Dohmen 89e9205b7c Test multiple items functionality 2014-06-12 15:02:47 +02:00
Lucas Dohmen 6d0d3565fa Foxx: Adjust fakeContext to feature the manifest element 2014-06-12 15:02:47 +02:00
Lucas Dohmen b5529ac37e Introduce optional root element for body params 2014-06-12 15:02:46 +02:00
Lucas Dohmen e24d344016 Add option for the rootElement and make it available via appContext 2014-06-12 15:02:46 +02:00
Lucas Dohmen d4a6250fc2 Foxx: Body Params can optionally take more than one object 2014-06-12 15:02:46 +02:00
Michael Hackstein 55e5e079f5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-12 14:44:14 +02:00
Michael Hackstein 2198a03b49 Implemented edge crud in http-graph-module. TODO: Modify definitions 2014-06-12 14:43:21 +02:00
Lucas Dohmen cec32b981a Adjust tests to @fceller's bug fix 2014-06-12 14:24:50 +02:00
Frank Celler 6b770c3476 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-12 13:42:52 +02:00
Frank Celler 1aa671ed8c fixed string constraints 2014-06-12 13:42:46 +02:00
gschwab 17e850f646 fixed tests 2014-06-12 13:30:21 +02:00
Michael Hackstein f89311460f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-12 13:15:44 +02:00
Michael Hackstein 3a0fddb901 Moved the unspecific route to the end of graph-http foxx, was matched too often 2014-06-12 13:15:25 +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 e6d68e6070 finished documenation for aql graph 2014-06-12 10:43:20 +02:00
Michael Hackstein 25e97eafee Further implemented graph-http-module. Now offers complete vertex interaction. Tests for Vertex Interaction and Edge Interaction added 2014-06-12 08:09:37 +01:00
Frank Celler 299b99ed00 fixed check-version for empty directory 2014-06-11 19:30:12 +02:00
Jan Steemann fa6e98d94c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
 2014-06-11 17:40:15 +02:00
Jan Steemann cc115a2766 removed outdated upgrade methods 2014-06-11 17:38:49 +02:00
scottashton f4b67ed01d jslinted 2014-06-11 16:04:15 +02:00
Jan Steemann ba389b996c jslint 2014-06-11 16:00:27 +02:00
gschwab 63272b8a47 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-11 15:51:41 +02:00
gschwab 76ce378991 jslint 2014-06-11 15:51:37 +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
Jan Steemann 4cd857f5b9 added generated files 2014-06-11 14:25:01 +02:00
Jan Steemann 49cc332361 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/common/bootstrap/errors.js
 2014-06-11 14:23:47 +02:00