1
0
Fork 0
Commit Graph

891 Commits

Author SHA1 Message Date
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Frank Celler f188357f83 added padding for 32bit 2013-01-02 17:07:44 +01:00
Frank Celler dadcef3de3 renamed execute/load to executelocal and executeglobal 2013-01-02 14:52:55 +01:00
Jan Steemann ea48388726 issue #335 2013-01-02 14:12:44 +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 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 d562c52fd7 backport of issue #300 2012-12-22 03:38:29 +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
Jan Steemann 443757df3b some tests for issue #325 2012-12-20 13:35:49 +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
Jan Steemann 7f93615dc6 issue #326 2012-12-19 17:22:01 +01:00
Jan Steemann dd906abbd3 issue #324 2012-12-18 19:04:45 +01:00
Jan Steemann 96637435ab fulltext: more query operators, more tests, more controlled memory usage and statistics 2012-12-18 14:56:06 +01:00
Jan Steemann dc3c479e71 potential fix for issue #315 2012-12-17 13:09:15 +01:00
Jan Steemann d07dfd9ee1 potential fix for #315 2012-12-17 13:06:18 +01:00
Jan Steemann 58686a8c2e issue #323 2012-12-17 10:18:46 +01:00
Jan Steemann 81d6146d02 issue #323 2012-12-17 10:16:26 +01:00
Jan Steemann b8ca0b2d4d fulltext index massive rewrite 2012-12-15 01:01:25 +01:00
Jan Steemann fb4afd0353 fulltext index 2012-12-10 12:16:48 +01:00
Jan Steemann cbaa57a1bd cleanup of fulltext indexes, resizing etc. 2012-12-07 18:00:01 +01:00
Jan Steemann c49ce0a52f fulltext resizing, still incomplete 2012-12-07 13:51:19 +01:00
Jan Steemann ec9f72f227 return appropriate error codes 2012-12-07 10:49:06 +01:00
Jan Steemann b5b431e815 some more tests 2012-12-07 09:08:58 +01: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
Frank Celler 5ca2930c67 Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 2012-12-05 15:43:39 +01:00
Jan Steemann f9f893d4b7 extended AQL DOCUMENT() function to take a list of ids 2012-12-05 14:14:44 +01:00
Jan Steemann a9df4d22cb extended AQL document() function to take id lists 2012-12-05 14:10:06 +01:00
Frank Celler f8ef23f9cd Merge remote-tracking branch 'origin/master' into 1.1 2012-12-05 13:03:28 +01:00
Frank Celler 051705c7b9 Merge branch '1.1' of github.com:triAGENS/ArangoDB
Conflicts:
	.gitignore
	CHANGELOG
	Doxygen/Examples.ArangoDB/arangosh-options
	Doxygen/arango-html.doxy
	Doxygen/arango-latex.doxy
	Doxygen/arango-xml.doxy
	Doxygen/arango.template
	Makefile.in
	UnitTests/HttpInterface/api-collection-spec.rb
	VERSION
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/Documentation/first-steps-arangodb.dox
	arangod/Documentation/user-manual.dox
	arangod/HashIndex/compare.h
	arangod/HashIndex/hasharray.c
	arangod/HashIndex/hasharray.h
	arangod/HashIndex/hashindex.h
	arangod/V8Server/v8-actions.cpp
	arangod/VocBase/simple-collection.c
	arangosh/V8Client/V8ClientConnection.cpp
	arangosh/V8Client/V8ClientConnection.h
	arangosh/V8Client/arangoimp.cpp
	arangosh/V8Client/arangosh.cpp
	configure
	configure.ac
	html/admin/css/layout.css
	html/admin/index.html
	html/admin/js/master.js
	js/actions/system/api-system.js
	js/common/bootstrap/js-modules.h
	js/server/js-ahuacatl.h
	js/server/js-server.h
	js/server/server.js
	lib/BasicsC/voc-errors.c
	lib/V8/v8-globals.h
2012-12-05 12:34:08 +01:00
Jan Steemann fd61b74174 added AQL function DOCUMENT() to retrieve a document by its _id value 2012-12-05 11:48:56 +01:00
Jan Steemann e4e95fabfe added AQL function DOCUMENT() 2012-12-05 11:47:03 +01:00
Jan Steemann cc54fd3ccc added some language test cases 2012-12-04 16:02:40 +01:00
Jan Steemann 99034b0aa4 more tests 2012-12-04 15:36:49 +01:00
Jan Steemann 0b41690881 tests for substrings 2012-12-04 15:01:48 +01:00
Jan Steemann b5c978feb6 applied bugfix from Richard, more test cases 2012-12-04 14:40:50 +01:00
Jan Steemann 46132c9f26 more tests for fulltext 2012-12-04 14:20:55 +01:00
Jan Steemann dc9f84fc60 added test cases for update and delete 2012-12-04 11:46:49 +01:00
Jan Steemann 5742ab6fba fixed unicode lowercasing 2012-12-04 11:12:38 +01:00
Jan Steemann 5eb0081bcd tests for issue #300 2012-12-04 09:58:23 +01:00
Jan Steemann 1992597015 applied bug fix from Richard, activated 2 more tests 2012-12-04 09:00:48 +01:00