1
0
Fork 0
Commit Graph

46 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
Oreste Panaia 2ec059e758 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
	arangod/Ahuacatl/ahuacatl-grammar.y
2012-09-17 23:01:26 +08:00
Frank Celler 21eb612376 first version of new actions module 2012-09-15 19:16:36 +02:00
Frank Celler 52b21ce4de added generated files to ignore 2012-09-05 15:40:08 +02:00
Lucas Dohmen fbe85fcb40 Merge branch 'graph_algorithms' into devel
Conflicts:
	Makefile.in
	configure
2012-09-04 09:41:03 +02:00
Lucas Dohmen 871cfb5d46 Changed Makefiles 2012-09-04 09:39:08 +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
Frank Celler fa41864b7a Merge remote-tracking branch 'origin/1.0' into devel
Conflicts:
	Installation/MacOSX/MacPorts/arango.conf
	Installation/arangod.conf.in
	Makefile.in
	arangod/RestServer/ArangoServer.h
	configure
	lib/V8/v8-utils.cpp
2012-08-18 09:00:43 +02:00
a-brandt b65381bea9 added LinuxMint and ArchLinux 2012-07-25 15:00:17 +02:00
Frank Celler d69586beb0 fixed installation issures 2012-06-30 10:32:50 +02:00
Oreste Panaia 20bbdab435 Bitarray index first draft 2012-06-26 20:05:49 +08:00
Frank Celler 3282e3714c generated files 2012-06-06 13:28:24 +02:00
Frank Celler 7c7d378fb1 preparation for mruby console 2012-06-02 11:13:57 +02:00
Frank Celler 988d8090c1 jslint 2012-05-24 23:25:19 +02:00
Frank Celler ef3c8d0de6 cleanup JSLInt 2012-05-24 15:40:48 +02:00
Frank Celler d24dcf5407 fixed warning 2012-05-23 11:33:57 +02:00
Frank Celler 763e7aba98 renamed to Arango 2012-05-12 14:40:34 +02:00
Jan Steemann 9d9fe180b9 moved json utility function to their own file (json-utilities.c) 2012-05-08 12:34:43 +02:00
Frank Celler 21ccd8524b added web html 2012-05-04 10:52:30 +02:00
Frank Celler 2baeeddb9d cosmetics 2012-04-24 14:37:53 +02:00
Frank Celler c290499bfd added error generation 2012-04-23 16:26:59 +02:00
Jan Steemann 62346bc32b merge with SVN 2012-03-21 09:06:11 +01:00
Frank Celler 755f8ec085 more simple-query stuff 2012-02-27 10:18:18 +01:00
Frank Celler 015dfbe98d added relative paths 2012-02-12 17:52:28 +01:00
Frank Celler 7de7cc82c2 added generated files 2012-02-09 10:06:42 +01:00
Frank Celler 5d7a401c6f added install-data-local 2012-02-08 14:30:21 +01:00
Frank Celler 0be5dec1bc fixed logging restart, added more logging, cleanup 2012-02-07 15:01:30 +01:00
Frank Celler 4bde2ae5f8 splitted JS files 2012-02-04 15:50:18 +01:00
Frank Celler 87e234423f added fix for macos 2012-02-03 09:52:55 +01:00
Frank Celler d537cb5a20 fix 2012-02-02 17:11:08 +01:00
Frank Celler 833176827b added jsunity 2012-01-28 20:55:57 +01:00
Frank Celler 5effbdb0f3 added jsunity 2012-01-28 20:55:53 +01:00
Frank Celler bc62480fcf towards 0.1.0 2012-01-26 17:25:01 +01:00
Frank Celler 63715bd0b1 added atexit for shutdown logging 2012-01-15 11:36:23 +01:00
Frank Celler c46bbd2905 added detect_distro.sh 2012-01-11 11:16:17 +01:00
Frank Celler 2b9b12d50f added missing (empty) file 2012-01-10 12:29:57 +01:00
Frank Celler 87b6f19e79 wiki 2012-01-05 12:45:51 +01:00
Frank Celler 62011606f4 added doxygen 2012-01-05 11:26:22 +01:00
Frank Celler a9de8fad3e automake is way too clever for me 2012-01-05 10:11:32 +01:00
Frank Celler ff9c47e4a2 added -s 2012-01-04 15:25:31 +01:00
Frank Celler 2dd24cfcb8 adjustment for different build dir 2012-01-04 15:23:06 +01:00
Frank Celler d44467a135 added build 2012-01-04 12:00:52 +01:00
Frank Celler 37ad0ef6fe added build number 2012-01-04 11:50:51 +01:00
Frank Celler 120f61423e reorganisation of directory tree structure 2012-01-04 09:47:33 +01:00
Frank Celler 6706ef5332 reorganisation of directory tree structure 2012-01-04 09:45:55 +01:00
Frank Celler 2fb09321f4 initial release 2011-10-26 21:32:36 +02:00