1
0
Fork 0
Commit Graph

652 Commits

Author SHA1 Message Date
Lucas Dohmen 1ced4b79a4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-09-26 14:19:26 +02:00
Lucas Dohmen 06fb38ca20 Requiring Graph.js automatically requires monkeypatches
The user should not have to do that manually.
Makes no sense.
2012-09-26 14:18:24 +02:00
Jan Steemann 3bbed7fe3b fixed task numbers 2012-09-26 14:08:03 +02:00
Jan Steemann 372abf03bb der fux mag pilze 2012-09-26 14:05:08 +02:00
a-brandt 3ce1888f44 added test for internal sorting of skiplists 2012-09-24 16:45:28 +02:00
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
Frank Celler d1184d89e4 added missing charset 2012-09-20 09:32:53 +02:00
Frank Celler a67bb18f72 return 5xx if not implemented 2012-09-19 15:33:43 +02:00
a-brandt d51383d081 Added HAS_ICU to shell and console 2012-09-19 11:23:23 +02:00
Oreste Panaia bd8bebed86 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-19 15:21:26 +08:00
Frank Celler 8f5b31177b added redirect 2012-09-18 16:33:16 +02:00
a-brandt d077c97f2c ICU updates 2012-09-18 15:42:46 +02:00
Frank Celler 2ce0c4336a added module in database 2012-09-18 15:07:57 +02:00
a-brandt 1a9961cb4c Added COMPARE_STRING function 2012-09-18 13:13:26 +02:00
Frank Celler 88b72adea4 more actions example, reloadCache added 2012-09-17 18:08:28 +02:00
Oreste Panaia f5316acb9d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/document-collection.c
	arangod/VocBase/document-collection.h
2012-09-17 22:40:12 +08:00
Oreste Panaia c7e5eae52d Added additional error numbers for bitarray index creation 2012-09-17 19:57:10 +08:00
Frank Celler 4f6762436c added first go at user actions 2012-09-16 17:25:57 +02:00
Frank Celler 21eb612376 first version of new actions module 2012-09-15 19:16:36 +02:00
Jan Steemann f7e98df4a3 removed unused error codes 2012-09-14 15:18:28 +02:00
Jan Steemann 1d865cddb1 removed unnecessary long waits 2012-09-13 17:41:00 +02:00
Frank Celler 49b19e4657 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	lib/BasicsC/terminal-utils-posix.c
	lib/BasicsC/terminal-utils.c
	lib/SimpleHttpClient/SimpleHttpResult.cpp
2012-09-12 23:49:14 +02:00
Frank Celler e8089d86a7 removed user manager 2012-09-12 23:37:39 +02:00
Jan Steemann d002fde025 documentation 2012-09-12 22:02:20 +02:00
Jan Steemann 650261faed issue #195: make arango-upgrade write VERSION file, add global Javascript variable DATABASEPATH 2012-09-12 21:53:01 +02:00
Jan Steemann d670fbca5b issue #150, issue #188 2012-09-12 09:32:25 +02:00
Jan Steemann 31676da1ff made deletion of cursors an atomic operation 2012-09-11 16:30:23 +02:00
Jan Steemann 135d454a3c fix wrong variable names 2012-09-10 17:59:51 +02:00
Oreste Panaia f93eef34d7 git
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	lib/ShapedJson/json-shaper.c
2012-09-10 20:53:41 +08:00
Jan Steemann c0268ce475 try to avoid duplicate read-locking from AQL queries 2012-09-10 14:44:29 +02:00
Oreste Panaia 6134497b5d Merge https://github.com/triAGENS/ArangoDB into devel 2012-09-10 20:42:48 +08:00
Oreste Panaia 8847d87580 added limited AQL support for bit indexes 2012-09-10 20:42:14 +08:00
Jan Steemann 7a20b188ba issue #188 2012-09-06 13:35:01 +02:00
Jan Steemann 37914fcf34 issue #188, issue #150: introduce periodic garbage collection for V8 contexts, fix issue with server-side cursor refcounts 2012-09-06 11:37:01 +02:00
Jan Steemann ae71cf201b issue #189 2012-09-04 14:11:39 +02:00
Jan Steemann 5000759f0b issue #189 2012-09-04 14:10:59 +02:00
Jan Steemann c855f06a47 issue #189 2012-09-04 14:10:19 +02:00
Lucas Dohmen fbe85fcb40 Merge branch 'graph_algorithms' into devel
Conflicts:
	Makefile.in
	configure
2012-09-04 09:41:03 +02:00
Jan Steemann 4aaf066081 issue #185: increased wait time in test 2012-09-04 08:35:19 +02:00
Jan Steemann 035ca9c548 increased wait time 2012-09-03 17:42:55 +02:00
Jan Steemann 13f703c2c7 issue #184 2012-09-03 11:08:35 +02:00
Jan Steemann 6232ca74c7 changed unloading of collections to not wait in an endless loop if collection cannot be unloaded 2012-09-03 10:40:07 +02:00
Jan Steemann 8944637717 issue #183: strange unittest error 2012-09-03 08:42:38 +02:00
Jan Steemann f70cdc8fcb issue #169: adjusted documentation 2012-08-31 18:08:36 +02:00
Jan Steemann e4e73a7a56 issue #169: missing argument for simple queries 2012-08-31 17:32:53 +02:00
Jan Steemann 21f24eb62b removed unused file 2012-08-31 15:28:43 +02:00
Jan Steemann 93b2a109e3 fixed typos 2012-08-31 14:06:35 +02:00
Jan Steemann b8f694ec0a issue #178: added test cases for arangoimp 2012-08-31 13:31:16 +02:00
Jan Steemann 601858fb5f added generated code 2012-08-31 13:30:36 +02:00
Jan Steemann 95cf1b65c3 fixed typo in example 2012-08-31 13:08:52 +02:00