1
0
Fork 0
Commit Graph

13594 Commits

Author SHA1 Message Date
Thomas Schmidts 01c2770030 Fixed a small bug in the python script 2014-06-18 16:52:35 +02:00
Frank Celler 2b3c686e42 rearranged messages 2014-06-18 16:35:09 +02:00
Frank Celler f5419205ac added voice 2014-06-18 16:34:55 +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 17433049bf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-18 15:53:33 +02:00
gschwab 1338fb0dce docu resetted to automatation 2014-06-18 15:53:28 +02:00
Jan Steemann d1cdd1e40f macos 2014-06-18 15:27:25 +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 8f50161519 Added correct FluentAQL documentation file that only contains references to code documentation 2014-06-18 15:11:34 +02:00
Michael Hackstein f9b16f5e23 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-18 14:49:04 +02:00
Thomas Schmidts 270cb1eb6e Fixed error in script 2014-06-18 14:48:31 +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 67bfa9cf70 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-18 11:12:15 +02:00
gschwab 6ff46bb068 docu fixed 2014-06-18 11:12:10 +02:00
Michael Hackstein 479268d450 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-18 11:11:31 +02:00
Michael Hackstein 55a6cee0f7 Added deprecated warnings for old graph module in documentation 2014-06-18 11:11:26 +02:00
Michael Hackstein b228925770 Reordered the new graph module before the old graph module 2014-06-18 11:10:54 +02:00
Alan Plum 40f3e268dd Adjusted injector naming. 2014-06-18 11:09:40 +02:00
Thomas Schmidts f4e8f439bd Script for reading code automatically 2014-06-18 11:09:20 +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 02f1552b35 Fixed general graph api tests 2014-06-18 10:55:16 +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
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
Michael Hackstein 5692606fd4 Fixed a bug in codeBlockReader and added new edge examples 2014-06-17 13:34:13 +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