1
0
Fork 0
Commit Graph

216 Commits

Author SHA1 Message Date
Jan Steemann 7a7d833b18 intermediate commit 2013-06-28 19:04:08 +02:00
Jan Steemann d89262dc6a incremental collection dump 2013-06-28 12:07:13 +02:00
Jan Steemann 4b758eb0e8 moved functions 2013-06-28 10:25:45 +02:00
Jan Steemann cf10b0e8ff added missing ifdefs 2013-06-27 19:28:53 +02:00
Jan Steemann b643ff4b43 added dump command 2013-06-27 19:26:10 +02:00
Jan Steemann 1cb3296e70 implemented start/stop HTTP methods for replication 2013-06-27 16:10:01 +02:00
Jan Steemann 0de3bd4213 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-26 12:05:11 +02:00
Jan Steemann 6e9c3e8e2c replication logging 2013-06-26 12:04:55 +02:00
Jan Steemann 81b94bff94 added missing error handling for importing edges 2013-06-25 16:22:10 +02:00
Jan Steemann 2ef2f60cc4 removed unused section 2013-06-19 14:04:24 +02:00
a-brandt 9e0335a1bf Merge branch 'devel' into multiple_databases 2013-06-06 16:12:44 +02:00
Thomas Richter dc691ca6c2 examples generated in api-simple.js 2013-06-06 14:43:36 +02:00
a-brandt 384b3c283c Merge branch 'devel' into multiple_databases 2013-06-04 13:07:06 +02:00
Jan Steemann c259f8ff4a fixed typo 2013-06-04 10:29:01 +02:00
a-brandt aeec284400 Merge branch 'devel' into multiple_databases 2013-06-03 17:09:21 +02:00
a-brandt 1c0578c2b5 Merge branch 'devel' into multiple_databases
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/vocbase.c
	lib/HttpServer/ApplicationEndpointServer.cpp
	lib/HttpServer/ApplicationEndpointServer.h
	lib/HttpServer/HttpCommTask.h
	lib/HttpServer/HttpHandlerFactory.cpp
	lib/HttpServer/HttpHandlerFactory.h
	lib/Rest/HttpRequest.cpp
	lib/Rest/HttpRequest.h
2013-06-03 17:05:01 +02:00
Thomas Richter c230a87879 minor changes 2013-05-31 16:40:24 +02:00
Thomas Richter 33563c3d37 names changed in Examples 2013-05-31 10:08:39 +02:00
Jan Steemann d7b64d4ae2 merged patches by @guidoreina 2013-05-21 11:33:43 +02:00
Jan Steemann ac8e947fb6 typo 2013-05-16 20:53:04 +02:00
Thomas Richter b09be801b9 swagger for RestDocumentHandler finished 2013-05-16 14:59:51 +02:00
Thomas Richter a11a0633b8 examples created until document PUT 2013-05-15 16:07:05 +02:00
Jan Steemann 0d05d53670 switched examples back to English 2013-05-13 21:20:51 +02:00
Thomas Richter dbdd9b2b80 some REST documentation adapted for swagger 2013-05-13 16:30:23 +02:00
Jan Steemann 7f5884626c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-05-13 09:01:29 +02:00
Jan Steemann c7d2f8f8cd some json / shaped-json and string handling improvements 2013-05-13 09:01:07 +02:00
Jan Steemann 841d7d7355 English 2013-05-10 14:06:15 +02:00
Jan Steemann 5b94d9af98 less malloc/free for JSON parsing 2013-05-08 23:32:14 +02:00
Thomas Richter 0562e5c94d Header with 304 returncode fixed 2013-05-08 15:38:12 +02:00
Jan Steemann bfb35a4b3c issue #495 2013-05-03 11:38:10 +02:00
Jan Steemann fde26e6913 fixed doxygen errors 2013-05-03 11:25:24 +02:00
Jan Steemann ee7ab712d6 issue #495 2013-05-03 11:08:58 +02:00
Thomas Richter 85a5f05c93 swagger documentation for api-grap.js 2013-04-30 14:52:35 +02:00
Thomas Richter 1d232d6967 some fixes in generateSwagger 2013-04-30 11:40:19 +02:00
a-brandt 6839fe7701 Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-24 17:46:36 +02:00
Thomas Richter cb940c85bd added some query and header parameters to the swagger tags 2013-04-24 15:28:31 +02:00
Thomas Richter 2fdada8724 backtick problem in REST-URL fixed 2013-04-23 12:25:16 +02:00
a-brandt 234b1460f8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-23 09:55:08 +02:00
Thomas Richter 62b870e725 in REST-documentation @LIT{} and @FA{} replaced by backticks 2013-04-22 15:42:59 +02:00
Thomas Richter 874b855fe8 in REST-documentation @LIT{} and @FA{} replaced by backticks 2013-04-22 15:39:43 +02:00
a-brandt 58de325e98 Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-17 16:58:23 +02:00
a-brandt fcae2b2961 added RequestContext 2013-04-17 16:56:48 +02:00
Jan Steemann 30b2b2ef3e adjusted locks 2013-04-16 11:23:21 +02:00
Jan Steemann 8e4af7a952 fixed some locking 2013-04-15 12:43:53 +02:00
Frank Celler 828b939053 fixed isolates, made ArangoError internal 2013-04-10 21:22:09 +02:00
Frank Celler f810711a79 FreeBSD port 2013-04-02 18:43:10 +02:00
Thomas Richter f876e30816 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-04-02 09:38:45 +02:00
Jan Steemann ba0d608a25 renamed function 2013-03-28 14:13:11 +01:00
Jan Steemann 6b3b181930 pass transaction collection into CRUD operations 2013-03-28 13:26:49 +01:00
Thomas Richter f77fa798c8 generateArangoshRun db._collections() error fixed 2013-03-27 14:37:28 +01:00