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

5514 Commits

Author SHA1 Message Date
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