1
0
Fork 0
Commit Graph

8087 Commits

Author SHA1 Message Date
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 6b24da1036 in the middle of refactoring 2015-03-17 09:08:25 +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
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
Michael Hackstein 391065c210 Further bughunting for foxx distribution in cluster case 2015-03-09 14:38:00 +01:00
Michael Hackstein 167f78cac1 The app folder resync will now not write anything to any collection if the calling command was distributed via the cluster 2015-03-09 14:13:02 +01:00
Michael Hackstein 8b544c3aea The coordinators now do only fan out installation process once 2015-03-09 13:18:17 +01:00
Michael Hackstein fc1a868fad Further bughunting for Foxx in cluster 2015-03-09 12:49:29 +01:00
Michael Hackstein 7f072b1adb Fixed JSHint warning for ES6 Object short notation. Not supported too good by jshint right now 2015-03-09 12:07:59 +01:00
Michael Hackstein a820ce4777 Updated JSHint 2015-03-09 12:07:23 +01:00
Michael Hackstein 5e363b3213 Fixed redirect for web interface 2015-03-09 11:42:43 +01:00
Michael Hackstein 65005ecf7e Fixed Parse errorr for cluster implementation of Foxx 2015-03-09 09:56:45 +01:00
Michael Hackstein 9286c6211d Fixed Foxx Download test 2015-03-09 09:55:43 +01:00
Michael Hackstein 189436a106 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-09 09:42:32 +01:00
Michael Hackstein 0513b043fd Fixed wrong download path for faxx apps #1259 2015-03-09 09:42:25 +01:00
Manuel B 09d5dd6960 update MB to MiB
update from MB (1000*1000) to MiB (1024*1024)
https://en.wikipedia.org/wiki/Mebibyte
2015-03-08 06:35:27 +00:00
Frank Celler 98a28ff805 fixed endpoints 2015-03-06 16:42:00 +01:00
Heiko Kernbach 6d418865b3 fixed frontend bug 2015-03-06 15:42:36 +01:00
Michael Hackstein 75ace2b354 First attempt to install Foxx apps on a cluster 2015-03-06 15:36:25 +01:00
Michael Hackstein f2ea8b0068 Added minimal working test apps 2015-03-06 14:23:58 +01:00
Michael Hackstein 9e99ce2f90 Upgrading and replacing Apps using FoxxManager with broken Apps will now maintain the original App instead of deleting everything 2015-03-06 13:16:50 +01:00
Willi Goesgens 2b9a6c681d fix running of jsunity tests in single_server 2015-03-06 10:43:05 +01:00
Willi Goesgens a6e736dedc Relax the timeout for the db to be gone and give the garbage collection more time in one run. 2015-03-06 09:37:19 +01:00
Willi Goesgens ffb8c36610 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-05 15:25:31 +01:00
Willi Goesgens f78cc512fc Fix generation of app path - once more so it doesn't break the dump test. 2015-03-05 15:25:06 +01:00
Michael Hackstein 25d0df4049 Fixed frontend coverage tests and potentially fixed a ghost that from time to time kills Web Interface tests. 2015-03-05 15:18:16 +01:00
Willi Goesgens 9e7c429c0e - make app folder a sub folder of the installation, so we don't get races.
- run the procdump window along with the tested arangod so we can analyse crashes.
2015-03-05 13:45:51 +01:00
Michael Hackstein 3a1559caa6 Added a more informative stacktrace to foxx manager install spec 2015-03-05 11:30:05 +01:00
Michael Hackstein 67626650df The frontend now properly prints the license of an app. 2015-03-05 10:37:07 +01:00
Michael Hackstein 3457e7e147 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-04 15:55:44 +01:00
Michael Hackstein 6c7abc7310 Fixed Frontend tests 2015-03-04 15:55:40 +01:00
Alan Plum f15e710d51 Fixxed Array#each -> Array#every. 2015-03-04 15:45:17 +01:00
Alan Plum a11bede5c9 Timeout all the request tests. 2015-03-04 15:43:56 +01:00
Michael Hackstein 4e20eeab33 Fixed dashboard behaviour in dashboard. #1259 2015-03-04 15:39:37 +01:00
Michael Hackstein 063f498e7f Fixed jslint warning 2015-03-04 15:31:26 +01:00
Michael Hackstein 176f66c74f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-04 15:24:10 +01:00
Michael Hackstein acfaa59ea0 Disabled -Werror flag in v8 for mac build 2015-03-04 15:23:59 +01:00
Michael Hackstein 7f509e2381 Added forgotten file for last commit. 2015-03-04 14:49:28 +01:00
Willi Goesgens 96e45465a8 Add path to errormessage. 2015-03-04 14:40:35 +01:00
Willi Goesgens 26d71b0f75 Fix Error message - filename is enough here. 2015-03-04 14:38:56 +01:00
Michael Hackstein 85aee07023 Fixed switching DBs dropdown. Still to do: Dashboard if authenticated and no _system user. #1259. 2015-03-04 14:21:11 +01:00
Alan Plum f5a5bac855 Fixed dashboard for disableAuthentication. 2015-03-03 18:02:26 +01:00
Alan Plum f0359b8b86 Added grunt script to aardvark package.json. 2015-03-03 18:01:31 +01:00
Michael Hackstein 03052263e9 Added a download App button for non System foxx applications 2015-03-03 16:20:39 +01:00
Michael Hackstein 2a2ecc220e Fixed tests 2015-03-03 14:49:34 +01:00
Michael Hackstein 00a6d31403 Fixed name of a spec file referenced in file list for karma 2015-03-03 14:37:50 +01:00
Michael Hackstein 691a1f75e6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-03 14:18:40 +01:00
Michael Hackstein eca23b3814 Added an upgrade foxx dialog to the WebInterface 2015-03-03 14:18:35 +01:00
Willi Goesgens d2afb6bc11 remove debug output 2015-03-03 11:02:05 +01:00
Willi Goesgens 677b35fb05 Fix typo. 2015-03-03 10:29:38 +01:00
Willi Goesgens f4513eed35 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-03 09:24:17 +01:00
Willi Goesgens f152d5c133 Handle jasmine the way that it only produces success/fail 2015-03-03 09:23:38 +01:00
Jan Steemann 2ebf599736 added derived file 2015-03-02 19:40:35 +01:00
Willi Goesgens 24451f3709 Testsuite:
- add possibility to skip ruby https tests
  - try to send test results from arangosh to server via a temporary file; fallback to rc.
2015-03-02 19:09:28 +01:00
Willi Goesgens 47d39bc005 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-02 14:56:01 +01:00
Willi Goesgens 80cc3a7c3e Add stacktrace from the exception to the output; the jasmine provided stacktrace is pretty useless here. 2015-03-02 14:55:08 +01:00
Michael Hackstein 0d09cf0759 Fixed SCSSLint 2015-03-02 14:30:30 +01:00
Michael Hackstein 8fc3fd2908 The webinterface will now print the path to a foxx in development mode 2015-03-02 14:23:03 +01:00
gschwab 285be2a7d3 fixed username bug 2015-02-27 15:23:43 +01:00
Heiko Kernbach 23a0e17018 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-02-26 14:18:38 +01:00
Heiko Kernbach 467cd60b07 added missing select2 retina picture 2015-02-26 14:18:28 +01:00
Michael Hackstein bb59c0380e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-02-26 13:12:22 +01:00
Michael Hackstein f0ab702b3f Proper description in the package.json. 2015-02-26 13:12:18 +01:00
Willi Goesgens 5e3a96d0d4 relax cluster timeouts for valgrind too. 2015-02-26 11:21:21 +01:00
Willi Goesgens 2619529f63 Relax cluster timeout when compiled with -DCOVERAGE 2015-02-26 11:01:53 +01:00
Willi Goesgens 8651e88d15 More information on fox manager errors. 2015-02-26 10:35:50 +01:00
Jan Steemann e8053b5fa1 added generated files 2015-02-25 11:01:26 +01:00
Jan Steemann 93750ade9f fixed test 2015-02-25 11:00:56 +01:00
Michael Hackstein c5adf7b089 Fixed tests for foxx on multiple databases. And added generated files 2015-02-25 10:44:15 +01:00
Michael Hackstein 9dc27fa7db Fixed test to install Apps from Store. sessionapp requires oauth2 to be installed at a special location 2015-02-25 10:26:53 +01:00
gschwab b00ab19f11 fixed cerberus path 2015-02-25 09:28:42 +01:00
Michael Hackstein df046a8091 added tests for foxx-controller extensions
Conflicts:
	js/server/tests/shell-foxx.js
2015-02-24 17:37:05 +01:00
Michael Hackstein 8fb5c548b6 Added controller extensions for foxx apps. Allows to define additional functions on request context 2015-02-24 17:36:31 +01:00
Michael Hackstein c3df4f8ec3 Massively improved foxx install stack traces. They now contain more information about your app 2015-02-24 17:36:30 +01:00
Michael Hackstein 5b6e9efde8 Fixed a bug disallowing the webinterface to install from github 2015-02-24 17:36:30 +01:00
Frank Celler 4f8ea3a208 Merge remote-tracking branch 'origin/2.5' into devel
Conflicts:
	CHANGELOG
	arangod/RestServer/arangod.cpp
	js/apps/system/_admin/aardvark/APP/package.json
2015-02-24 16:10:11 +01:00
Jan Steemann 6ce1f2892e install fix for Foxx apps 2015-02-24 13:51:41 +01:00
Heiko Kernbach 2674b86e9f grunt now much faster 2015-02-24 13:00:05 +01:00
Willi Goesgens 3baf9b8270 Use central facility to remove temporary file. 2015-02-24 12:53:56 +01:00
Willi Goesgens b68924a979 Use central facility to remove temporary file. 2015-02-24 11:49:23 +01:00