1
0
Fork 0
Commit Graph

4277 Commits

Author SHA1 Message Date
Frank Celler 909b516a4c fixed merge bug 2012-12-05 12:37:43 +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 bbe12fbb96 added troubleshooting to 1st steps 2012-12-05 12:20:34 +01:00
Jan Steemann 23789e0b8c added troubleshooting to 1st steps 2012-12-05 12:19:55 +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
Frank Celler 26027346de updated README 2012-12-05 10:58:04 +01:00
Frank Celler 0b8725e2bb Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 2012-12-05 09:51:24 +01:00
Jan Steemann 4752225107 cleanup 2012-12-05 01:26:44 +01:00
Jan Steemann 50269e876e cleanup 2012-12-05 01:10:17 +01:00
Jan Steemann bfefad82f4 cleanup 2012-12-05 00:43:03 +01:00
Jan Steemann 1471c06a2c cleanup 2012-12-04 22:55:53 +01:00
Jan Steemann 5b762abc7f factored out a function 2012-12-04 22:19:37 +01:00
Jan Steemann fe77e22e24 clean up 2012-12-04 22:07:49 +01:00
Jan Steemann 3882129fad unused 2012-12-04 21:23:42 +01:00
Jan Steemann 21fa3ed616 small stuff, oom handling etc. 2012-12-04 21:21:26 +01:00
Jan Steemann d5a868079f fixed errors in about files 2012-12-04 21:03:13 +01:00
Jan Steemann 4d04853597 fixed #311 2012-12-04 20:49:58 +01:00
Jan Steemann 7c94afad4f fixed issue #311 2012-12-04 20:44:07 +01:00
Jan Steemann 1811ce9186 fixed some issues found by cppcheck 2012-12-04 18:21:29 +01:00
Frank Celler 5283ec7bfa fixed documentation 2012-12-04 16:25:51 +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 285533ab4c added documentation for --upgrade option 2012-12-04 11:55:04 +01:00
Jan Steemann f302b31153 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-12-04 11:47:05 +01:00
Jan Steemann dc9f84fc60 added test cases for update and delete 2012-12-04 11:46:49 +01:00
Frank Celler 59742a99de Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 2012-12-04 11:36:40 +01:00
Frank Celler 153aa0929c fix case 2012-12-04 11:36:32 +01:00
a-brandt 42dd82ccc4 Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 2012-12-04 11:29:08 +01:00
a-brandt 7cab2f055b added systemd for openSUSE 12 2012-12-04 11:28:38 +01:00
a-brandt 968a2b91b6 added systemd for openSUSE 12 2012-12-04 11:22:58 +01:00
a-brandt f9cda1819b added some documentation 2012-12-04 11:22:20 +01:00
Jan Steemann 5742ab6fba fixed unicode lowercasing 2012-12-04 11:12:38 +01:00
Jan Steemann 3f7e0c6f20 fixed edge case of searching very long words 2012-12-04 10:59:06 +01:00
Jan Steemann 5eb0081bcd tests for issue #300 2012-12-04 09:58:23 +01:00
Jan Steemann 297e9bb4fd added documentation for --upgrade 2012-12-04 09:16:22 +01:00
Jan Steemann 1e1f7da7f9 renamed files 2012-12-04 09:07:02 +01:00
Jan Steemann 1992597015 applied bug fix from Richard, activated 2 more tests 2012-12-04 09:00:48 +01:00
Jan Steemann cb08d4f45f fulltext tests 2012-12-04 01:51:16 +01:00
Jan Steemann 4d2d8455d4 fulltext query test cases 2012-12-04 01:20:34 +01:00
Jan Steemann 962ef32c15 code style 2012-12-03 23:55:59 +01:00
Jan Steemann efde7b5efa first test cases for fulltext index 2012-12-03 23:55:46 +01:00
Jan Steemann bd4a56c269 more cleanup 2012-12-03 22:54:27 +01:00
Jan Steemann 4a941bc845 some cleanup 2012-12-03 22:54:14 +01:00
Jan Steemann 86c3cf4cde code formatting 2012-12-03 18:47:11 +01:00
Jan Steemann 260f28ac85 added bugfix from Richard 2012-12-03 18:11:11 +01:00
Jan Steemann 195cdb81a8 using TRI_Free 2012-12-03 18:05:53 +01:00