1
0
Fork 0
Commit Graph

27 Commits

Author SHA1 Message Date
Frank Celler c33e39051a added generated files 2012-11-13 16:32:38 +01:00
Frank Celler 939c5ece15 Merge branch '1.0' of github.com:triAGENS/ArangoDB
Conflicts:
	CHANGELOG
	CONTRIBUTING.md
	Doxygen/arango-html.doxy
	Doxygen/arango-latex.doxy
	Doxygen/arango-xml.doxy
	Doxygen/arango.template
	Makefile.in
	Makefile.local
	Makefile.unittests
	VERSION
	config/config.sub
	configure
	configure.ac
	js/actions/system/api-system.js
	js/client/js-client.h
	js/common/bootstrap/js-modules.h
	js/server/js-ahuacatl.h
	packetize.sh
2012-10-11 15:19:44 +02:00
Frank Celler a1c27df103 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	Makefile.in
2012-10-11 14:35:23 +02:00
Frank Celler 27cf9d9b04 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	3rdParty/Makefile.all-in-one-zeromq
	Makefile.in
	js/actions/system/api-blueprint.js
	js/actions/system/api-system.js
2012-10-11 14:33:31 +02:00
Frank Celler 74defa8d84 use all directories in js/ when build package list 2012-09-30 13:46:29 +02:00
Frank Celler 0e6acc4b7a - updated CHANGELOG
- added draft for user actions
2012-09-30 12:00:07 +02:00
Frank Celler aeb83e4435 ssue #165: front-end application howto 2012-09-29 16:03:32 +02:00
Jan Steemann 08b357546e added documentation for batch requests 2012-09-28 11:17:12 +02:00
Jan Steemann 10d6167d45 removed some unused compile options 2012-09-25 21:24:02 +02:00
Jan Steemann 27dc95dd35 removed dependency on boost library 2012-09-24 19:11:38 +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 b7e04ba850 create log dir during install 2012-09-19 19:43:45 +02:00
Frank Celler d39b19ead8 create log dir during install 2012-09-19 19:40:43 +02:00
Frank Celler 88b72adea4 more actions example, reloadCache added 2012-09-17 18:08:28 +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 871cfb5d46 Changed Makefiles 2012-09-04 09:39:08 +02:00
Frank Celler e4d6318802 generated files 2012-06-29 15:40:22 +02:00
Oreste Panaia 20bbdab435 Bitarray index first draft 2012-06-26 20:05:49 +08:00
Frank Celler 0d764ceaa7 regenerated makefile 2012-05-06 00:29:07 +02:00
Frank Celler 21ccd8524b added web html 2012-05-04 10:52:30 +02:00
Frank Celler a236a8f7f5 rebuild 2012-04-27 16:32:52 +02:00
Frank Celler bca6cbeaba mac 2012-04-27 16:28:04 +02:00
Frank Celler 1452969ee8 added --enable-bison, --enable-flex, --enable-all-in-one 2012-02-10 19:33:09 +01:00
Frank Celler 2c2b23a223 added all-in-one 2012-02-09 18:17:25 +01:00
Frank Celler 7de7cc82c2 added generated files 2012-02-09 10:06:42 +01:00