1
0
Fork 0
Commit Graph

35 Commits

Author SHA1 Message Date
Frank Celler e9b1e1c58f Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	3rdParty/mruby/include/mrbconf.h
	3rdParty/mruby/include/mruby.h
	3rdParty/mruby/include/mruby/array.h
	3rdParty/mruby/include/mruby/khash.h
	3rdParty/mruby/include/mruby/object.h
	3rdParty/mruby/include/mruby/variable.h
	3rdParty/mruby/mrblib/error.rb
	3rdParty/mruby/mrblib/print.rb
	3rdParty/mruby/src/array.c
	3rdParty/mruby/src/cdump.c
	3rdParty/mruby/src/class.c
	3rdParty/mruby/src/codegen.c
	3rdParty/mruby/src/error.c
	3rdParty/mruby/src/gc.c
	3rdParty/mruby/src/init.c
	3rdParty/mruby/src/kernel.c
	3rdParty/mruby/src/math.c
	3rdParty/mruby/src/numeric.c
	3rdParty/mruby/src/object.c
	3rdParty/mruby/src/parse.y
	3rdParty/mruby/src/pool.c
	3rdParty/mruby/src/proc.c
	3rdParty/mruby/src/range.c
	3rdParty/mruby/src/sprintf.c
	3rdParty/mruby/src/state.c
	3rdParty/mruby/src/string.c
	3rdParty/mruby/src/struct.c
	3rdParty/mruby/src/symbol.c
	3rdParty/mruby/src/time.c
	3rdParty/mruby/src/variable.c
	3rdParty/mruby/src/vm.c
	3rdParty/mruby/src/y.tab.c
	3rdParty/mruby/test/assert.rb
	3rdParty/mruby/test/t/array.rb
	3rdParty/mruby/test/t/exception.rb
	3rdParty/mruby/test/t/kernel.rb
	3rdParty/mruby/test/t/math.rb
	3rdParty/mruby/test/t/module.rb
	3rdParty/mruby/test/t/string.rb
	3rdParty/mruby/test/t/struct.rb
	3rdParty/mruby/test/t/time.rb
	3rdParty/mruby/tools/mirb/mirb.c
	3rdParty/mruby/tools/mruby/mruby.c
	Doxygen/arango-html.doxy
	Doxygen/arango.template
	Makefile.am
	Makefile.in
	UnitTests/HttpInterface/api-http-spec.rb
	aclocal.m4
	arangod/RestHandler/RestDocumentHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-query.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/V8Server/v8-vocbase.h
	arangod/VocBase/compactor.c
	arangod/VocBase/compactor.h
	arangod/VocBase/shadow-data.c
	arangod/VocBase/simple-collection.c
	arangod/VocBase/simple-collection.h
	arangod/VocBase/synchroniser.c
	arangod/VocBase/vocbase.c
	arangoirb/MRClient/arangoirb.cpp
	config/compile
	config/depcomp
	config/install-sh
	config/missing
	configure
	js/actions/demo/geo.js
	js/actions/demo/hallo-world.js
	js/actions/system/api-collection.js
	js/actions/system/api-edges.js
	js/actions/system/api-system.js
	js/actions/system/documents.js
	lib/BasicsC/locks-posix.c
	lib/BasicsC/operating-system.h
	lib/HttpServer/HttpCommTask.cpp
	lib/HttpServer/HttpCommTask.h
	lib/MRuby/MRLineEditor.cpp
	lib/MRuby/mr-utils.c
	m4/Makefile.doxygen
	m4/all-in-one.mruby
2012-09-20 16:39:59 +02:00
Jan Steemann 7d512be4bb make clean deletes more 2012-09-14 15:40:29 +02:00
Frank Celler 5bdcbe715a fixed whitespace bug at beginning of function definition 2012-09-13 22:22:52 +02:00
Jan Steemann a25cfeb256 patch for master 2012-09-12 01:00:08 +02:00
Jan Steemann 3883674c0f updated patch 2012-09-10 18:22:01 +02:00
Jan Steemann 3bd29b57ec much more debug output for locking 2012-09-07 23:23:47 +02:00
Jan Steemann 3ad9da06ab updated patch 2012-09-07 13:09:33 +02:00
Jan Steemann 91ca2f4674 updated patch 2012-09-07 12:50:58 +02:00
Jan Steemann bd06aabdbf print v8 version in trace mode 2012-09-07 11:34:30 +02:00
Jan Steemann 58a8fa4162 updated patch 2012-09-07 11:21:06 +02:00
Jan Steemann 58f4ff5835 more debug output 2012-09-07 09:48:22 +02:00
Jan Steemann ef94e509c8 updated patch 2012-09-07 09:28:32 +02:00
Jan Steemann bce7b2c468 updated patch 2012-09-06 16:59:12 +02:00
Jan Steemann 2262edfb30 updated patch for issue #188 2012-09-06 14:10:22 +02:00
Oreste Panaia fcc5e20a1a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-05 16:30:16 +08:00
Oreste Panaia fb1671a9ef documentation for bitarray indexes 2012-09-05 16:28:24 +08:00
Jan Steemann a341b66b2b added diff file for 1.0, experimental 2012-09-05 10:26:44 +02:00
Jan Steemann 9ef51c883f updated some documentation 2012-09-04 12:11:29 +02:00
Jan Steemann ac708b7fec issue #182: added manpage for rcarangod 2012-09-03 15:34:30 +02:00
Jan Steemann e3acdb9d14 issue #182 fail 2012-09-03 15:17:44 +02:00
Jan Steemann 751474c43f issue #182: add manpages 2012-09-03 15:15:54 +02:00
Jan Steemann b8c5c4e3c0 issue #182 2012-09-03 13:44:58 +02:00
Jan Steemann ffc5f9ed6d man pages 2012-09-03 13:02:19 +02:00
Jan Steemann 6973462b7f generate man pages 2012-09-03 11:07:03 +02:00
Frank Celler dd4cb2a5ce removed generated files 2012-09-02 11:03:30 +02:00
Frank Celler d3f0de4701 image cleanup 2012-09-02 10:56:59 +02:00
Frank Celler ee3754ecb8 fixed generated file path 2012-09-01 15:30:13 +02:00
Frank Celler b755e22245 renamed web to doc for inclusion in /usr/share 2012-08-31 23:24:24 +02:00
Frank Celler 4dc28e13f2 Merge branch 'devel' of github.com:triAGENS/ArangoDB 2012-08-31 18:35:35 +02:00
Jan Steemann f70cdc8fcb issue #169: adjusted documentation 2012-08-31 18:08:36 +02:00
Frank Celler e48030d8cf Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	Doxygen/arango.template
	Makefile.in
2012-08-31 18:03:26 +02:00
Jan Steemann e4e73a7a56 issue #169: missing argument for simple queries 2012-08-31 17:32:53 +02:00
Frank Celler 708a33edb1 added README generator 2012-08-31 15:40:45 +02:00
Jan Steemann 580915ca17 changed Makefiles for Doxygen. Generated documentation is now located in Doxygen/, sources are in Documentation/ 2012-08-31 12:04:32 +02:00
Frank Celler 39f4a8f833 cleanup directory structure and init file handling
moved common functions to ArangoClient
2012-08-30 16:54:42 +02:00