1
0
Fork 0
Commit Graph

10 Commits

Author SHA1 Message Date
Frank Celler 12b611d102 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 2013-01-12 21:08:35 +01:00
Frank Celler 3187fcb4f7 fixed iterate 2013-01-12 21:02:31 +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
Frank Celler 46e0cc70bf deployment tool 2013-01-08 11:02:57 +01:00
Jan Steemann d76920443d added tests and documentation for volatile collections 2013-01-07 10:55:25 +01:00
Frank Celler 28dc56496f fixed jslint warnings 2013-01-05 16:22:29 +01:00
Frank Celler 9c87607f46 added iterate 2013-01-05 16:21:03 +01:00
Frank Celler aa0d9d4e3e Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	Makefile.in
	js/server/server.js
2013-01-05 12:38:09 +01:00
Frank Celler c91b7c0f14 fixed jslint errors 2013-01-05 11:59:01 +01:00
Frank Celler 24fc2d371e moved methods to ArangoCollection 2013-01-05 11:46:33 +01:00