Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,970 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

86 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
Frank Celler 8f5b31177b added redirect 2012-09-18 16:33:16 +02:00
Frank Celler de4b01b766 Merge branch '1.0' of github.com:fceller/ArangoDB into 1.0 2012-09-18 15:12:19 +02:00
Frank Celler acfa466f88 fixed typo 2012-09-18 15:12:01 +02:00
Frank Celler 2ce0c4336a added module in database 2012-09-18 15:07:57 +02:00
Frank Celler 88b72adea4 more actions example, reloadCache added 2012-09-17 18:08:28 +02:00
Frank Celler 0ee09438c2 cleanup doc 2012-09-17 13:59:49 +02:00
Frank Celler 4f6762436c added first go at user actions 2012-09-16 17:25:57 +02:00
Jan Steemann 9698fba8aa removed session handler documentation 2012-09-14 15:41:56 +02:00
Jan Steemann a51fa9d4d9 fixed some doxygen errors 2012-09-13 20:08:18 +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 5fa11516f3 fixed documentation and typos 2012-09-12 15:20:44 +02:00
Jan Steemann 94e1a80efa removed ncurses from documentation 2012-09-10 15:51:45 +02:00
Jan Steemann 0f7ee2a433 updated documentation 2012-09-04 12:27:11 +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 b8c5c4e3c0 issue #182 2012-09-03 13:44:58 +02:00
Jan Steemann ffc5f9ed6d man pages 2012-09-03 13:02:19 +02:00
Frank Celler d3f0de4701 image cleanup 2012-09-02 10:56:59 +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 203aae2c2b issue #176: added example 2012-08-31 12:02:28 +02:00
Frank Celler 3e35942af5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-08-31 09:31:57 +02:00
Jan Steemann b38f28b920 issue #179: fixed documentation error 2012-08-31 09:23:29 +02:00
Jan Steemann f9e0d9fb28 issue #179: fixed documentation error 2012-08-31 09:22:04 +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 f825cd97ac replaces API section with link to web-site 2012-08-30 16:51:17 +02:00
Frank Celler 65008d57bc added D 2012-08-30 16:51:17 +02:00
Jan Steemann b8e7d5634d issue #153: edge collection should be a flag for a collection 2012-08-28 10:48:24 +02:00
Frank Celler 76b6af6d1d replaces API section with link to web-site 2012-08-26 12:03:29 +02:00
Frank Celler c4153bdb90 added D 2012-08-24 10:55:36 +02:00
Frank Celler d26b082ef6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.in
	UnitTests/Makefile.files
 2012-08-24 09:59:16 +02:00
Jan Steemann bc56546f23 issue #110: allow partial updates 2012-08-21 11:50:55 +02:00
Jan Steemann 4b16882b44 issue #131: make keep alive timeout configurable 2012-08-20 15:42:11 +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
Frank Celler 935a38f540 fixed wiki section 2012-08-16 15:25:59 +02:00
Frank Celler 0d65d6d906 more documentation cleanup 2012-08-16 13:42:02 +02:00
Frank Celler c0774bb892 cleanup documentation 2012-08-16 11:24:24 +02:00
Jan Steemann 4e91e178eb issue #59: added documentation for import api 2012-08-14 15:58:26 +02:00
Jan Steemann 6a0e0610cc issue #59: create documentation for import api 2012-08-14 15:55:38 +02:00
Jan Steemann 43b7ea951a issue #147: added --database.force-sync-shapes option 2012-08-09 19:25:39 +02:00
Frank Celler 69a8e64f9b Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	.gitignore
	Makefile.in
	Makefile.local
	Makefile.unittests
 2012-08-09 15:25:29 +02:00
Frank Celler aef20e2887 Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Makefile.local
	arangod/Documentation/command-line-options.dox
	arangod/RestServer/ArangoServer.cpp
	build.sh
	html/admin/js/master.js
 2012-08-05 22:46:55 +02:00
Dorthe Luebbert bff120cccd formatting fixed, release date added 2012-08-05 17:24:28 +00:00
Frank Celler cf243550f5 added cheat sheet 2012-08-03 15:34:48 +02:00
Frank Celler cc421949eb added Dorthes cheat sheet 2012-08-03 15:06:14 +02:00
Frank Celler a4439db48d fixed documentation 2012-08-03 14:12:16 +02:00
Frank Celler 1ccd0677c5 fixed version number, added arangosh chapter 2012-08-03 10:22:09 +02:00
Frank Celler d7b2617348 fixed disable-admin-interface switch 2012-08-03 09:05:11 +02:00