1
0
Fork 0
Commit Graph

475 Commits

Author SHA1 Message Date
Heiko Kernbach 638021c0b0 scss-lint 2015-05-19 12:59:52 +02:00
Heiko Kernbach 90cd769c05 scss login 2015-05-19 12:02:55 +02:00
Heiko Kernbach 43dc1d5a9e added query execution time 2015-05-19 10:46:41 +02:00
Heiko Kernbach 3b2784d5f4 hide demo tab is data is not available 2015-05-19 10:24:54 +02:00
Heiko Kernbach 287cdb8b15 added explain query feature in frontend 2015-05-19 09:59:20 +02:00
Heiko Kernbach 8659114185 prep for explainer, renamed some interface buttons in query view 2015-05-18 18:48:54 +02:00
Heiko Kernbach e307505753 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-05-18 12:29:13 +02:00
Heiko Kernbach b0a1dc3338 added graphView to watchlist 2015-05-18 12:29:04 +02:00
Jan Steemann cc98799a97 whitespace 2015-05-18 12:18:08 +02:00
Max Neunhoeffer a3923c9eaf Fix configurability of indexBuckets. 2015-05-18 01:39:54 -07:00
Frank Celler 9c311c33af fixed wrong result of versions 2015-05-12 17:23:16 +02:00
Jan Steemann 833978f9ae added example to documentation 2015-05-12 10:18:54 +02:00
Heiko Kernbach f57964f8b2 removed unnecessary location hash for enabling reloading graph management view 2015-05-11 18:00:04 +02:00
Jan Steemann 40067e6c96 added documents() 2015-05-08 17:11:44 +02:00
Alan Plum 4d32eb7367 API: Allow passing options to scripts. 2015-05-07 23:10:44 +02:00
Alan Plum 32944fdf34 Add teardown option to aardvark uninstall app. 2015-05-07 22:41:42 +02:00
Heiko Kernbach 903d67fe27 login screen style changes 2015-05-07 15:54:58 +02:00
Alan Plum d4c7613e4c Fixed tutorial init causing basic auth popup. 2015-05-07 15:54:57 +02:00
Alan Plum 171e776059 Linting. 2015-05-07 15:54:57 +02:00
Alan Plum e709308182 Implemented disable-authentication check. 2015-05-07 15:54:57 +02:00
Alan Plum 2706afd229 Renamed session cookie. 2015-05-07 15:54:57 +02:00
Alan Plum a0286909b6 Postpone XHR init until logged in. 2015-05-07 15:54:57 +02:00
Alan Plum f8afe04922 Logs should checkUser, logout shouldn't have an href. 2015-05-07 15:54:57 +02:00
Alan Plum 94ea5123eb Partially implemented login. 2015-05-07 15:54:57 +02:00
Alan Plum 3977a42285 Replace Aardvark Foxx API docs generator with Swagger 2.0. 2015-05-07 14:28:58 +02:00
Alan Plum 0871620b77 Added docs route to aardvark. 2015-05-07 14:28:58 +02:00
Alan Plum 71c2e06649 Linting. 2015-05-06 17:33:05 +02:00
Alan Plum e6493d7210 Improved Foxx config handling. 2015-05-06 16:27:44 +02:00
Jan Steemann 46cdf686c4 documentation update 2015-05-05 18:23:07 +02:00
Jan Steemann c677ea8b88 added tests for collection.lookupByKeys() and collection.removeByKeys() 2015-05-05 17:57:33 +02:00
Willi Goesgens fe2d5ee0a2 Autogenerate examples. 2015-05-05 10:14:54 +02:00
Alan Plum 4f17dfe10e Added error 1237: collection type mismatch. 2015-05-03 22:55:56 +02:00
Jan Steemann b0924956f8 allow `@` character in document keys, too. 2015-04-30 21:28:26 +02:00
Jan Steemann a8855908f6 less copying 2015-04-30 18:36:17 +02:00
Alan Plum bf7c66cfa4 Rebuilt aardvark. 2015-04-29 16:05:00 +02:00
Alan Plum fa24c0d229 Implemented dependencies configuring. 2015-04-29 15:59:51 +02:00
Alan Plum e4b872534e Rebuilt aardvark. 2015-04-29 15:59:51 +02:00
Alan Plum c16388024f Indicate app problems more clearly. 2015-04-29 15:59:20 +02:00
Alan Plum 18a11a72d4 More partial implementating Foxx deps in GUI. 2015-04-29 15:59:20 +02:00
Alan Plum 00f36b07a5 Expose deps on Aardvark API and add cfg and deps to listJson. 2015-04-29 15:57:58 +02:00
Alan Plum 89216506b8 Don't try to output swagger docs for fake app routes. 2015-04-29 15:57:58 +02:00
Michael Hackstein a045cce27a Improved line width and time is always tp precission 3. 2015-04-27 11:58:33 -07:00
Michael Hackstein 997248d6d0 Added print of Top 1 list 2015-04-27 11:48:15 -07:00
Michael Hackstein efac24f464 Fixed size for airports 2015-04-27 11:42:13 -07:00
Michael Hackstein 86a1bde674 Printed the query information for shortest path 2015-04-27 11:30:38 -07:00
Michael Hackstein 828bc0000d Added shortest path to the demo interface 2015-04-27 09:30:20 -07:00
Jan Steemann 2fe04b4c5b added generated files 2015-04-27 17:44:00 +02:00
Michael Hackstein 9c40c69c72 Final fixed for YC demo 2015-04-26 22:15:53 -07:00
Michael Hackstein 90dbd678bb Added generated files 2015-04-26 17:33:21 -07:00
Michael Hackstein 346048cb4d Added shortest path call in Demo and improved style for flight distribution 2015-04-26 17:32:58 -07:00
Claudius Weinberger 67b348c7d6 Added definition for demo overlay window 2015-04-26 16:58:20 -07:00
Michael Hackstein e0018d6895 Added fixes for the flights demo 2015-04-26 15:08:37 -07:00
Heiko Kernbach 9d6e5d243f appstore css change, removed demo css import (because file is missing), runned grunt task, added grunt changes 2015-04-24 11:26:05 +02:00
Jan Steemann 974b656c1b allow overriding COLLECT method 2015-04-21 14:45:22 +02:00
Heiko Kernbach 0f4644e91c first version for airport sizes bases on their count 2015-04-20 22:27:06 +02:00
Heiko Kernbach f7dc457292 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-04-20 18:36:55 +02:00
Heiko Kernbach 02dfdc372a demoview 2015-04-20 18:36:47 +02:00
Jan Steemann f0fdf3aacc fixed tests 2015-04-20 18:15:33 +02:00
Heiko Kernbach 7529136f86 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-04-20 17:58:22 +02:00
Heiko Kernbach 54344de7ae cleanup, added some functions 2015-04-20 17:58:14 +02:00
Jan Steemann ad2e80d334 fixed graph examples 2015-04-20 17:29:24 +02:00
Heiko Kernbach 3153f642f5 added gruntfile changes 2015-04-20 15:15:52 +02:00
Heiko Kernbach 154daee994 added _key attribute to index 2015-04-20 15:14:55 +02:00
Heiko Kernbach a34e27a7b3 demo view: added fulltext search for airports 2015-04-20 15:11:26 +02:00
Heiko Kernbach f7ef0e4317 added index for fulltext search 2015-04-20 14:49:44 +02:00
Heiko Kernbach 3dd4ec02fb jslint 2015-04-20 13:52:48 +02:00
Heiko Kernbach 933a19130a changed some styling 2015-04-20 13:29:34 +02:00
Heiko Kernbach 8fca525adf added function to change size and color of existing airports 2015-04-20 12:20:49 +02:00
Claudius Weinberger a27953cf3b Design modifications Demo 2015-04-19 23:37:39 -07:00
Claudius Weinberger 241876b06c Design modifications Demo 2015-04-19 13:53:09 -07:00
Claudius Weinberger 16ac988ad3 Design modifications Demo 2015-04-19 13:51:16 -07:00
Heiko Kernbach c01e828dc9 added click event function for map object 2015-04-19 22:48:23 +02:00
Heiko Kernbach 604f859f27 some refactoring 2015-04-19 21:23:38 +02:00
Heiko Kernbach 237f997547 typo 2015-04-19 13:32:56 +02:00
Heiko Kernbach 34bdfb86d7 multiple flightlines, remove lines, code cleanup 2015-04-19 13:27:55 +02:00
Heiko Kernbach b33f963667 fixed typo 2015-04-19 12:12:42 +02:00
Claudius Weinberger 5f5b48bd0f Design modifications Demo 2015-04-19 02:10:23 -07:00
Claudius Weinberger b717045a21 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2015-04-18 23:38:54 -07:00
Claudius Weinberger 2d534ba840 Change airport mouseover 2015-04-18 23:36:08 -07:00
Michael Hackstein 132ca70f4c Apply fixes to demo 2015-04-18 23:31:43 -07:00
Michael Hackstein f19c9b1593 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-04-18 23:18:56 -07:00
Michael Hackstein 546393937e Added a function to get all flights from SFO 2015-04-18 23:17:15 -07:00
Claudius Weinberger cf512ba437 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2015-04-18 23:16:14 -07:00
Claudius Weinberger fe0f273cfd Design modification Demo 2015-04-18 23:13:12 -07:00
Michael Hackstein d6e3bb6790 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-04-18 21:15:47 -07:00
Michael Hackstein 3c8ad99245 Enforced a timeout for the web interface version check 2015-04-18 21:15:22 -07:00
Alan Plum 89ef7605fe Linting. 2015-04-18 12:41:15 +02:00
Michael Hackstein 13491efc04 Improved zoomlevel in demo view 2015-04-17 23:25:05 -07:00
Michael Hackstein 37a51856d4 Added function to draw a flight 2015-04-17 22:11:44 -07:00
Michael Hackstein ae4f58f81e Only request Lon,Lat and _key for Aiports and add them on the Map. Drawing lines aint working yet 2015-04-17 21:37:15 -07:00
Michael Hackstein e3180cdad5 The demo view now zooms into the US. Only flights from there are available 2015-04-17 16:53:56 -07:00
Heiko Kernbach 6fa0f64719 dummy test date 2015-04-17 20:24:56 +02:00
Heiko Kernbach 3052d20e03 render demo view 2015-04-17 19:35:44 +02:00
Heiko Kernbach 5e29529729 initial commit and prep for demonstration view 2015-04-17 19:11:22 +02:00
Jan Steemann 9f2643acaa show type of collect method in explain 2015-04-16 16:29:36 +02:00
Jan Steemann 61c42e0ee2 fix relative URL redirects in internal.download() 2015-04-15 14:00:35 +02:00
Jan Steemann 7e0597f215 fixed cursor output in browser shell 2015-04-15 12:00:35 +02:00
Alan Plum 3a15e749d1 Automatically show/hide scripts dropdown. 2015-04-14 19:19:30 +02:00
Alan Plum c6b72d01e1 Rebuilt aardvark again. Removed indent on test GUI stacktraces. 2015-04-14 18:54:24 +02:00
Alan Plum 2f3bf9ed82 Rebuilt aardvark. 2015-04-14 18:44:48 +02:00
Alan Plum 7c4a3daeea Implemented aardvark test GUI. 2015-04-14 18:44:37 +02:00
Alan Plum decbc6dcea Fully implemented tests API. 2015-04-14 13:39:06 +02:00
Jan Steemann e8186a6ded issue #1308: ArangoDB Foxx Install via ZIP Frontend 2015-04-13 13:41:05 +02:00
Alan Plum 5deadef133 appCollection what? 2015-04-09 22:49:08 +02:00
Alan Plum 69e63c2c64 Strict mode all the things. 2015-04-09 00:22:05 +02:00
Alan Plum 45ff33b404 More strictness. 2015-04-08 16:18:11 +02:00
Alan Plum 83b1b4596a Added module loader errors. 2015-04-08 13:12:43 +02:00
Alan Plum e4a2e5ddde Rebuilt aardvark. 2015-04-08 01:55:13 +02:00
Alan Plum f47c4a4572 Allow running tests. 2015-04-07 19:58:24 +02:00
Jan Steemann 748107b291 changed behavior of `db._query()` in the ArangoShell:
if the command's result is printed in the shell, the first 10 results will be printed. Previously
only a basic description of the underlying query result cursor was printed. Additionally, if the
cursor result contains more than 10 results, the cursor is assigned to a global variable `more`,
which can be used to iterate over the cursor result.

Example:

    arangosh [_system]> db._query("FOR i IN 1..15 RETURN i")
    [object ArangoQueryCursor, count: 15, hasMore: true]

    [
      1,
      2,
      3,
      4,
      5,
      6,
      7,
      8,
      9,
      10
    ]

    type 'more' to show more documents

    arangosh [_system]> more
    [object ArangoQueryCursor, count: 15, hasMore: false]

    [
      11,
      12,
      13,
      14,
      15
    ]
2015-04-04 19:42:55 +02:00
Jan Steemann bed9f44873 added missing files for web interface 2015-04-03 15:01:12 +02:00
Jan Steemann 37e0233d10 Revert "added missing files for JSH"
This reverts commit 99b80dd1e338ec122fea54e6af604f2310f1e080.
2015-04-03 14:57:52 +02:00
Jan Steemann 8b132ad60f added missing files for JSH 2015-04-03 14:57:12 +02:00
Alan Plum c23390360b Unbreak the build. 2015-04-02 01:49:00 +02:00
Alan Plum 8ffd5ddd1c Allow running arbitrary Foxx scripts. 2015-04-02 00:16:23 +02:00
Michael Hackstein 3c79b54330 Merge branch 'devel' of github.com:arangodb/arangodb into gos 2015-04-01 13:38:29 +02:00
Michael Hackstein e2fd4cdd65 Further improvements of graph queries. All queries should now be noticably faster. 2015-04-01 13:25:25 +02:00
Jan Steemann 33de89915c make graph viewer issue less expensive queries 2015-04-01 11:40:38 +02:00
Jan Steemann 3ddf23d093 hand-moved changes from other branch 2015-03-30 12:30:45 +02:00
Alan Plum b1822be3ad Fixed Aardvark PATCH configuration. 2015-03-25 17:38:50 +01:00
Jan Steemann 7ec3a18e04 added internal.options() 2015-03-25 17:08:29 +01:00
Jan Steemann 479a66c441 added generated file 2015-03-25 08:58:02 +01:00
Jan Steemann 7d5cc17d98 added tests 2015-03-23 22:28:26 +01:00
Jan Steemann 3b6dfc868e Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification 2015-03-20 23:23:13 +01:00
Jan Steemann d63f47e840 added possibility to kill JS traversals 2015-03-20 23:05:41 +01:00
Jan Steemann 8e48f98045 Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification
Conflicts:
	arangod/Aql/Collection.cpp
	arangod/Aql/ExecutionBlock.cpp
2015-03-20 21:54:39 +01:00
Jan Steemann 8004a7be02 added derived file 2015-03-20 12:07:48 +01:00
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 8aa9ef1f9c added derived file 2015-03-17 18:29:03 +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
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
Heiko Kernbach 8a1e30b9d0 included 44fb5a554f1bbbf985724dbea92ed382f61a06be 2015-03-12 17:32:31 +01:00
Heiko Kernbach 449e3f1a18 added query management view, kill running queries and show slow queries 2015-03-12 16:42:20 +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
Michael Hackstein 0a8e15749a Fixed scss-lint 2015-03-11 13:47:02 +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 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 2cb2f0b707 json editor now accepts keys without quotation marks 2015-03-09 15:40:26 +01:00
Michael Hackstein 5e363b3213 Fixed redirect for web interface 2015-03-09 11:42:43 +01:00
Michael Hackstein 9286c6211d Fixed Foxx Download test 2015-03-09 09:55:43 +01:00
Michael Hackstein 0513b043fd Fixed wrong download path for faxx apps #1259 2015-03-09 09:42:25 +01:00
Heiko Kernbach 6d418865b3 fixed frontend bug 2015-03-06 15:42:36 +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
Michael Hackstein 6c7abc7310 Fixed Frontend tests 2015-03-04 15:55:40 +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 7f509e2381 Added forgotten file for last commit. 2015-03-04 14:49:28 +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
Jan Steemann 2ebf599736 added derived file 2015-03-02 19:40:35 +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
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 f0ab702b3f Proper description in the package.json. 2015-02-26 13:12:18 +01:00
Jan Steemann e8053b5fa1 added generated files 2015-02-25 11:01:26 +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
Heiko Kernbach 2674b86e9f grunt now much faster 2015-02-24 13:00:05 +01:00
Michael Hackstein 4d7f358e9e Added a devel task and removed watch form the default task of Grunt 2015-02-23 14:50:45 +01:00
Michael Hackstein 27253fde9c Added generated files in WebInterface 2015-02-23 14:50:21 +01:00
Michael Hackstein 4727a44b18 Typo fix in test output 2015-02-23 14:50:15 +01:00
Michael Hackstein 5dec680974 Added a test for the App install process, to avoid installing apps using the AppStore without giving a mountpoint. That caused undefined:undefined as an error message 2015-02-23 14:50:09 +01:00
Michael Hackstein c4d8e9edc0 Added newest versions of all libs to package.json 2015-02-23 14:50:02 +01:00
Michael Hackstein 683ae15ba5 Node modules in aardvark are contained in package.json. They can be installed locally if required by issuing npm install in APP folder 2015-02-23 14:49:22 +01:00
Michael Hackstein 9b702a8a9e Fixed query view spec 2015-02-23 14:49:14 +01:00
Michael Hackstein 271eb3cdeb Removed obsolete test files 2015-02-23 14:49:05 +01:00
Jan Steemann 8b76d3bf91 fixed repository URL 2015-02-23 11:20:29 +01:00
Frank Celler c3f64e6a25 release version 2.5.0-beta1 2015-02-23 10:47:30 +01:00
Michael Hackstein 0a0eec0cdb Added a devel task and removed watch form the default task of Grunt 2015-02-23 10:29:16 +01:00
Michael Hackstein 3ec41dbf26 Added generated files in WebInterface 2015-02-22 21:23:03 +01:00
Michael Hackstein 41b91043ae Typo fix in test output 2015-02-22 21:22:08 +01:00
Michael Hackstein 30fa8ef2d1 Added a test for the App install process, to avoid installing apps using the AppStore without giving a mountpoint. That caused undefined:undefined as an error message 2015-02-22 21:21:29 +01:00
Michael Hackstein ab5a5d643b Added newest versions of all libs to package.json 2015-02-22 21:20:17 +01:00
Michael Hackstein 21cfcb9b74 Node modules in aardvark are contained in package.json. They can be installed locally if required by issuing npm install in APP folder 2015-02-22 21:19:57 +01:00
Michael Hackstein 3f02e8829a Fixed query view spec 2015-02-21 15:26:09 +01:00
Michael Hackstein 72afc08ddb Removed obsolete test files 2015-02-21 15:24:04 +01:00
Frank Celler daadd697eb release version 2.5.0-alpha8 2015-02-20 12:59:39 +01:00
Frank Celler 5f2655c3d9 Merge branch 'devel' of github.com:arangodb/arangodb into 2.5 2015-02-20 12:49:56 +01:00
Heiko Kernbach b41008c336 added grunt build files 2015-02-20 10:52:55 +01:00
Frank Celler 3c7948451a release version 2.5.0-alpha7 2015-02-19 19:21:50 +01:00
Frank Celler 08239445f9 Merge branch 'devel' of github.com:arangodb/arangodb into 2.5 2015-02-19 18:46:41 +01:00
Michael Hackstein ca35d0c610 The foxx manager now reinstalls all system apps on startup 2015-02-19 18:39:01 +01:00
Michael Hackstein 5bede81469 The app.js is now requested with a differente version to avoid caching by browsers 2015-02-19 18:37:39 +01:00
Michael Hackstein 1370c28b4c Included grunt-text-replace module 2015-02-19 18:20:00 +01:00
Michael Hackstein 101985516a Removed not working code. Will be reincluded in future 2015-02-19 18:19:37 +01:00
Michael Hackstein a641df37cb Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-02-19 18:08:33 +01:00
Heiko Kernbach 5d971cf60f grunt support for cluster frontend 2015-02-19 18:07:51 +01:00
Michael Hackstein f2db5833ba Removed unused static file exports from manifest 2015-02-19 17:51:41 +01:00
Michael Hackstein be5352441f Added modified gruntfile and manifest for the query view fix 2015-02-19 17:16:03 +01:00
Michael Hackstein bc7b3e3a57 Fixed syntax highlighting of query editor and hide away the explainor 2015-02-19 17:07:33 +01:00
Michael Hackstein da436c8a8c Applied a fix to ace editor 2015-02-19 17:06:20 +01:00
Michael Hackstein 6920330009 Removed invalid *css properties. Compatbility to IE6 is not possible anyways with many other features 2015-02-19 16:31:49 +01:00
Jan Steemann 871bfd4655 updated functions list 2015-02-19 14:51:32 +01:00
Frank Celler 6190bb7994 Merge branch 'devel' of github.com:arangodb/arangodb into 2.5 2015-02-18 21:50:33 +01:00
Michael Hackstein 7844b9eebd Fixed JSLint 2015-02-18 20:39:43 +01:00
Michael Hackstein a98975ad53 Fixed forgotten imports of files for karma 2015-02-18 19:29:10 +01:00
Michael Hackstein ce28642473 Changed label of the development /production button in WI. Suggested different mode 2015-02-18 19:19:41 +01:00
Michael Hackstein 9b592c1bd0 Added generated files from grunt 2015-02-18 19:14:44 +01:00
Michael Hackstein f5b1315066 Merge branch 'gruntingAardvark' of github.com:arangodb/arangodb into devel 2015-02-18 19:09:11 +01:00
Michael Hackstein 9612ca2b5e Moved spec for coverage tests to concatenated files 2015-02-18 19:04:58 +01:00
Michael Hackstein ea148c895c Added a list of files for karma coverage tests 2015-02-18 19:04:00 +01:00
Michael Hackstein 82cf2cc531 Added Node modules for WebInterface 2015-02-18 19:03:33 +01:00
Michael Hackstein 4c17d7b211 Finished rebase of gruntingAardvark to devel. 2015-02-18 19:02:39 +01:00
Heiko Kernbach e2f32b631f fixed tests 2015-02-18 18:42:42 +01:00
Michael Hackstein 18550aa70e Started fixing documentsView specs. Most of them were broken 2015-02-18 17:58:48 +01:00
Michael Hackstein 066fdc398e Added build for coverage tests. We do not want to check coverage of libraries 2015-02-18 17:58:46 +01:00
Michael Hackstein fe9898ecb5 Test code probably overwrites library instead of the mock. Should be fixed now. 2015-02-18 17:58:45 +01:00
Michael Hackstein e32f1ea081 Adapted karma tests to use the combined file generated via grunt instead of a self concatenated file. The test is now much closer to reality and the files are not stored redundantly 2015-02-18 17:58:43 +01:00
Michael Hackstein 0516be7f64 Applied a fix to ace. Their implementation of require breaks arangodb require. They expect an additional argument at the beginning 2015-02-18 17:58:41 +01:00
Michael Hackstein 4721b445ec Modified karma tests to work with the same concatenated file delivered to the frontend. 2015-02-18 17:58:40 +01:00
Michael Hackstein 433be5bc0e Enabled concatenation and uglification of javascript code. If minified version is used, Foxx-Documentation is not working. Variable resolution not possible. 2015-02-18 17:57:48 +01:00
Michael Hackstein 301c2f0e44 Implemented a heatmap for querynodes to help optimizing the query. Increased font-size of descriptions. Now needs discussion what to do next 2015-02-18 17:56:33 +01:00
Michael Hackstein 2bee6660f5 Added first version of query plan viewer. Needs to be beautified. A node-only cost estimation is would be good 2015-02-18 17:56:31 +01:00
Michael Hackstein bdf62fac3b First draft to display the result of explain on a query. Not yet beutiful 2015-02-18 17:56:27 +01:00
Heiko Kernbach b1e4904a31 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-02-18 17:11:19 +01:00
Heiko Kernbach 87115f2559 stop ajax calls to _system if user has no permission 2015-02-18 17:10:16 +01:00
Michael Hackstein 5ddd5a7019 Fixed style of mountpoint input in modal view 2015-02-18 17:08:52 +01:00
Jan Steemann ea285705fa Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-02-18 16:40:54 +01:00
Jan Steemann 83ea75fa8f removed unused config options 2015-02-18 16:40:15 +01:00
Michael Hackstein 7dde898684 Added style to the setup and teardown triggers in web interface. 2015-02-18 15:53:39 +01:00
Heiko Kernbach 7864dbf50d font awesome upgrade 4.0.3 to 4.3.0 2015-02-18 15:31:24 +01:00
Jan Steemann f29591135a adjusted geo index API 2015-02-18 14:59:46 +01:00
Michael Hackstein 6641e0df7c JShint use strict not working... 2015-02-18 11:43:20 +01:00
Michael Hackstein df20a360d7 Added, implemented and tested setup and teardown buttons in web UI. Style to go 2015-02-18 11:24:46 +01:00
Frank Celler 15fb7131f1 Merge remote-tracking branch 'origin/devel' into 2.5
Conflicts:
	Documentation/Examples/CollectionUnload.generated
	Documentation/Examples/HttpGharialAddEdge.generated
	Documentation/Examples/HttpGharialAddEdgeCol.generated
	Documentation/Examples/HttpGharialAddVertex.generated
	Documentation/Examples/HttpGharialAddVertexCol.generated
	Documentation/Examples/HttpGharialCreate.generated
	Documentation/Examples/HttpGharialEdgeDefinitionRemove.generated
	Documentation/Examples/HttpGharialGetEdge.generated
	Documentation/Examples/HttpGharialGetGraph.generated
	Documentation/Examples/HttpGharialGetVertex.generated
	Documentation/Examples/HttpGharialList.generated
	Documentation/Examples/HttpGharialModifyVertex.generated
	Documentation/Examples/HttpGharialPatchEdge.generated
	Documentation/Examples/HttpGharialPutEdge.generated
	Documentation/Examples/HttpGharialRemoveVertexCollection.generated
	Documentation/Examples/HttpGharialReplaceEdgeCol.generated
	Documentation/Examples/HttpGharialReplaceVertex.generated
	Documentation/Examples/RestAdminStatistics1.generated
	Documentation/Examples/RestBatchMultipartHeader.generated
	Documentation/Examples/RestCollectionCreateCollection.generated
	Documentation/Examples/RestCollectionCreateKeyopt.generated
	Documentation/Examples/RestCollectionDeleteCollectionIdentifier.generated
	Documentation/Examples/RestCollectionDeleteCollectionName.generated
	Documentation/Examples/RestCollectionGetAllCollections.generated
	Documentation/Examples/RestCollectionGetCollectionChecksum.generated
	Documentation/Examples/RestCollectionGetCollectionChecksumNoRev.generated
	Documentation/Examples/RestCollectionGetCollectionCount.generated
	Documentation/Examples/RestCollectionGetCollectionFigures.generated
	Documentation/Examples/RestCollectionGetCollectionIdentifier.generated
	Documentation/Examples/RestCollectionGetCollectionName.generated
	Documentation/Examples/RestCollectionGetCollectionRevision.generated
	Documentation/Examples/RestCollectionIdentifierLoad.generated
	Documentation/Examples/RestCollectionIdentifierPropertiesSync.generated
	Documentation/Examples/RestCollectionIdentifierRename.generated
	Documentation/Examples/RestCollectionIdentifierTruncate.generated
	Documentation/Examples/RestCollectionIdentifierUnload.generated
	Documentation/Examples/RestCursorCreateCursorForLimitReturn.generated
	Documentation/Examples/RestCursorCreateCursorForLimitReturnSingle.generated
	Documentation/Examples/RestCursorDelete.generated
	Documentation/Examples/RestCursorForLimitReturnCont.generated
	Documentation/Examples/RestDatabaseGetInfo.generated
	Documentation/Examples/RestDocumentHandlerDeleteDocument.generated
	Documentation/Examples/RestDocumentHandlerDeleteDocumentIfMatchOther.generated
	Documentation/Examples/RestDocumentHandlerDeleteDocumentUnknownHandle.generated
	Documentation/Examples/RestDocumentHandlerPatchDocument.generated
	Documentation/Examples/RestDocumentHandlerPatchDocumentMerge.generated
	Documentation/Examples/RestDocumentHandlerPostAccept1.generated
	Documentation/Examples/RestDocumentHandlerPostCreate1.generated
	Documentation/Examples/RestDocumentHandlerPostCreate2.generated
	Documentation/Examples/RestDocumentHandlerPostWait1.generated
	Documentation/Examples/RestDocumentHandlerReadDocument.generated
	Documentation/Examples/RestDocumentHandlerReadDocumentAllKey.generated
	Documentation/Examples/RestDocumentHandlerReadDocumentAllPath.generated
	Documentation/Examples/RestDocumentHandlerReadDocumentHead.generated
	Documentation/Examples/RestDocumentHandlerReadDocumentIfNoneMatch.generated
	Documentation/Examples/RestDocumentHandlerUpdateDocument.generated
	Documentation/Examples/RestDocumentHandlerUpdateDocumentIfMatchOther.generated
	Documentation/Examples/RestDocumentHandlerUpdateDocumentIfMatchOtherLastWriteWins.generated
	Documentation/Examples/RestDocumentHandlerUpdateDocumentRevOther.generated
	Documentation/Examples/RestDocumentHandlerUpdateDocumentUnknownHandle.generated
	Documentation/Examples/RestEdgeCreateEdge.generated
	Documentation/Examples/RestEdgesReadEdgesAny.generated
	Documentation/Examples/RestEdgesReadEdgesIn.generated
	Documentation/Examples/RestEdgesReadEdgesOut.generated
	Documentation/Examples/RestEndpointGet.generated
	Documentation/Examples/RestExplainAllPlans.generated
	Documentation/Examples/RestExplainOptimizerRules.generated
	Documentation/Examples/RestExplainOptions.generated
	Documentation/Examples/RestGraphChangeEdge.generated
	Documentation/Examples/RestGraphChangeVertex.generated
	Documentation/Examples/RestGraphChangepEdge.generated
	Documentation/Examples/RestGraphChangepVertex.generated
	Documentation/Examples/RestGraphCreateEdge.generated
	Documentation/Examples/RestGraphCreateVertex.generated
	Documentation/Examples/RestGraphGetEdge.generated
	Documentation/Examples/RestGraphGetEdges.generated
	Documentation/Examples/RestGraphGetGraph.generated
	Documentation/Examples/RestGraphGetGraphs.generated
	Documentation/Examples/RestGraphGetVertex.generated
	Documentation/Examples/RestGraphGetVertexEdges.generated
	Documentation/Examples/RestGraphGetVertexVertices.generated
	Documentation/Examples/RestGraphGetVertexVertices2.generated
	Documentation/Examples/RestGraphGetVertices.generated
	Documentation/Examples/RestGraphPostGraph.generated
	Documentation/Examples/RestIndexAllIndexes.generated
	Documentation/Examples/RestIndexCreateGeoLatitudeLongitude.generated
	Documentation/Examples/RestIndexCreateGeoLocation.generated
	Documentation/Examples/RestIndexCreateNewCapConstraint.generated
	Documentation/Examples/RestIndexCreateNewFulltext.generated
	Documentation/Examples/RestIndexCreateNewHashIndex.generated
	Documentation/Examples/RestIndexCreateNewSkiplist.generated
	Documentation/Examples/RestIndexCreateNewUniqueConstraint.generated
	Documentation/Examples/RestIndexCreateSparseHashIndex.generated
	Documentation/Examples/RestIndexCreateSparseSkiplist.generated
	Documentation/Examples/RestIndexDeleteUniqueSkiplist.generated
	Documentation/Examples/RestReplicationApplierStart.generated
	Documentation/Examples/RestReplicationApplierStateNotRunning.generated
	Documentation/Examples/RestReplicationApplierStateRunning.generated
	Documentation/Examples/RestReplicationApplierStop.generated
	Documentation/Examples/RestReplicationDump.generated
	Documentation/Examples/RestReplicationInventory.generated
	Documentation/Examples/RestReplicationInventoryIndexes.generated
	Documentation/Examples/RestReplicationLoggerFollowBufferLimit.generated
	Documentation/Examples/RestReplicationLoggerFollowEmpty.generated
	Documentation/Examples/RestReplicationLoggerFollowSome.generated
	Documentation/Examples/RestReplicationLoggerStateActive.generated
	Documentation/Examples/RestReplicationServerId.generated
	Documentation/Examples/RestSimpleAllBatch.generated
	Documentation/Examples/RestSimpleAllSkipLimit.generated
	Documentation/Examples/RestSimpleAny.generated
	Documentation/Examples/RestSimpleByExample.generated
	Documentation/Examples/RestSimpleByExample2.generated
	Documentation/Examples/RestSimpleByExample3.generated
	Documentation/Examples/RestSimpleFirst.generated
	Documentation/Examples/RestSimpleFirstExample.generated
	Documentation/Examples/RestSimpleFirstSingle.generated
	Documentation/Examples/RestSimpleFulltext.generated
	Documentation/Examples/RestSimpleLast.generated
	Documentation/Examples/RestSimpleLastSingle.generated
	Documentation/Examples/RestSimpleNear.generated
	Documentation/Examples/RestSimpleNearDistance.generated
	Documentation/Examples/RestSimpleRange.generated
	Documentation/Examples/RestSimpleWithin.generated
	Documentation/Examples/RestSimpleWithinDistance.generated
	Documentation/Examples/RestSimpleWithinRectangle.generated
	Documentation/Examples/RestTasksCreate.generated
	Documentation/Examples/RestTasksListAll.generated
	Documentation/Examples/RestTasksListOne.generated
	Documentation/Examples/RestTasksPutWithId.generated
	Documentation/Examples/RestTraversalAny.generated
	Documentation/Examples/RestTraversalBackwardItemOrder.generated
	Documentation/Examples/RestTraversalDepthFirst.generated
	Documentation/Examples/RestTraversalEdgeUniqueness.generated
	Documentation/Examples/RestTraversalFilterExclude.generated
	Documentation/Examples/RestTraversalFilterPrune.generated
	Documentation/Examples/RestTraversalInbound.generated
	Documentation/Examples/RestTraversalMaxDepth.generated
	Documentation/Examples/RestTraversalMinDepth.generated
	Documentation/Examples/RestTraversalOutbound.generated
	Documentation/Examples/RestTraversalPostorder.generated
	Documentation/Examples/RestTraversalVisitorCountAndList.generated
	Documentation/Examples/RestTraversalVisitorExpander.generated
	Documentation/Examples/RestVersion.generated
	Documentation/Examples/RestVersionDetails.generated
	Documentation/Examples/SaveEdgeCol.generated
	Documentation/Examples/collectionAll.generated
	Documentation/Examples/collectionAllNext.generated
	Documentation/Examples/collectionByExample.generated
	Documentation/Examples/collectionByExampleNext.generated
	Documentation/Examples/collectionClosedRange.generated
	Documentation/Examples/collectionDatabaseCollectionName.generated
	Documentation/Examples/collectionDatabaseCreate.generated
	Documentation/Examples/collectionDatabaseCreateKey.generated
	Documentation/Examples/collectionDatabaseCreateProperties.generated
	Documentation/Examples/collectionDatabaseCreateSpecialKey.generated
	Documentation/Examples/collectionDatabaseDrop.generated
	Documentation/Examples/collectionDatabaseDropName.generated
	Documentation/Examples/collectionDatabaseName.generated
	Documentation/Examples/collectionDatabaseTruncate.generated
	Documentation/Examples/collectionDatabaseTruncateName.generated
	Documentation/Examples/collectionDrop.generated
	Documentation/Examples/collectionFigures.generated
	Documentation/Examples/collectionFirstExample.generated
	Documentation/Examples/collectionFulltext.generated
	Documentation/Examples/collectionLoad.generated
	Documentation/Examples/collectionNear.generated
	Documentation/Examples/collectionNearDistance.generated
	Documentation/Examples/collectionRange.generated
	Documentation/Examples/collectionRename.generated
	Documentation/Examples/collectionTruncate.generated
	Documentation/Examples/collectionWithin.generated
	Documentation/Examples/collectionsDatabaseName.generated
	Documentation/Examples/cursorHasNext.generated
	Documentation/Examples/cursorNext.generated
	Documentation/Examples/documentDocumentRemove.generated
	Documentation/Examples/documentDocumentRemoveConflict.generated
	Documentation/Examples/documentDocumentUpdate.generated
	Documentation/Examples/documentsCollectionFirst.generated
	Documentation/Examples/documentsCollectionFirstNull.generated
	Documentation/Examples/documentsCollectionInsert.generated
	Documentation/Examples/documentsCollectionLast.generated
	Documentation/Examples/documentsCollectionLastNull.generated
	Documentation/Examples/documentsCollectionName.generated
	Documentation/Examples/documentsCollectionRemove.generated
	Documentation/Examples/documentsCollectionRemoveConflict.generated
	Documentation/Examples/documentsCollectionRemoveSignature.generated
	Documentation/Examples/documentsCollectionReplace.generated
	Documentation/Examples/documentsCollectionReplaceHandle.generated
	Documentation/Examples/documentsCollectionUpdate.generated
	Documentation/Examples/documentsCollectionUpdateHandle.generated
	Documentation/Examples/documentsCollectionUpdateHandleArray.generated
	Documentation/Examples/documentsCollectionUpdateHandleKeepNull.generated
	Documentation/Examples/documentsDocumentName.generated
	Documentation/Examples/documentsDocumentReplace.generated
	Documentation/Examples/executeQuery.generated
	Documentation/Examples/executeQueryBatchSize.generated
	Documentation/Examples/generalGraphAbsBetweenness1.generated
	Documentation/Examples/generalGraphAbsBetweenness2.generated
	Documentation/Examples/generalGraphAbsBetweenness3.generated
	Documentation/Examples/generalGraphAbsCloseness1.generated
	Documentation/Examples/generalGraphAbsCloseness2.generated
	Documentation/Examples/generalGraphAbsEccentricity2.generated
	Documentation/Examples/generalGraphBetweenness2.generated
	Documentation/Examples/generalGraphBetweenness3.generated
	Documentation/Examples/generalGraphCloseness1.generated
	Documentation/Examples/generalGraphCloseness3.generated
	Documentation/Examples/generalGraphCommonNeighbors1.generated
	Documentation/Examples/generalGraphCommonNeighbors2.generated
	Documentation/Examples/generalGraphDistanceTo1.generated
	Documentation/Examples/generalGraphDropGraphKeep.generated
	Documentation/Examples/generalGraphEccentricity1.generated
	Documentation/Examples/generalGraphEccentricity2.generated
	Documentation/Examples/generalGraphEdgeCollectionRemove.generated
	Documentation/Examples/generalGraphEdgeCollectionReplace.generated
	Documentation/Examples/generalGraphEdgeCollectionSave1.generated
	Documentation/Examples/generalGraphEdgeCollectionUpdate.generated
	Documentation/Examples/generalGraphEdges1.generated
	Documentation/Examples/generalGraphEdges2.generated
	Documentation/Examples/generalGraphEdgesFiltered.generated
	Documentation/Examples/generalGraphEdgesUnfiltered.generated
	Documentation/Examples/generalGraphFluentAQLEdgesFilteredMultiple.generated
	Documentation/Examples/generalGraphFluentAQLEdgesFilteredSingle.generated
	Documentation/Examples/generalGraphFluentAQLEdgesUnfiltered.generated
	Documentation/Examples/generalGraphFluentAQLFromVerticesFilteredMultiple.generated
	Documentation/Examples/generalGraphFluentAQLFromVerticesFilteredSingle.generated
	Documentation/Examples/generalGraphFluentAQLFromVerticesUnfiltered.generated
	Documentation/Examples/generalGraphFluentAQLInEdgesFilteredMultiple.generated
	Documentation/Examples/generalGraphFluentAQLInEdgesFilteredSingle.generated
	Documentation/Examples/generalGraphFluentAQLInEdgesUnfiltered.generated
	Documentation/Examples/generalGraphFluentAQLNeighborsFilteredSingle.generated
	Documentation/Examples/generalGraphFluentAQLNeighborsUnfiltered.generated
	Documentation/Examples/generalGraphFluentAQLNext.generated
	Documentation/Examples/generalGraphFluentAQLNextRecreate.generated
	Documentation/Examples/generalGraphFluentAQLOutEdgesFilteredMultiple.generated
	Documentation/Examples/generalGraphFluentAQLOutEdgesFilteredSingle.generated
	Documentation/Examples/generalGraphFluentAQLOutEdgesUnfiltered.generated
	Documentation/Examples/generalGraphFluentAQLPathNeighbors.generated
	Documentation/Examples/generalGraphFluentAQLPathSimple.generated
	Documentation/Examples/generalGraphFluentAQLRestricted.generated
	Documentation/Examples/generalGraphFluentAQLToArray.generated
	Documentation/Examples/generalGraphFluentAQLToVerticesFilteredMultiple.generated
	Documentation/Examples/generalGraphFluentAQLToVerticesFilteredSingle.generated
	Documentation/Examples/generalGraphFluentAQLToVerticesUnfiltered.generated
	Documentation/Examples/generalGraphFluentAQLUnfilteredEdges.generated
	Documentation/Examples/generalGraphFluentAQLUnfilteredVertices.generated
	Documentation/Examples/generalGraphFluentAQLUnrestricted.generated
	Documentation/Examples/generalGraphFluentAQLVerticesFilteredSingle.generated
	Documentation/Examples/generalGraphFluentAQLVerticesUnfiltered.generated
	Documentation/Examples/generalGraphGetFromVertex.generated
	Documentation/Examples/generalGraphGetToVertex.generated
	Documentation/Examples/generalGraphModuleAbsBetweenness1.generated
	Documentation/Examples/generalGraphModuleAbsBetweenness2.generated
	Documentation/Examples/generalGraphModuleAbsBetweenness3.generated
	Documentation/Examples/generalGraphModuleAbsCloseness1.generated
	Documentation/Examples/generalGraphModuleAbsCloseness2.generated
	Documentation/Examples/generalGraphModuleAbsCloseness3.generated
	Documentation/Examples/generalGraphModuleAbsEccentricity2.generated
	Documentation/Examples/generalGraphModuleBetweenness1.generated
	Documentation/Examples/generalGraphModuleBetweenness2.generated
	Documentation/Examples/generalGraphModuleCloseness1.generated
	Documentation/Examples/generalGraphModuleCommonNeighbors1.generated
	Documentation/Examples/generalGraphModuleCommonNeighbors2.generated
	Documentation/Examples/generalGraphModuleConnectingEdges1.generated
	Documentation/Examples/generalGraphModuleDistanceTo1.generated
	Documentation/Examples/generalGraphModuleDistanceTo2.generated
	Documentation/Examples/generalGraphModuleEccentricity2.generated
	Documentation/Examples/generalGraphModuleEccentricity3.generated
	Documentation/Examples/generalGraphModuleNeighbors1.generated
	Documentation/Examples/generalGraphModuleNeighbors2.generated
	Documentation/Examples/generalGraphModulePaths.generated
	Documentation/Examples/generalGraphModulePaths2.generated
	Documentation/Examples/generalGraphModuleShortestPaths1.generated
	Documentation/Examples/generalGraphModuleShortestPaths2.generated
	Documentation/Examples/generalGraphNeighbors1.generated
	Documentation/Examples/generalGraphNeighbors2.generated
	Documentation/Examples/generalGraphPaths.generated
	Documentation/Examples/generalGraphPaths2.generated
	Documentation/Examples/generalGraphShortestPaths1.generated
	Documentation/Examples/generalGraphTraversal1.generated
	Documentation/Examples/generalGraphTraversal2.generated
	Documentation/Examples/generalGraphTraversalTree1.generated
	Documentation/Examples/generalGraphTraversalTree2.generated
	Documentation/Examples/generalGraphVertexCollectionRemove.generated
	Documentation/Examples/generalGraphVertexCollectionReplace.generated
	Documentation/Examples/generalGraphVertexCollectionSave.generated
	Documentation/Examples/generalGraphVertexCollectionUpdate.generated
	Documentation/Examples/generalGraphVertices1.generated
	Documentation/Examples/generalGraphVertices2.generated
	Documentation/Examples/generalGraphVerticesFiltered.generated
	Documentation/Examples/generalGraphVerticesUnfiltered.generated
	Documentation/Examples/general_graph__deleteEdgeDefinition.generated
	Documentation/Examples/queryLimit.generated
	Documentation/Examples/querySkip.generated
	build.h
	configure
	configure.ac
	js/common/tests/shell-database.js
2015-02-17 15:31:33 +01:00
Michael Hackstein c091996092 Fixed scss lint 2015-02-17 10:50:40 +01:00
Heiko Kernbach 12ccbb9cba fixed issue #1248 2015-02-17 10:01:02 +01:00
Michael Hackstein c6e9d98251 Added a force uninstall for foxx apps, to make sure they are removed from disk even if sth is unclear with mounting. Also created an error for foxx not found on file system has been added 2015-02-16 17:14:36 +01:00
Michael Hackstein 0c78629199 Merge branch 'foxx-pathes' of github.com:arangodb/arangodb into devel 2015-02-16 14:17:52 +01:00
Michael Hackstein 9d5ae45b10 Improved errors thrown when trying to install malformed applications 2015-02-13 22:11:54 +01:00
Michael Hackstein 5b3fae42aa Merge branch 'devel' of github.com:arangodb/arangodb into foxx-pathes
Conflicts:
	js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
	lib/Basics/voc-errors.cpp
	lib/Basics/voc-errors.h
2015-02-13 10:20:36 +01:00
Michael Hackstein 6c5396dfeb Fixed app documentation view. Browsers are unable to load the same url in an iframe, created a Documentation only html page
Conflicts:
	js/apps/system/_admin/aardvark/APP/frontend/js/templates/applicationDetailView.ejs
2015-02-10 16:29:09 +01:00
Michael Hackstein 67fcf3bec4 Fixed jslint 2015-02-09 08:54:13 +01:00
Michael Hackstein aad7e46f10 Merge branch 'devel' of github.com:arangodb/arangodb into foxx-pathes
Conflicts:
	Documentation/Books/Users/SUMMARY.md
	js/actions/api-system.js
	js/common/bootstrap/modules.js
	js/server/modules/org/arangodb/foxx/manager.js
	js/server/tests/shell-routing.js
2015-02-06 17:22:01 +01:00