1
0
Fork 0
Commit Graph

302 Commits

Author SHA1 Message Date
Jan Steemann ad855bd2bd fixed doxygen errors 2012-11-21 18:10:45 +01:00
Jan Steemann a2b404123a load monkeypatches on all occasions 2012-11-20 16:50:15 +01:00
Jan Steemann 171914bf7a added test case for #284 2012-11-19 21:57:21 +01:00
a-brandt 78aacd35da printing issues fixed 2012-11-19 15:20:34 +01:00
Jan Steemann ace85c43c9 nesting transactions from v8-vocbase... 2012-11-15 18:55:52 +01:00
Jan Steemann 1ff2430e39 transaction refactoring 2012-11-15 13:53:11 +01:00
Jan Steemann 12d76b8306 introduced additional transaction type for import 2012-11-15 09:52:47 +01:00
Jan Steemann 30ba8771a7 pluggable key generators 2012-11-14 12:44:56 +01:00
Frank Celler 19d4125e80 fixed issue #275: strange error message in arangosh 1.0.3 at startup
Conflicts:
	CHANGELOG
	js/common/bootstrap/js-modules.h
2012-11-12 17:50:51 +01:00
Jan Steemann dacd2fb70c some cleanup 2012-11-06 19:24:27 +01:00
Jan Steemann 59791248bf some refactoring of v8-vocbase, trx integration 2012-11-06 19:02:09 +01:00
Jan Steemann 203560d30b moved transactions into javascript object 2012-11-06 14:42:52 +01:00
a-brandt fff25d5ac3 renamed "blueprint" to "blueprints" and added documentation and tests 2012-10-30 12:29:51 +01:00
a-brandt 7daa018969 removed "reuseID" 2012-10-26 12:36:13 +02:00
Jan Steemann 296ad4f5e7 reduce index bloat for edges 2012-10-25 22:02:31 +02:00
Jan Steemann cb6c8c8e7e added bidirectional edges, fixup edges index 2012-10-25 17:18:54 +02:00
Jan Steemann bbd3dc8e23 issue #262 2012-10-25 10:57:26 +02:00
a-brandt e66daf3f43 bugfix unit tests 2012-10-24 12:36:11 +02:00
a-brandt c2d0749178 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/RestHandler/RestDocumentHandler.cpp
	arangod/RestHandler/RestEdgeHandler.cpp
	arangod/RestHandler/RestImportHandler.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/document-collection.c
	arangod/VocBase/document-collection.h
	arangod/VocBase/primary-collection.c
	arangod/VocBase/primary-collection.h
2012-10-24 10:46:38 +02:00
a-brandt 9a599e468a added "_key" attribute 2012-10-23 15:58:09 +02:00
Jan Steemann d4cb1b5399 issue #262: more verbose error messages when loading broken modules 2012-10-22 16:21:04 +02:00
Frank Celler d27ba1cf30 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 2012-10-20 22:56:54 +02:00
Frank Celler 0499d8b4e2 ixed wrong attribute
Conflicts:
	js/common/bootstrap/js-modules.h
2012-10-20 22:46:59 +02:00
Frank Celler 3b5a0967bc Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
	Documentation/Makefile.files
	Installation/build.sh
	arangod/Documentation/communication.dox
	arangod/HashIndex/hasharray.c
	arangod/HashIndex/hashindex.c
	lib/Rest/Endpoint.cpp
	lib/Rest/Endpoint.h
	lib/Rest/EndpointIp.h
	lib/Rest/EndpointIpV4.h
	lib/Rest/EndpointIpV6.h
	lib/Rest/EndpointUnixDomain.cpp
2012-10-20 22:37:25 +02:00
Frank Celler 61856501ea changed .module to .content for modules in collection _modules
Conflicts:
	js/common/bootstrap/js-modules.h
2012-10-20 22:17:54 +02:00
Frank Celler c1b0c37480 added module org/arangodb, added convinient functions 2012-10-18 15:39:00 +02:00
Jan Steemann 0c4da6a1d7 added test cases for edge insert/update rollback 2012-10-17 17:37:29 +02:00
Jan Steemann 5c4d981e7a added tests, fixed documentation 2012-10-17 16:50:35 +02:00
Jan Steemann 057cadc5c0 added some tests, fixed docs 2012-10-17 16:49:48 +02:00
Jan Steemann be54759314 issue #245 2012-10-17 14:24:31 +02:00
Jan Steemann c2be68fc7f issue #245 2012-10-17 14:21:46 +02:00
Frank Celler 195d6903c1 added generated files 2012-10-14 16:23:48 +02:00
Frank Celler 59ef60d6b2 fixed doc errors 2012-10-12 19:21:52 +02:00
Frank Celler 7c3547e815 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	Makefile.files
	Makefile.in
	js/actions/system/api-system.js
2012-10-11 23:18:55 +02:00
Jan Steemann 2bb0407826 issue #235: fixed broken web front end 2012-10-11 21:32:15 +02:00
Frank Celler bbd9698d22 removed generated files 2012-10-11 16:20:08 +02:00
Frank Celler 939c5ece15 Merge branch '1.0' of github.com:triAGENS/ArangoDB
Conflicts:
	CHANGELOG
	CONTRIBUTING.md
	Doxygen/arango-html.doxy
	Doxygen/arango-latex.doxy
	Doxygen/arango-xml.doxy
	Doxygen/arango.template
	Makefile.in
	Makefile.local
	Makefile.unittests
	VERSION
	config/config.sub
	configure
	configure.ac
	js/actions/system/api-system.js
	js/client/js-client.h
	js/common/bootstrap/js-modules.h
	js/server/js-ahuacatl.h
	packetize.sh
2012-10-11 15:19:44 +02:00
Jan Steemann b639a6ec8c removed lines that printed stuff out 2012-10-10 18:33:34 +02:00
Jan Steemann 9ffa4779e2 test cases for issue #213 2012-10-10 09:22:18 +02:00
Jan Steemann 3b8ad1835e harmonise API between client and server versions
this adds db._createStatement() on the server side, furthermore it provides GeneralArrayCursor.elements()
2012-10-08 18:11:45 +02:00
Jan Steemann 788f91cd59 added ArangoStatement.explain() client method, wrote test cases 2012-10-08 15:49:15 +02:00
Oreste Panaia 5d79b618c7 strings converted to char* 2012-10-01 18:36:42 +08:00
Frank Celler a5f83c3e8d create modules collection 2012-10-01 12:00:43 +02:00
Frank Celler 5d21d2ac2d removed try/catch 2012-09-29 14:52:56 +02:00
Oreste Panaia eabf79704a VS 2012-09-28 23:45:16 +08:00
Jan Steemann 56dcb0aedf reduced number of docs in compaction test even more 2012-09-27 13:49:59 +02:00
Jan Steemann 856a1bf9f6 reduced number of docs even further 2012-09-26 16:44:33 +02:00
Jan Steemann 704520c436 reduced waittime 2012-09-26 16:26:40 +02:00
Jan Steemann ad6f26e86a added waittime, reduced number of docs 2012-09-26 16:26:05 +02:00
Jan Steemann 55a1c66203 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-26 15:49:01 +02:00