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

227 Commits

Author SHA1 Message Date
Frank Celler 69a8e64f9b Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	.gitignore
	Makefile.in
	Makefile.local
	Makefile.unittests
 2012-08-09 15:25:29 +02:00
Frank Celler 6cf46f4b05 document is now delivered in sub-directory according to version 2012-08-07 17:19:55 +02:00
Frank Celler aef20e2887 Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Makefile.local
	arangod/Documentation/command-line-options.dox
	arangod/RestServer/ArangoServer.cpp
	build.sh
	html/admin/js/master.js
 2012-08-05 22:46:55 +02:00
Frank Celler dcc498c74f release version 1.0.beta2 2012-08-03 17:08:20 +02:00
Frank Celler 5d78a39832 added 1.0 to manual path 2012-08-03 15:38:43 +02:00
Frank Celler 1ccd0677c5 fixed version number, added arangosh chapter 2012-08-03 10:22:09 +02:00
Frank Celler b0e452f74a Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.am
	Makefile.in
	arangod/V8Server/v8-vocbase.cpp
 2012-08-02 17:17:36 +02:00
Frank Celler 73d06a2cf6 release version 1.0.beta1 2012-07-29 13:13:37 +02:00
Jan Steemann eaeb9b42da completed documentation for ssl options 2012-07-26 15:09:26 +02:00
Jan Steemann daa6ca8b5e added documentation for ssl options 2012-07-26 13:39:21 +02:00
Jan Steemann 1f62715e87 fixed documentation 2012-07-26 12:49:25 +02:00
Jan Steemann eeeb78c2e7 Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Installation/arangod.conf.in
	Makefile.in
	arangod/Makefile.files
	arangod/RestHandler/RestBatchHandler.cpp
	arangod/RestHandler/RestBatchHandler.h
	arangod/RestServer/ArangoServer.cpp
	bin/arango-password.in
 2012-07-26 12:03:03 +02:00
Jan Steemann cc81db31a8 doxygen fixes 2012-07-26 09:46:22 +02:00
Jan Steemann cc9952f460 fixed documentation 2012-07-26 09:22:52 +02:00
Jan Steemann 7a0e9d350d added documentation for endpoints, disable-authentication, fixed tests 2012-07-26 09:10:59 +02:00
Frank Celler 4605fbba9a Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 
Conflicts:
	CHANGELOG
	Doxygen/Examples.ArangoDB/startup1
	Makefile.in
	arangod/Documentation/command-line-options.dox
	arangod/Documentation/install-manual.dox
	arangod/Makefile.files
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/auth.h
	arangosh/V8Client/arangosh.cpp
	html/admin/css/layout.css
	lib/Basics/ssl-helper.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/ApplicationHttpServer.h
	lib/HttpServer/HttpServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.h
 2012-07-24 22:56:03 +02:00
Frank Celler 041eb53b10 Merge branch '1.0' of github.com:triAGENS/ArangoDB into 1.1 
Conflicts:
	Makefile.in
	arangod/RestServer/ArangoServer.cpp
	arangoirb/MRClient/arangoirb.cpp
	lib/GeneralServer/GeneralServer.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/HttpCommTask.cpp
	lib/HttpServer/HttpHandler.cpp
	lib/HttpServer/HttpHandlerFactory.cpp
	lib/HttpServer/HttpHandlerFactory.h
	lib/HttpsServer/ApplicationHttpsServer.cpp
 2012-07-24 22:19:46 +02:00
Jan Steemann a910971b15 fixed documentation & installation settings after endpoint introduction 2012-07-24 08:42:45 +02:00
Jan Steemann c079eda53b fixed doxygen errors 2012-07-23 15:24:53 +02:00
Frank Celler 988f5a5277 added missing tags 2012-07-16 16:21:36 +02:00
Frank Celler 39a96b3a05 updated documentation 2012-07-15 17:32:31 +02:00
Frank Celler 24ead07956 clearified documentation, fixed paths for binary 2012-07-11 11:25:18 +02:00
Frank Celler ab4d52963e fixed statistics: no deviation for request-statistics, distribution for connection-statistics 2012-07-09 15:24:28 +02:00
Frank Celler 994bf263ee generated files 2012-07-06 18:09:06 +02:00
Frank Celler ab306f7f4b added connection-statistics 2012-07-05 22:08:21 +02:00
Frank Celler c1892ff9b4 added doc for request statistics 2012-07-05 16:42:49 +02:00
Jan Steemann f7be68bd47 updated documentation for issue #121 2012-07-04 13:13:38 +02:00
Frank Celler dc8de78bd5 new path for manual 2012-06-30 14:06:44 +02:00
Frank Celler ede30dd2fb fixed build number 2012-06-29 16:08:43 +02:00
Frank Celler 6c06f3a395 release version 1.0.alpha3 2012-06-29 16:00:21 +02:00
Jan Steemann 3f50cbc563 added example for --supervisor option 2012-06-27 18:11:39 +02:00
Oreste Panaia 9a8c0a4cd0 still trying to get this code up to github (maybe one day) 2012-06-27 14:43:00 +08:00
Frank Celler 35d2d6db65 finish direct sd 2012-06-26 23:21:35 +02:00
Frank Celler 214f25aac2 added first try 2012-06-26 14:28:00 +02:00
Frank Celler be421504ab added missing include for CLANG 2012-06-26 10:37:59 +02:00
Frank Celler 8d96f93aa9 added missing dba file 2012-06-25 14:26:41 +02:00
Frank Celler 441ccb1c65 fixed documentation 2012-06-24 22:08:42 +02:00
Frank Celler 6d5efb2f95 release version 1.0.alpha2 2012-06-24 21:00:20 +02:00
Frank Celler 3d0be30e0a fixed documentation 2012-06-24 20:26:32 +02:00
Frank Celler af60ebe612 fixed doc errors 2012-06-24 16:43:20 +02:00
Jan Steemann 7ad822bd09 fixed documentation 2012-06-13 13:42:46 +02:00
Jan Steemann d7ca7ae1b7 added "official" explain API 2012-06-13 13:27:39 +02:00
Jan Steemann 2edee7a72f fixed doxygen errors 2012-06-13 13:27:24 +02:00
Jan Steemann 381fc2f9f9 optimiser change: collections are annotated with hints on how they are accessed. this info is picked up by the explain command 2012-06-12 16:50:36 +02:00
Frank Celler 02517f81fa Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Makefile.in
	arangod/Ahuacatl/ahuacatl-grammar.c
	arangod/Ahuacatl/ahuacatl-grammar.h
	arangod/RestServer/JavascriptDispatcherThread.cpp
 2012-06-10 21:26:43 +02:00
Jan Steemann e16660cc0c hack to fix wiki HTML generation 2012-06-08 23:27:08 +02:00
Jan Steemann 12308b9664 fixed doxygen and wiki generation errors 2012-06-08 22:55:38 +02:00
Frank Celler 55ebf00dbd Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Actions/RestActionHandler.cpp
	Actions/RestActionHandler.h
	Makefile.files
	Makefile.in
	RestHandler/RestActionHandler.cpp
	RestHandler/RestActionHandler.h
	RestServer/ActionDispatcherThread.cpp
	RestServer/ActionDispatcherThread.h
	RestServer/RubyDispatcherThread.cpp
	RestServer/RubyDispatcherThread.h
	arangod/RestHandler/RestActionHandler.cpp
	arangod/RestHandler/RestActionHandler.h
	arangod/RestServer/ActionDispatcherThread.cpp
	arangod/RestServer/ActionDispatcherThread.h
	arangod/RestServer/ArangoServer.cpp
 2012-06-08 15:57:33 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00
Frank Celler df0d4624ad Merge branch '1.0' of github.com:triAGENS/ArangoDB 2012-06-06 13:45:06 +02:00