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

112 Commits

Author SHA1 Message Date
Frank Celler 3a5b66d840 added function action 2013-01-14 14:25:41 +01:00
Frank Celler 33e3031380 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Makefile.in
	VERSION
	arangod/V8Server/v8-query.cpp
	build_posix.h
	configure
	configure.ac
 2013-01-10 18:00:25 +01:00
Frank Celler 8ec82daba0 nicer error messages 2013-01-10 09:19:40 +01:00
Frank Celler 128cb67c8b Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	Documentation/Examples/shell-read-document-bad-handle
	Makefile.in
	arangod/Documentation/shell-document.dox
	configure
	js/actions/system/api-collection.js
	js/actions/system/api-index.js
	js/actions/system/api-system.js
	js/common/bootstrap/modules.js
	js/common/bootstrap/print.js
	js/server/ArangoCollection.js
	lib/V8/v8-utils.cpp
 2013-01-09 15:30:21 +01:00
Frank Celler 812360145e added flush 2013-01-09 11:47:17 +01:00
Frank Celler 46e0cc70bf deployment tool 2013-01-08 11:02:57 +01:00
Frank Celler b9c0d7c937 moved errors to arangodb, fixed lslint warning 2013-01-06 12:09:40 +01:00
Frank Celler f5b1476d78 fixed jslint warnings 2013-01-06 11:05:28 +01:00
Frank Celler 51779b4a3e fixed more jslint warnings 2013-01-05 17:13:13 +01:00
Frank Celler 7226c41ca6 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/actions/system/api-collection.js
 2013-01-05 11:21:24 +01:00
Frank Celler 0549528325 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.in
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-vocbase.cpp
	html/admin/js/master.js
	js/actions/system/api-collection.js
	js/common/bootstrap/errors.js
	js/server/version-check.js
	lib/BasicsC/errors.dat
	lib/BasicsC/logging.c
	lib/BasicsC/voc-errors.c
	lib/BasicsC/voc-errors.h
 2013-01-05 11:16:50 +01:00
Frank Celler ba26708f94 moved to actions.errors 2013-01-05 11:15:40 +01:00
Frank Celler f9dba124dd Merge remote-tracking branch 'origin/issue317' into 1.1 
Conflicts:
	js/common/bootstrap/modules.js
 2013-01-03 18:57:18 +01:00
Frank Celler 1c1106d825 fixed names 2013-01-03 18:45:44 +01:00
Frank Celler 79360ea164 more exports 2013-01-03 17:15:20 +01:00
Frank Celler 53364b7f15 updated error codes 2013-01-03 16:31:55 +01:00
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Jan Steemann c77bcfb385 issue #339 2013-01-02 10:37:10 +01:00
Jan Steemann 908fcc8acd issue #339 2013-01-02 10:28:44 +01:00
Frank Celler d5f24ce13c Merge remote-tracking branch 'origin/windows' into HEAD 
Conflicts:
	CHANGELOG
	Documentation/InstallationManual/Installing.md
	Documentation/Makefile.files
	Documentation/Scripts/generateTOC.py
	Documentation/header.html
	Installation/OBS/clean-repo.sh
	Installation/OBS/create-repo.sh
	Installation/OBS/create-ymp.sh
	Installation/OBS/index.html
	Installation/OBS/load-repo.sh
	Makefile.in
	VERSION
	aclocal.m4
	arangod/Ahuacatl/ahuacatl-functions.c
	arangod/Documentation/user-manual.dox
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/collection.c
	arangod/VocBase/datafile.c
	arangosh/V8Client/arangosh.cpp
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/install-sh
	config/missing
	configure
	configure.ac
	js/server/arango-upgrade.js
	js/server/modules/org/arangodb/actions.js
	lib/BasicsC/logging.c
	lib/Utilities/ScriptLoader.cpp
 2012-12-20 11:11:47 +01:00
Oreste Panaia 83ded3fc1f windows fixes 2012-12-20 17:17:30 +08:00
Oreste Panaia 857b66c490 windows version 2012-12-06 20:44:01 +08:00
Jan Steemann 013fea7d01 added missing function referenced by simple query API 2012-12-05 18:44:35 +01:00
Jan Steemann 1ffa8e702c more tests and documentation for fulltext indexes 2012-12-05 16:12:33 +01:00
Jan Steemann 42ba0502f0 changed upgrade procedure 
removed arango-upgrade script, replaced it with --upgrade server option
adjusted documentation & start scripts
 2012-12-03 13:02:59 +01:00
Jan Steemann 2efa2f32db added server version check 2012-11-20 09:27:28 +01:00
Jan Steemann 85a8f56a34 complain about non-expected database directory versions 2012-11-20 01:41:41 +01:00
Jan Steemann 67c0ac2e2c issue #262 2012-10-25 10:57:51 +02:00
Jan Steemann bbd3dc8e23 issue #262 2012-10-25 10:57:26 +02:00
Jan Steemann 785d602fa0 remove invalid file 2012-10-24 11:55:15 +02:00
Jan Steemann 5a465a1763 more verbose action debugging 2012-10-24 11:54:40 +02:00
Jan Steemann e28a6625ef more verbose action debugging 2012-10-24 11:54:14 +02:00
Jan Steemann 85a81a2e04 another bugfix 2012-10-24 10:11:06 +02:00
Jan Steemann b95831c906 another bugfix 2012-10-24 10:10:41 +02:00
Jan Steemann 95c9c85608 documentation update 2012-10-24 09:39:39 +02:00
Jan Steemann 6e2e340c41 documentation update 2012-10-24 09:38:46 +02:00
Jan Steemann 39afb5e1a0 initialise variable 2012-10-23 18:51:22 +02:00
Jan Steemann c3f84cb2a6 initialise variable 2012-10-23 18:50:34 +02:00
Jan Steemann a422f005b6 updated documentation and error messages 2012-10-23 17:03:21 +02:00
Jan Steemann d4a116525b some documentation and error message updates 2012-10-23 17:02:31 +02:00
Jan Steemann f64bfd9240 also add other system collection 2012-10-22 16:46:28 +02:00
Frank Celler c1b0c37480 added module org/arangodb, added convinient functions 2012-10-18 15:39:00 +02: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 d1728b8920 fixed undefined vs delete attributes 2012-10-01 13:11:05 +02:00
Frank Celler 049009ba5a a string as action is mapped to a prefix controller 2012-10-01 12:39:11 +02:00
Frank Celler 50c2963897 create _routing if not present 2012-10-01 11:49:09 +02:00
Frank Celler faad04c8b3 switch options and next 2012-10-01 11:46:06 +02:00
Frank Celler db4d31cd94 fixed jslint issures 2012-09-29 16:39:58 +02:00
Frank Celler aeb83e4435 ssue #165: front-end application howto 2012-09-29 16:03:32 +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