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

4170 Commits

Author SHA1 Message Date
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Jan Steemann 5349805220 issue #338 2013-01-02 17:22:08 +01:00
Frank Celler f188357f83 added padding for 32bit 2013-01-02 17:07:44 +01:00
Frank Celler 9917ece449 added missing padding for 32bit 2013-01-02 16:17:38 +01:00
Jan Steemann ed19fccc65 fixed clang compile warnings 2013-01-02 16:17:26 +01:00
Jan Steemann f0aa0a8dd6 issue #338 2013-01-02 15:44:53 +01:00
Jan Steemann 459f935d00 intptr_t to uintptr_t conversion 2013-01-02 15:00:59 +01:00
Frank Celler 1357ab6c54 Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 2013-01-02 14:53:13 +01:00
Frank Celler dadcef3de3 renamed execute/load to executelocal and executeglobal 2013-01-02 14:52:55 +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
Jan Steemann 6085ef9619 fixed doxygen error, added comment 2013-01-02 13:40:47 +01:00
Jan Steemann 926e8086c4 issue #336 2013-01-02 13:40:34 +01:00
Jan Steemann 47dea31254 issue #336 2013-01-02 13:29:39 +01:00
Jan Steemann 300289d662 issue #327 2013-01-02 11:57:48 +01:00
Jan Steemann 2dbece18e2 issue #327 2013-01-02 11:51:14 +01:00
Jan Steemann c77bcfb385 issue #339 2013-01-02 10:37:10 +01:00
Jan Steemann cc304beca9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-02 10:28:53 +01:00
Jan Steemann 908fcc8acd issue #339 2013-01-02 10:28:44 +01:00
Jan Steemann b48d039e3f issue #327 2012-12-27 18:26:04 +01:00
Jan Steemann 110fb8ade6 issue #327 2012-12-27 18:14:19 +01:00
Jan Steemann e28d9b9a93 issue #327: fixed javascript parse errors 2012-12-27 18:05:02 +01:00
Jan Steemann 721fae0b22 backported documentation for issue #300 2012-12-22 03:41:03 +01:00
Jan Steemann d562c52fd7 backport of issue #300 2012-12-22 03:38:29 +01:00
Jan Steemann 0f887a39fa issue #332 2012-12-22 02:45:29 +01:00
Jan Steemann 09e204651e issue #329 pt 2 2012-12-21 23:58:44 +01:00
Jan Steemann 8f5e50f750 do not execute scripts 2012-12-21 23:55:03 +01:00
Jan Steemann 3ef80ee03d issue #329 pt 2 2012-12-21 23:52:04 +01:00
Jan Steemann 0fcca94874 issue #329: Allow passing script file(s) as parameters for arangosh to run 2012-12-21 22:53:05 +01:00
Jan Steemann 54cf382565 issue #329: Allow passing script file(s) as parameters for arangosh to run 2012-12-21 22:51:20 +01:00
Jan Steemann 3afc0cdad2 added option '--server.disable-authentication' for arangosh as well 2012-12-21 22:17:19 +01:00
Jan Steemann 2abf581fb7 added option '--server.disable-authentication' for arangosh as well 2012-12-21 22:15:55 +01:00
Jan Steemann cd63bcb39e updated CHANGELOG 2012-12-21 22:02:55 +01:00
Jan Steemann 599428859e issue #330 2012-12-21 22:01:51 +01:00
Jan Steemann 2b84d417f8 issue #330 2012-12-21 21:54:55 +01:00
Oreste Panaia 40958d6f28 added build.h file 2012-12-21 15:54:04 +08:00
Jan Steemann 8699262625 fixed compile warnings 2012-12-20 17:12:22 +01:00
Oreste Panaia fa3f3a41c8 windows binaries 2012-12-20 21:14:13 +08:00
Jan Steemann 443757df3b some tests for issue #325 2012-12-20 13:35:49 +01:00
Jan Steemann 91911cea85 issue #325 2012-12-20 12:42:24 +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
Frank Celler b09260a06f removed debug output 2012-12-20 10:43:47 +01:00
Oreste Panaia 83ded3fc1f windows fixes 2012-12-20 17:17:30 +08:00
Jan Steemann 786e5876b5 less verbose AQL 2012-12-19 17:25:58 +01:00
Jan Steemann 7f93615dc6 issue #326 2012-12-19 17:22:01 +01:00
Jan Steemann e4fad72ec8 cppcheck 2012-12-19 10:14:57 +01:00
Jan Steemann a3007277b2 reduced variable scope 2012-12-19 09:49:30 +01:00
Jan Steemann 33ea87fccb cppcheck 2012-12-19 09:20:29 +01:00
Jan Steemann 87dbc60b95 issue #324 2012-12-18 19:05:09 +01:00