1
0
Fork 0
Commit Graph

12 Commits

Author SHA1 Message Date
Jan Steemann e963f104d8 split collection tests into 2 files 2013-01-16 12:44:37 +01:00
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 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 f32ba3b165 added frank to Makefile 2013-01-14 14:08:47 +01:00
Jan Steemann ac9d5f59b5 added tests for datafile building blocks sizes 2013-01-14 03:08:54 +01:00
Jan Steemann 12c687d934 added AQL fulltext queries 2013-01-11 23:08:54 +01:00
Jan Steemann e888b080d0 execute graph traversal test 2013-01-11 21:12:55 +01:00
Jan Steemann 81508c9168 make cppcheck 2013-01-07 22:28:31 +01:00
Jan Steemann d76920443d added tests and documentation for volatile collections 2013-01-07 10:55:25 +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 06e191877a added jslint target 2013-01-03 17:45:35 +01:00