1
0
Fork 0
Commit Graph

18 Commits

Author SHA1 Message Date
Frank Celler a02faec3a3 added basic authentication 2012-07-15 17:06:59 +02:00
Frank Celler d3c17ee43f fixed ruby console and actions, now using now ApplicationMR class 2012-06-22 11:00:21 +02:00
Frank Celler 37d3ad8dc2 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	Makefile.in
	arangod/RestServer/ArangoServer.cpp
	arangod/RestServer/JavascriptDispatcherThread.cpp
	lib/Dispatcher/DispatcherQueue.cpp
	lib/HttpServer/HttpCommTask.cpp
2012-06-21 23:17:48 +02:00
Jan Steemann 1bdd4c64e3 forgot to change Makefiles 2012-06-21 23:03:37 +02:00
Frank Celler 94c954b8fd application v8 2012-06-21 22:40:11 +02:00
Frank Celler ea1243d3ce feature V8 2012-06-21 00:44:25 +02:00
Frank Celler 0c9683fb8d Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	Makefile.in
2012-06-14 15:04:33 +02:00
Oreste Panaia 32911e7d38 added index iterators and started on the bitarray indexes 2012-06-14 15:09:47 +08:00
Oreste Panaia 9949c9e75c renamed sl-operator.c and sl-operator.h to index-operator.c and index-operator.h respectively 2012-06-14 10:04:41 +08:00
Frank Celler 79449d5d71 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
2012-06-13 11:40:35 +02:00
Frank Celler 3f5b54258b partial ZeroMQ integration 2012-06-13 11:39:00 +02:00
Frank Celler 263a1c345c added protocol buffers 2012-06-11 17:58:05 +02:00
Jan Steemann bd60683228 explain command, 1st version, still unfinished 2012-06-11 13:36:11 +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
Frank Celler bb9253eeff fixed queue handling for MRuby, added mount for MRuby and mr_action_t 2012-06-09 11:15:18 +02:00
Jan Steemann efd48664ef Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	Ahuacatl/ahuacatl-statement-dump.c
	Ahuacatl/ahuacatl-statement-dump.h
	Ahuacatl/ahuacatl-statementlist.c
	Ahuacatl/ahuacatl-tree-dump.c
	Ahuacatl/ahuacatl-tree-dump.h
	Ahuacatl/ahuacatl-tree-walker.h
	Makefile.files
	Makefile.in
	arangod/Ahuacatl/ahuacatl-tree-dump.c
	arangod/Ahuacatl/ahuacatl-tree-dump.h
	arangod/Ahuacatl/ahuacatl-tree-walker.c
	arangod/Ahuacatl/ahuacatl-tree-walker.h
2012-06-08 17:34:20 +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