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

211 Commits

Author SHA1 Message Date
Jan Steemann 6fde7e2f27 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-15 16:45:54 +01:00
Jan Steemann 7a6db16241 added db._version() 2013-01-15 16:44:48 +01:00
Frank Celler 244d258fe7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-15 15:51:32 +01:00
Frank Celler 7380ddfabe Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangosh/V8Client/arangosh.cpp
	bin/arango32.msi
	bin/arango64.msi
	lib/BasicsC/win-utils.c
 2013-01-15 15:50:47 +01:00
Jan Steemann 4712e1637e optionally do not check element equality when inserting into the associative multi index 
this might speed up insertion a lot if we know that the same element cannot be in the index already
 2013-01-15 15:11:16 +01:00
Jan Steemann 682d22bfb0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-15 14:35:19 +01:00
Jan Steemann 2058700697 issue #353 2013-01-15 14:35:05 +01:00
Oreste Panaia c01a5c6275 arango shell and import 2013-01-14 20:16:09 +08:00
a-brandt c1fec4c5b0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-10 14:48:26 +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
Oreste Panaia afa0268e70 Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into 1.1 2013-01-09 22:23:46 +08:00
Oreste Panaia 9baae9c129 windows bug fixes 2013-01-09 22:23:35 +08:00
a-brandt 00a3d87bc4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-08 10:43:28 +01:00
a-brandt 8f9e2e51f9 libicu is mandatory now 2013-01-08 10:39:19 +01:00
Jan Steemann 876cda6ce1 cppcheck 2013-01-07 22:37:52 +01:00
Frank Celler 89a7cac605 added listTree 2013-01-05 22:45:09 +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
Jan Steemann 51305de692 in-memory collections, seem to work now 
documentation and some helper functions are still missing
 2013-01-04 17:04:15 +01:00
Jan Steemann 0471ee8a0d memory collections, intermediate commit 2013-01-04 15:50:29 +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 114de14816 fixed duplicate 2013-01-03 17:16:25 +01:00
Frank Celler 53364b7f15 updated error codes 2013-01-03 16:31:55 +01:00
Jan Steemann 63805cf84c a few small fixes for logging 2013-01-03 14:47:16 +01:00
Jan Steemann 132143289d a few small fixes for logging 2013-01-03 14:45:56 +01:00
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Frank Celler 9917ece449 added missing padding for 32bit 2013-01-02 16:17:38 +01:00
Jan Steemann 459f935d00 intptr_t to uintptr_t conversion 2013-01-02 15:00:59 +01:00
Jan Steemann 74f9ced94e issue #335 2013-01-02 14:37:46 +01:00
Jan Steemann 19f459331d issue #335 2013-01-02 14:25:19 +01:00
Jan Steemann ea48388726 issue #335 2013-01-02 14:12:44 +01:00
Oreste Panaia fa3f3a41c8 windows binaries 2012-12-20 21:14:13 +08: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
Jan Steemann 669fe4275a cppcheck 2012-12-18 16:44:06 +01:00
Frank Celler 621e4409bc Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	.gitignore
	CHANGELOG
	Documentation/Makefile.files
	Installation/build.sh
	Installation/epm/arangodb.list
	Makefile.in
	README
	README.md
	VERSION
	aclocal.m4
	arangod/HashIndex/hasharray.c
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	config/config.guess
	config/config.sub
	config/depcomp
	configure
	configure.ac
	html/admin/js/master.js
	js/server/arango-password.js
	js/server/version-check.js
	lib/BasicsC/files.c
	lib/BasicsC/logging.c
	utils/Makefile.files
 2012-12-18 13:37:34 +01:00
Jan Steemann 697d09a558 fixed race conditions in multi-threading that may happen in some environments. looks like va_copy etc. are not always thread safe... 2012-12-18 12:57:39 +01:00
Jan Steemann b8ca0b2d4d fulltext index massive rewrite 2012-12-15 01:01:25 +01:00
Jan Steemann b5d0457f3a fixed some issues reported by cppcheck 2012-12-12 18:42:11 +01:00
Jan Steemann 473aaa8fd4 fixed typos 2012-12-11 18:57:50 +01:00
Jan Steemann bfb6398110 added (intentional) compile error for Windows 2012-12-10 15:51:48 +01:00
Jan Steemann 8e201eba20 added #error markers for Windows 2012-12-10 15:50:02 +01:00
Jan Steemann 6d8851d83c protect against some invalid cases 2012-12-10 15:43:51 +01:00
Jan Steemann 9a9e8c3214 added test case for absolute path 2012-12-10 15:39:57 +01:00
Jan Steemann b16f672902 fixed some log errors on startup & shutdown 2012-12-10 15:18:35 +01:00
Oreste Panaia 4ece32bed4 test 2012-12-10 19:42:50 +08:00
Oreste Panaia 033adb225b Updated windows installer 2012-12-10 19:33:32 +08:00
a-brandt 1794ea49fa added new function for getting words 2012-12-07 13:09:16 +01:00
Jan Steemann ec9f72f227 return appropriate error codes 2012-12-07 10:49:06 +01:00
Oreste Panaia 857b66c490 windows version 2012-12-06 20:44:01 +08:00
Jan Steemann 242a16d6f5 proper naming of ICU functions 2012-12-06 12:27:22 +01:00