13 Commits

Author	SHA1	Message	Date
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	7be1c01bda	removed linked in JavaScript code, separate files for 'fs' and 'console'	2013-01-05 23:24:10 +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	53364b7f15	updated error codes	2013-01-03 16:31:55 +01:00
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
Jan Steemann	d60888e970	replaced arango-upgrade script with server startup option --upgrade	2012-12-03 13:45:58 +01:00
Jan Steemann	42ba0502f0	changed upgrade procedure ... removed arango-upgrade script, replaced it with --upgrade server option adjusted documentation & start scripts	2012-12-03 13:02:59 +01:00
Jan Steemann	30799b0857	fixed unknown log level	2012-11-20 09:33:39 +01:00
Jan Steemann	50f6868b6a	fixed unknown log level	2012-11-20 09:33:09 +01:00
Jan Steemann	744618fbe0	fixed some escape routes in version check	2012-11-20 09:31:09 +01:00
Jan Steemann	2efa2f32db	added server version check	2012-11-20 09:27:28 +01:00
Jan Steemann	85a8f56a34	complain about non-expected database directory versions	2012-11-20 01:41:41 +01:00