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

13497 Commits

Author SHA1 Message Date
Jan Steemann 797ef2e2ca slightly changed return values in TRI_ExtractShapedJsonVocShaper 2014-06-05 22:28:27 +02:00
Jan Steemann 6344bb5a1e merge 2014-06-05 22:28:19 +02:00
Jan Steemann 17981a92c2 more barriers 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-06-05 22:23:48 +02:00
Jan Steemann fd7f288a59 added test case for shape movements 2014-06-05 22:23:02 +02:00
Michael Hackstein 87b4124dfc Updated fluent AQL query interface documentation 2014-06-05 17:36:12 +02:00
scottashton e6b4fff2f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-05 16:59:53 +02:00
scottashton fe621c1723 finished measurements 2014-06-05 16:59:43 +02:00
Esteban Lombeyda 7171c91c03 renaming tests 2014-06-05 16:29:24 +02:00
Frank Celler c8fc7f00c3 splitted arangod into prog and lib 2014-06-05 16:11:38 +02:00
Esteban Lombeyda 78e8b56117 cleaning 2014-06-05 16:01:58 +02:00
Frank Celler 2cfb2e0577 fixed issue #883: arango 2.1 - when starting multi-machine cluster, UI web does not change to cluster overview 
Conflicts:
	CHANGELOG
	lib/ShapedJson/shape-accessor.cpp
	lib/ShapedJson/shape-accessor.h
 2014-06-05 15:58:19 +02:00
Thomas Schmidts d9ac4e1164 small spelling error 2014-06-05 15:47:09 +02:00
Michael Hackstein 8b7b485f74 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-05 14:58:10 +02:00
Michael Hackstein 30a1ebd3b7 Improved FluentAQL documentation for general graph module 2014-06-05 14:57:45 +02:00
Thomas Schmidts fb312711d0 small changes in the documentation 2014-06-05 14:50:35 +02:00
Thomas Schmidts 2b682769e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-05 12:53:22 +02:00
Thomas Schmidts 1b3a138fa4 .mds will be deleted after gitbook is made. Also modified search for codeDocuBlock 2014-06-05 12:53:10 +02:00
Michael Hackstein 4d95b99937 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-05 11:45:36 +02:00
Michael Hackstein 9e4a983d2f Simplified some general graph tests 2014-06-05 11:45:20 +02:00
Michael Hackstein b90e3d6539 Added a README for General Graph. Added some intro text in fluent AQL chapter for general graph 2014-06-05 11:44:55 +02:00
gschwab 08e5c81284 initial checkin of GeneralGraphFunctions.mdpp 2014-06-05 10:24:33 +02:00
Michael Hackstein bcbcf635e4 Further improvements in FluentAQL docu. It is now at least readable 2014-06-04 19:03:19 +02:00
Michael Hackstein fa38738ea5 Fixed merge conflict for generated files 2014-06-04 18:00:58 +02:00
Michael Hackstein 8ccad436ea Removed generated md files in gitbook 2014-06-04 17:59:55 +02:00
Michael Hackstein 19b459b549 Added all subfolder md files in gitbooks 2014-06-04 17:54:28 +02:00
Michael Hackstein c11d469251 Added semi automaticly generated first docu of Fluent AQL interface 2014-06-04 17:51:57 +02:00
gschwab 08f57f13b2 Revert "tabs replaced with spaces" 
This reverts commit f38493e4c678b06dcb09b3f1fc918ba6bb8c367e.

Conflicts:
	Documentation/Books/Makefile
	Documentation/Books/Users/SUMMARY.md
	Documentation/Books/Users/localtheme/templates/includes/book/header.html
 2014-06-04 17:21:15 +02:00
gschwab 4dbbfd0313 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-04 17:19:52 +02:00
gschwab e6a2328438 merged for revert 2014-06-04 17:19:34 +02:00
Michael Hackstein 6da48f6ae8 Removed _.neighbors from general graph module. The way to get neighbors is to first select the set of start vertices and then execute neighbors 2014-06-04 17:17:20 +02:00
Michael Hackstein aeda62c032 Fixed test for db selection view 2014-06-04 17:16:24 +02:00
Michael Hackstein 4183d1efdf Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-04 17:12:17 +02:00
Michael Hackstein 43e8b48c46 Fixed frontend test for query view 2014-06-04 17:12:13 +02:00
Frank Celler 521cdd0be2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-04 17:04:49 +02:00
Thomas Schmidts bc0c8aac3a small changes in the design 2014-06-04 16:41:44 +02:00
Frank Celler 584ac19c83 fixed test spec 2014-06-04 16:17:13 +02:00
Frank Celler 575e22e2d3 fixed test spec 2014-06-04 16:13:36 +02:00
Frank Celler 325f41352c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-04 16:06:07 +02:00
Frank Celler 4c2adf9f54 removed .showHotkeyHelp 2014-06-04 16:06:01 +02:00
Michael Hackstein 244fe61e6c Readded tabs in documentation makefile 2014-06-04 16:04:53 +02:00
gschwab 036e29f45b tabs replaced with spaces 2014-06-04 15:59:17 +02:00
Michael Hackstein 623a8c3e9e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-04 14:32:52 +02:00
Michael Hackstein d1ef96a801 Added further docu to general graph and removed unused functions 2014-06-04 14:32:47 +02:00
Thomas Schmidts 67f2ea2f97 added the stylesheet 2014-06-04 14:29:24 +02:00
Michael Hackstein d17d1908e9 Made internal attributes of general graph objects non-enumerable to hide them from the user. 2014-06-04 14:10:20 +02:00
Michael Hackstein 808a34510f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-04 13:49:53 +02:00
Michael Hackstein 2de9df5689 Added general graph into git books 2014-06-04 13:49:45 +02:00
Michael Hackstein 44a3dd1db1 Added start of documentation move to gitbooks in general graphs 2014-06-04 13:06:31 +02:00
gschwab 73c3d9cfec Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-04 12:36:29 +02:00
gschwab 7590652d57 fixed neighbors 2014-06-04 12:36:21 +02:00