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

13105 Commits

Author SHA1 Message Date
Max Neunhoeffer aa731f5eb0 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-05-21 13:57:26 +02:00
Max Neunhoeffer 77025348df Make JsonParser C++, however, functions still extern "C". 2014-05-21 13:56:45 +02:00
Max Neunhoeffer 0af211c1e5 More header cleanups. 2014-05-21 13:42:41 +02:00
Jan Steemann 0933555a3e fixed saving of documents 2014-05-21 13:41:55 +02:00
Jan Steemann 74aa2d6cee fixed compile error 2014-05-21 12:46:08 +02:00
Max Neunhoeffer 2f1dece99b Add missing file. 2014-05-21 12:43:58 +02:00
Max Neunhoeffer 9d948618f3 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-05-21 11:31:08 +02:00
Max Neunhoeffer 147e829754 Ahuacatl is now C++ and compiles again. 2014-05-21 11:30:44 +02:00
Max Neunhoeffer 786ea250ba Snapshot. 2014-05-21 11:20:03 +02:00
Jan Steemann b10ef2335c split Marker.h 2014-05-21 10:28:24 +02:00
Max Neunhoeffer fdba62a957 Implement TRI_EXTRACT_SHAPED_JSON_MARKER as static inline. 
Also consider WAL.
 2014-05-21 08:59:03 +02:00
Max Neunhoeffer 2cdcd24a59 First step to move ahuacatl to C++ 2014-05-21 08:58:49 +02:00
Max Neunhoeffer 07f9b941bb Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-05-21 08:38:58 +02:00
Jan Steemann c15acbab08 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	lib/ShapedJson/Legends.cpp
	lib/ShapedJson/Legends.h
 2014-05-20 17:03:49 +02:00
Jan Steemann 4529560ad2 adding edges 2014-05-20 16:58:05 +02:00
gschwab acb43a202f fixed remove for vertexColelctions 2014-05-20 16:51:54 +02:00
scottashton 88e8ea849f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 16:45:27 +02:00
scottashton a8cacef57d added GRAPH_NEIGHBORS 2014-05-20 16:45:22 +02:00
Michael Hackstein d03a8fa11b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-20 16:22:47 +02:00
Michael Hackstein dddc5cbd9e Added an _exists function to the general-graph module, which checks if there is a graph with given name to avoid error throwing within apps 2014-05-20 16:22:44 +02:00
Jan Steemann 7151aee16e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 16:16:30 +02:00
Jan Steemann c14b3888f0 removed unused defines 2014-05-20 16:16:22 +02:00
scottashton 3b076c4629 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 15:55:35 +02:00
scottashton c99ce5167d traversal aql 2014-05-20 15:55:07 +02:00
gschwab 4080e1f681 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 15:53:24 +02:00
gschwab 0cc4969a31 jslint 2014-05-20 15:53:20 +02:00
Michael Hackstein eb7150d815 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-20 15:48:38 +02:00
Michael Hackstein 35f602fef2 Renamed collections for AQL queries to contain 'UnitTests' prefix 2014-05-20 15:48:33 +02:00
gschwab de2fd3ff69 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 15:35:13 +02:00
gschwab 072b00c54b edges of a vertex will be removed, when vertex is removed 2014-05-20 15:35:09 +02:00
Max Neunhoeffer a5f901fe37 Add pointer marking functionality. 2014-05-20 15:25:51 +02:00
Max Kerp 13c3b80976 clean up 2014-05-20 15:17:51 +02:00
Max Kerp b11cffa1c9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 14:53:48 +02:00
Max Kerp 8dd3babebd fixed scss-lint 2014-05-20 14:53:05 +02:00
Michael Hackstein f8d2faf8d5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-20 14:43:47 +02:00
Michael Hackstein bb9aaaeb4e Fixed error handling on restrict. It will now throw an error if query is restricted to an unkown collection 2014-05-20 14:43:42 +02:00
Jan Steemann b20240b829 added legend 2014-05-20 14:37:57 +02:00
Max Neunhoeffer bf71f3fd72 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-05-20 14:22:37 +02:00
Max Neunhoeffer a0d4adc986 Add Legends.cpp to CMakeLists.txt 2014-05-20 14:22:16 +02:00
Jan Steemann 22e0290b06 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-20 14:21:20 +02:00
Jan Steemann cdad1f19fe moved marker definitions 2014-05-20 14:21:12 +02:00
scottashton b1ce2058fd Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 13:50:40 +02:00
scottashton 009f83026a finished GRAPH_PATHS in aql 2014-05-20 13:50:34 +02:00
Max Neunhoeffer 67f32ec430 Activate Legends.cpp in Makefile 2014-05-20 13:29:34 +02:00
Michael Hackstein f89b50a72e Fixed test for directedRelationDefinition error handling 2014-05-20 13:29:00 +02:00
Max Neunhoeffer 0dab3706c5 Finish first version of JsonLegend, not activated in Makefile. 2014-05-20 13:27:57 +02:00
Max Neunhoeffer b5df264cdb First draft of legend generator. 2014-05-20 13:27:09 +02:00
gschwab 3897840af5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 13:25:39 +02:00
gschwab a2460276d3 forgot to rename some variables... 2014-05-20 13:25:34 +02:00
Max Neunhoeffer 464b6720ca Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-05-20 13:25:10 +02:00