1
0
Fork 0
Commit Graph

7987 Commits

Author SHA1 Message Date
Jan Steemann bdae982aa0 refuse to start the server when collection files or parameter.json files are not readable
Conflicts:
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
2015-03-18 17:44:06 +01:00
Jan Steemann a062280783 added test for empty datafiles 2015-03-18 17:37:28 +01:00
Willi Goesgens a95a496920 Add (unix) implementation for chmod 2015-03-18 13:41:26 +01:00
Jan Steemann 8aa9ef1f9c added derived file 2015-03-17 18:29:03 +01:00
Jan Steemann f04f1ef4cb fixed inefficiencies in `remove` method of general-graph module
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
2015-03-17 18:28:26 +01:00
Jan Steemann 73b9b1c217 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-03-17 18:24:06 +01:00
Jan Steemann 6d37c96099 fixed spelling 2015-03-17 18:23:42 +01:00
Michael Hackstein 6d389c7bca Fixed a bug where an app installed from zip file is deleted by foxx manager. 2015-03-17 17:02:17 +01:00
Jan Steemann 35fdc9a9c0 attempt to fix test 2015-03-17 08:30:07 +01:00
Jan Steemann 34e101725f fixed assertion 2015-03-16 17:28:54 +01:00
Michael Hackstein e942f6252d Merge branch 'devel' of github.com:arangodb/arangodb into devel
Conflicts:
	js/apps/system/_admin/aardvark/APP/test/specs/views/documentViewSpec.js
2015-03-16 15:04:37 +01:00
Michael Hackstein 371702ceca Proved Document view and its tests. Adapted router along-side. This shall catch the bug that it is not possible to store valid json containing colons 2015-03-16 15:01:26 +01:00
Heiko Kernbach 02923a91ee fixed spec 2015-03-16 11:28:19 +01:00
Heiko Kernbach f16aa58852 fixed docs save bug in front-end 2015-03-16 11:18:51 +01:00
Michael Hackstein 3c7aaf204c Made the foxx manager install spec more robust and added a test app containing 'app' as sub folder 2015-03-16 11:13:25 +01:00
Jan Steemann f59dca83d4 fixed warning 2015-03-16 10:40:55 +01:00
Jan Steemann e214a4d472 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-03-16 10:38:20 +01:00
Jan Steemann a336ac2ff5 make Foxx queues database-specific 2015-03-16 10:38:10 +01:00
Michael Hackstein bd2dde17da Fixed unittest for foxx. It still compated a generated token with the name of the parameter 2015-03-16 10:37:35 +01:00
Michael Hackstein 4543668a07 Fixed installing of Apps containing an internal app folder 2015-03-16 10:27:32 +01:00
Jan Steemann ce7b75064a fixed test 2015-03-14 20:49:35 +01:00
Jan Steemann d91cc3e9b3 added more tests 2015-03-14 20:49:22 +01:00
Jan Steemann 940968bd96 when specifying the same dispatcher IP address multiple times, try to create non-overlapping port ranges 2015-03-13 18:26:50 +01:00
Michael Hackstein 0dc6be351c Fixed tests for non overwriting version of swagger documentation 2015-03-13 14:16:11 +01:00
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