1
0
Fork 0
Commit Graph

781 Commits

Author SHA1 Message Date
Jan Steemann c16ddedc83 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
	js/server/modules/org/arangodb/ahuacatl.js
	js/server/modules/org/arangodb/aql-helper.js
	js/server/tests/shell-skiplist-index.js
2014-09-09 22:18:52 +02:00
Jan Steemann 428865f3b5 issue #1014: WITHIN function returns wrong distance
added attribute setters for ShapedJson so document attributes can be updated

Conflicts:
	arangod/V8Server/v8-vocbase.cpp
2014-09-09 19:58:27 +02:00
Alan Plum 844621f070 Implemented Foxx.createQuery. 2014-09-09 17:02:21 +02:00
Jan Steemann aadd0f9254 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/Utils/CollectionNameResolver.h
	arangod/V8Server/v8-vocbase.cpp
2014-08-30 17:35:08 +02:00
Jan Steemann c0463a1797 added `type` option for `GET /_api/document?collection=...`
Conflicts:
	CHANGELOG
2014-08-30 17:26:24 +02:00
Jan Steemann b54e791f8f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-28 22:23:25 +02:00
Jan Steemann d72354da66 issue #1003: added feature to use backslash escaping for CSV data in arangoimp 2014-08-28 21:03:58 +02:00
Jan Steemann a014b44ba4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/Utils/Transaction.h
2014-08-28 11:06:14 +02:00
Jan Steemann 81c095105b issue #1003 2014-08-28 10:32:32 +02:00
Jan Steemann 3b9636c52b issue #1004 2014-08-28 08:55:02 +02:00
Jan Steemann 4760b3c921 once again: attempt to fix non-deterministic test 2014-08-27 22:44:14 +02:00
Jan Steemann cd1d0c45f8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/V8Server/v8-query.cpp
2014-08-27 19:25:37 +02:00
Jan Steemann 6e872111f0 hopefully fix random travis test 2014-08-27 11:45:14 +02:00
Jan Steemann a70a9613f6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	lib/BasicsC/voc-errors.h
2014-08-22 21:51:38 +02:00
Jan Steemann 6355f2e217 use --std=c++11 for cppcheck 2014-08-22 12:51:37 +02:00
Jan Steemann 5a9c16eaad attempt to fix test 2014-08-20 16:26:43 +02:00
Jan Steemann f8cf5dc26d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
2014-08-15 18:47:18 +02:00
Jan Steemann cd575e073f fixed tests 2014-08-15 18:19:52 +02:00
Max Neunhoeffer 28f0d7be05 Sort out TRI_CompareValuesJson to use UTF8 on demand. 2014-08-13 14:22:05 +02:00
Frank Celler e0db77b070 fixed tests, log can contain more entries 2014-08-13 12:17:37 +02:00
Jan Steemann 099ec8db60 reallow attribute names starting with underscores 2014-08-07 15:52:58 +02:00
Frank Celler 0344573b5f use all available, non-cluster tests 2014-07-25 15:36:21 +02:00
Jan Steemann fbbea02c71 disabled non-deterministic test 2014-07-23 15:49:17 +02:00
Jan Steemann 8de45f0225 increase ttl for test 2014-07-22 15:18:02 +02:00
Jan Steemann 712358d069 added optional `ttl` attribute to specify result cursor expiration for HTTP API method `POST /_api/cursor`
The `ttl` attribute can be used to prevent cursor results from timing out too early.
2014-07-21 15:48:43 +02:00
Michael Hackstein 30f2a59511 Fixed cluster test in general graph 2014-07-17 09:02:45 +02:00
Michael Hackstein 871db072e7 Added tests for gharial error return codes. Fixed a bug pn false return code on the way 2014-07-16 11:04:39 +01:00
Max Neunhoeffer 286a69ce87 Change Unittest makefile to reflect file name change. 2014-07-09 11:31:22 +02:00
Michael Hackstein 5ccc4cb2c0 Fixed Cluster gharial tests 2014-07-09 10:15:07 +02:00
Michael Hackstein 3f6e1c3555 Unified gharial error responses with normal API 2014-07-08 10:46:18 +02:00
Michael Hackstein 72a9b7e5aa Added waitForSync support for creation of vertices and edges in gharial 2014-07-07 15:18:35 +02:00
Jan Steemann 96b195a34d added test 2014-07-04 08:06:02 +02:00
Jan Steemann 04ed18be47 recovery 2014-07-03 22:50:22 +02:00
Jan Steemann 470839ffb9 fixed tests 2014-07-03 18:51:40 +02:00
Jan Steemann 6fc0c051d0 added test case 2014-07-03 17:12:25 +02:00
Jan Steemann 2babd2a1d2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-03 12:58:18 +02:00
Jan Steemann d5e4f6762c foxx-directories test 2014-07-03 12:58:02 +02:00
Jan Steemann 599176d1e3 do not delete foxx apps on replay 2014-07-03 11:42:16 +02:00
Michael Hackstein 202deaae85 Fixed issues in gharial module. By default the do not wait for sync http codes are returned. You can now optionally send waitForSync true to all modifying endpoints 2014-07-03 10:53:18 +02:00
Jan Steemann acf6c688b7 fixed typo 2014-07-02 17:04:57 +02:00
Michael Hackstein 7b22c0c2a5 Added a correct 404 return code to gharial when trying to remove a vertex/edge which does not exists. Also added tests for return codes 2014-07-02 15:03:06 +02:00
Max Neunhoeffer e8c9a3997e Name change in Makefile. 2014-07-02 11:40:10 +02:00
Jan Steemann 28965618d1 handle renaming of collections 2014-07-02 10:28:43 +02:00
Jan Steemann 84ef51aaf4 handle properties marker 2014-07-02 09:54:28 +02:00
Jan Steemann ab70cfb9bb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-02 09:31:17 +02:00
Jan Steemann 7fa01da9b4 handle empty logfiles on startup 2014-07-02 09:31:00 +02:00
Michael Hackstein d211b6eacd Fixed general graph spec. Error message is more specfic then expected 2014-07-01 17:08:55 +02:00
Jan Steemann 4cd20bfb7c fixed syncs across multiple files 2014-07-01 13:12:36 +02:00
Jan Steemann d55626c038 xxx 2014-06-30 19:00:36 +02:00
Max Neunhoeffer 48762f3cc2 Add disabled tests.
Disable shell-readonly test on server.
2014-06-30 12:45:10 +02:00