1
0
Fork 0
Commit Graph

1687 Commits

Author SHA1 Message Date
a-brandt daa80af5b8 Merge branch 'devel' into multiple_databases 2013-06-11 16:00:34 +02:00
Jan Steemann 0acc1c9580 added stub documentation for traversals (still unfinished) 2013-06-11 15:58:41 +02:00
Jan Steemann 223674f399 fixed doxygen 2013-06-11 13:01:58 +02:00
Jan Steemann 31bd0e915b jslintify all APIs in js/actions 2013-06-11 12:01:04 +02:00
a-brandt d9fc2a6c60 Merge branch 'devel' into multiple_databases
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/primary-collection.c
2013-06-11 11:17:41 +02:00
Jan Steemann e8e10844f4 moved compaction tests 2013-06-11 10:41:40 +02:00
Jan Steemann 564523896a compaction tests 2013-06-11 10:10:58 +02:00
Thomas Richter d8e43c676b generated examples for api-aqlfunction.js 2013-06-10 14:43:19 +02:00
Thomas Richter 4ab74c56f1 generated examples for api-query.js 2013-06-10 10:41:32 +02:00
Thomas Richter 8db9e9c4fa generated examples for api-explain.js 2013-06-10 10:23:01 +02:00
Thomas Richter c5d49ba3d5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-07 17:21:17 +02:00
Thomas Richter b3f4383117 generated examples for api-index.js 2013-06-07 17:20:40 +02:00
Jan Steemann e3275136cd allow incremental access to all documents from a collection out of AQL 2013-06-07 16:51:42 +02:00
Jan Steemann 3356055b64 derived files, jslint 2013-06-07 16:41:06 +02:00
Lucas Dohmen 567a548cff Tearing appart Graph#addEdge and fixing the build even harder 2013-06-07 14:56:08 +02:00
Jan Steemann f619c7f51e jslint 2013-06-07 14:48:39 +02:00
Jan Steemann 241978ee54 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-07 14:45:00 +02:00
Thomas Richter 2cd6434788 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-07 14:38:58 +02:00
Thomas Richter 43497f00ab generated examples for api-collection.js 2013-06-07 14:38:28 +02:00
Jan Steemann 15f6f54f76 moved "use strict" inside functions 2013-06-07 14:20:57 +02:00
Jan Steemann fe26fa593e jslint 2013-06-07 14:20:50 +02:00
Lucas Dohmen 5aadaf1b99 Restructering Graph Module, fixing the build 2013-06-07 13:51:22 +02:00
Thomas Richter 94757fd74f generated examples for api-transaction.js 2013-06-07 12:47:30 +02:00
Lucas Dohmen 8e27de26a7 Fix for #546 2013-06-07 10:19:37 +02:00
Jan Steemann 54b0552dee use a stable sort in COLLECT 2013-06-06 16:56:39 +02:00
Thomas Richter 9d51338aee Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-06 16:34:42 +02:00
Thomas Richter 55ff32fbf3 generated examples api-cursor.js finished 2013-06-06 16:34:06 +02:00
a-brandt 9e0335a1bf Merge branch 'devel' into multiple_databases 2013-06-06 16:12:44 +02:00
Jan Steemann 403e8669ae fixed non-existing error codes 2013-06-06 16:11:18 +02:00
Thomas Richter 638a0cb05f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-06 14:52:35 +02:00
Thomas Richter dc691ca6c2 examples generated in api-simple.js 2013-06-06 14:43:36 +02:00
a-brandt e4096900cc Merge branch 'devel' into multiple_databases 2013-06-06 12:54:58 +02:00
Heiko Kernbach 8b2527f572 checked jslint + added js files in makefile.files 2013-06-06 11:23:04 +02:00
Heiko Kernbach de1b9946ba added jslint checks for webif 2013-06-06 10:49:43 +02:00
a-brandt 793dc6077d Merge branch 'devel' into multiple_databases 2013-06-05 17:29:34 +02:00
a-brandt f061801cb9 added new collection 2013-06-05 17:27:36 +02:00
Jan Steemann af7866f238 made internal.download() function more flexible
required by @mchacki
can now send custom headers and use non-GET method
2013-06-05 00:25:36 +02:00
Jan Steemann 5bdaa22049 issue #545 2013-06-04 18:31:16 +02:00
Thomas Richter e8ca05e9b8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-04 15:17:27 +02:00
Thomas Richter 5cf5a59471 generated examples api-graph.js finished 2013-06-04 15:17:10 +02:00
a-brandt 384b3c283c Merge branch 'devel' into multiple_databases 2013-06-04 13:07:06 +02:00
Jan Steemann 3a8ecd20e4 issue #550: Make AQL graph functions support key in addition to id 2013-06-04 11:37:41 +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 d54ba9ea76 conflict resolution 2013-06-03 15:12:35 +02:00
Thomas Richter d458c20871 fixed return code in documentation api-graph.js DELETE from 204 to 200/202 2013-06-03 15:09:03 +02:00
a-brandt 7e3f915492 changed wrong documentation 2013-06-03 15:00:37 +02:00
Thomas Richter 4e88658a8b api-edges.js examples changed 2013-06-03 11:03:56 +02:00
Thomas Richter 33563c3d37 names changed in Examples 2013-05-31 10:08:39 +02:00
Jan Steemann f3bf3281a3 added js/models to jslint 2013-05-24 11:57:14 +02:00