1
0
Fork 0
Commit Graph

11913 Commits

Author SHA1 Message Date
Jan Steemann 16f1fc5a93 added --force option, allow using incompatible server version 2014-03-27 14:12:09 +01:00
Jan Steemann 9724cfec64 fixed failing test 2014-03-27 13:12:45 +01:00
Jan Steemann e2f1d0dfb6 fixed issues in arango-dfdb 2014-03-27 12:29:32 +01:00
scottashton e8904d5d93 fixed jslint 2014-03-27 12:15:13 +01:00
scottashton 22400966b2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-27 11:06:47 +01:00
scottashton fd2253076e testing collections and models finished, coverage = 100% 2014-03-27 11:06:42 +01:00
Jan Steemann 8f81f3f8f6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-27 09:45:35 +01:00
Jan Steemann d48a2507fc fixed wrong return type 2014-03-27 09:45:25 +01:00
scottashton 48448a6039 fixed bug in manifest 2014-03-27 09:43:42 +01:00
Jan Steemann c789c16b82 compilers shouldn't complain about that 2014-03-27 09:43:01 +01:00
Jan Steemann 5b171e5cf5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-27 09:28:12 +01:00
Jan Steemann 7ab5a11ad0 fixed small memleak in linenoise editor 2014-03-27 09:27:53 +01:00
Jan Steemann cf0ea1b615 fixed deallocation of edges 2014-03-27 09:27:13 +01:00
gschwab 23f6ece5d4 fixed wrong filename O.o 2014-03-27 09:12:42 +01:00
gschwab c81b319506 fixed line too long - jslint 2014-03-27 09:12:14 +01:00
gschwab 4fa1d8e565 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-27 08:55:12 +01:00
Frank Celler 456d089deb generateSwagger can now also parse MD files
Conflicts:
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/traversal.json
	js/apps/system/aardvark/api-docs/version.json
2014-03-26 23:09:07 +01:00
scottashton 81aaa09949 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-26 17:43:37 +01:00
scottashton 48003a69e9 cluster tests 2014-03-26 17:43:20 +01:00
gschwab 17aab96216 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-26 17:20:53 +01:00
gschwab eb5902b139 fixed cluster restart and cluster dashboard refresh for authentication 2014-03-26 17:20:44 +01:00
Jan Steemann 08184b6951 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-26 17:17:04 +01:00
Jan Steemann 4ddaa74f74 logfile manager 2014-03-26 17:16:49 +01:00
Jan Steemann 25f81195a9 logfile manager 2014-03-26 16:00:24 +01:00
gschwab ebabd76417 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-26 15:09:45 +01:00
gschwab 08878cb42c removed unnecessary authorization handon 2014-03-26 15:09:38 +01:00
scottashton baccb90461 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-26 14:44:19 +01:00
scottashton 2c1981ea1b finished frontend/collections tests 2014-03-26 14:44:06 +01:00
gschwab b4a9026237 omit www authenticate 2014-03-26 11:38:35 +01:00
Jan Steemann cf22660e85 fixed memleak 2014-03-26 10:43:23 +01:00
Max Neunhoeffer 2336b9f310 Try variants of TRI_IncModU64 and add TRI_DecModU64. 2014-03-26 09:15:57 +01:00
Jan Steemann cbd2d92b28 removed unneeded file 2014-03-25 19:14:45 +01:00
Jan Steemann b4a78b55db fixed failing test 2014-03-25 18:48:53 +01:00
Jan Steemann 05d8db9430 make ArangoDB not send back a `WWW-Authenticate` header
make ArangoDB not send back a `WWW-Authenticate` header to a client in case the
client sends the `X-Requested-With` header with a value of `XMLHttpRequest`

This is done to prevent browsers from showing their built-in HTTP authentication
dialog for AJAX requests that require authentication.
ArangoDB will still return an HTTP 401 (Unauthorized) if the request doesn't
contain valid credentials, but it will omit the `WWW-Authenticate` header,
allowing clients to bypass the browser's authentication dialog.
2014-03-25 18:48:15 +01:00
Jan Steemann 1ce382ffb3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-25 18:21:42 +01:00
Jan Steemann 92f87c1421 updated logfile manager 2014-03-25 18:21:31 +01:00
scottashton ca5ccf9a39 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-25 17:52:22 +01:00
scottashton 78d7a2c18a more tests 2014-03-25 17:52:14 +01:00
gschwab d7dbb38587 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-25 17:16:44 +01:00
gschwab 3ef97931f2 karma test for some more models 2014-03-25 17:16:34 +01:00
scottashton 213c61d104 merged conflict 2014-03-25 16:08:17 +01:00
scottashton 1b5e31b9d7 starting collections tests 2014-03-25 16:06:37 +01:00
Frank Celler d34832bbcf added changePassword attribute for users 2014-03-25 11:40:13 +01:00
Jan Steemann cc533c5df5 fixed segfault 2014-03-25 11:16:51 +01:00
Jan Steemann 9f37d22440 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-25 10:50:51 +01:00
Jan Steemann f758690ddc fixed memleak 2014-03-25 10:50:38 +01:00
gschwab 444a84157b karma test for some models, small refactoring (renaming) of ../collections/arangoStatisticsDescriptionCollection.js 2014-03-25 10:20:09 +01:00
Jan Steemann d0189d1f9b remove unnecessary syscall 2014-03-25 00:47:43 +01:00
Heiko Kernbach 24df691dd0 files now in files.json 2014-03-24 17:54:44 +01:00
scottashton 9e8cc5613c added testSpec for arangoCollections 2014-03-24 17:39:08 +01:00