1
0
Fork 0
Commit Graph

7963 Commits

Author SHA1 Message Date
Jan Steemann ce0a543d25 added flag for disabling query tracking `--database.disable-query-tracking`
Conflicts:
	arangod/RestServer/ArangoServer.cpp

Conflicts:
	Documentation/Books/Users/ConfigureArango/Arangod.mdpp
	arangod/RestServer/ArangoServer.cpp
2015-03-13 13:51:23 +01:00
Michael Hackstein 2b59c4aaf8 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-13 11:26:07 +01:00
Michael Hackstein 7f7ae079f7 Fixxed an issue with the generated swagger documentation. Where it was not possible to have two body parameters with the same name but different content. Only one of them was used in the Documentation the other one was overwritten. Fixes and Closes #1271. 2015-03-13 11:26:02 +01:00
Heiko Kernbach a392fc6b0e added new query related files to karma tests 2015-03-13 10:34:38 +01:00
Michael Hackstein e314a6097c Fixed link to download API documentatioN 2015-03-13 09:44:34 +01:00
Michael Hackstein dec8a59073 Removed unused code 2015-03-13 09:44:02 +01:00
Michael Hackstein c1f463cdbb Fixed the upgrade script to maintain configuration of Apps 2015-03-13 08:55:38 +01:00
Michael Hackstein 63ef6ba1aa Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-12 17:48:01 +01:00
Michael Hackstein c3b350054b Fixed configuration of Foxx apps. It was not fully working in foxx manager 2015-03-12 17:47:56 +01:00
Heiko Kernbach 8a1e30b9d0 included 44fb5a554f1bbbf985724dbea92ed382f61a06be 2015-03-12 17:32:31 +01:00
Michael Hackstein 2f5818f5c3 The old configuration of an app is now maintained while issuing upgrade. It is thrown away while issuing replace 2015-03-12 17:26:39 +01:00
Heiko Kernbach 449e3f1a18 added query management view, kill running queries and show slow queries 2015-03-12 16:42:20 +01:00
Jan Steemann 29611a511f issue #1241: added configure option `allowNull` for visitor 2015-03-12 16:28:52 +01:00
Michael Hackstein 6e893826dc Further tests for api query analysis 2015-03-12 16:05:46 +01:00
Jan Steemann f035ea1c3b kill AQL queries
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
2015-03-12 15:00:14 +01:00
Jan Steemann e67c82c8a4 added JavaScript APIs for query tracking 2015-03-12 13:02:14 +01:00
Jan Steemann b98c4c2d5b added documentation, fixed potential UTF-8 truncation 2015-03-12 13:02:13 +01:00
Jan Steemann 64d77cbe24 added query tracking feature 2015-03-12 13:02:13 +01:00
Michael Hackstein 08933b3c93 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-11 17:50:02 +01:00
Michael Hackstein 5be310fc21 It is now possible to install Apps that are invalid if they are not configured correctly. If they get broken by configuration they are still routed and will display an errorpage. They also display an errorpage until configured. 2015-03-11 17:49:42 +01:00
Alan Plum 5b277891a6 Fixed fixture. 2015-03-11 16:58:39 +01:00
Alan Plum 644a2dc415 Added fixtures for Foxx config errors. 2015-03-11 16:57:04 +01:00
Willi Goesgens 019a2923fa Argparse:
- implement correct toArgv conversion for extraargs and valgrindargs.
2015-03-11 15:05:06 +01:00
Willi Goesgens a9d9b56992 Argsparser:
- fix parsing of sub-option arrays
  - add possibibility to serialize to '--longopt=value' instead of '--longopt' 'value'
2015-03-11 15:04:01 +01:00
Willi Goesgens e092e9d8fb Add option to skip loganalysis; if run in trace mode, the logs can become huge. 2015-03-11 14:11:49 +01:00
Michael Hackstein 0a8e15749a Fixed scss-lint 2015-03-11 13:47:02 +01:00
Jan Steemann a185409de0 fixed warning 2015-03-11 12:55:47 +01:00
Jan Steemann c4f17bb244 issue #1265: arangod crashed with SIGSEGV 2015-03-11 12:19:34 +01:00
Jan Steemann 37bb6d6732 issue #1241: fixed passing `data` attribute into GRAPH_NEIGHBORS() function 2015-03-11 10:22:27 +01:00
Michael Hackstein 6ff88839e9 Removed unnecessary throw 2015-03-10 16:03:57 +01:00
Michael Hackstein 3a8fee211f The Foxx Comment preprocessor now trimes strings properly 2015-03-10 15:22:16 +01:00
Michael Hackstein a2e1e70d0f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-10 15:04:12 +01:00
Michael Hackstein aafd1feb9f Activated comments in Foxx Test 2015-03-10 15:04:07 +01:00
Michael Hackstein a3950cf8ba Improved testing js in combination with Jasmine 2015-03-10 15:03:50 +01:00
Jan Steemann e368044036 fixed "line too long" 2015-03-10 14:44:31 +01:00
Jan Steemann 349683fd38 fixed JSDoc comments parsing 2015-03-10 14:38:04 +01:00
gschwab 7431ca0e86 fixed encoding bug 2015-03-10 14:08:15 +01:00
Michael Hackstein d0a43227fb Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-10 14:00:43 +01:00
Michael Hackstein ba266d4a0f Added a test for crazy comments in foxx apps. Deactivated right now due to inconsitencies in testing framework 2015-03-10 13:53:14 +01:00
Jan Steemann d73ee0fbfe fix comment parsing in Foxx controllers 2015-03-10 12:08:37 +01:00
Heiko Kernbach 96ec4f3d7d larger modals for graph viewer 2015-03-10 11:43:55 +01:00
Michael Hackstein 21815a299d Added sharedlib 2015-03-10 11:39:23 +01:00
Michael Hackstein bb9d8d18a1 Fixed broken App path in web interface 2015-03-10 11:32:16 +01:00
Michael Hackstein 2713df2aef Fixed frontend test 2015-03-10 10:40:03 +01:00
Michael Hackstein 82d58ddb19 Changed default document of Aardvark app 2015-03-10 10:38:27 +01:00
Michael Hackstein f70b8c66af Fixed the Web interface reachability test 2015-03-10 10:32:34 +01:00
Michael Hackstein d4848d3a42 Made foxx ready for clustering 2015-03-09 19:17:50 +01:00
Heiko Kernbach aaf81b08c7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-09 15:40:34 +01:00
Heiko Kernbach 2cb2f0b707 json editor now accepts keys without quotation marks 2015-03-09 15:40:26 +01:00
Michael Hackstein 6adbab0bf6 Changed internal app validation path to be absolute and not relative to the user defined js app path 2015-03-09 14:46:00 +01:00