Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
20,269 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

2856 Commits

Author SHA1 Message Date
Jan Steemann f1f13a4284 added several AQL functions 2014-11-18 11:26:42 +01:00
Jan Steemann 8c67805c50 issue #1103: Error while importing user queries 2014-11-18 09:16:33 +01:00
Jan Steemann 80556c80f2 issue #1103: Error while importing user queries 2014-11-18 09:14:27 +01:00
Frank Celler 47766aa72c release version 2.3.0 2014-11-18 07:13:36 +01:00
Jan Steemann d290dd1de6 added derived file 2014-11-18 07:03:02 +01:00
Jan Steemann 548f8137cc issue #1099: do not fail if general-graph.remove is used inside a transaction 2014-11-18 07:02:47 +01:00
Jan Steemann fc0b63967f fixed WITHIN_RECTANGLE for cluster 2014-11-18 07:02:08 +01:00
Jan Steemann a77b6c73fa added derived file 2014-11-17 16:37:04 +01:00
Jan Steemann a71bf1819c issue #1099: do not fail if general-graph.remove is used inside a transaction 2014-11-17 15:47:39 +01:00
Jan Steemann 675e2a0d40 fixed WITHIN_RECTANGLE for cluster 2014-11-17 12:32:43 +01:00
Frank Celler c9fb8f1a5b release version 2.3.0 2014-11-15 21:41:16 +01:00
Frank Celler 39dab81292 Merge branch 'devel' of github.com:triAGENS/ArangoDB into 2.3 2014-11-14 23:04:16 +01:00
Frank Celler a5ed1d8fab Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-11-14 22:53:44 +01:00
Jan Steemann 7f6d6f9142 issue #1069: Add 'raw' link to swagger ui so that the raw swagger json can easily be retrieved 
Added *Raw* link in documentation overview
 2014-11-14 21:54:05 +01:00
Jan Steemann 1fe0ce481e sort list of collections when creating a graph 2014-11-14 21:31:43 +01:00
Frank Celler 5a99807ae0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-11-14 18:38:19 +01:00
Jan Steemann 67356de499 issue #1098: some tests for error checking 2014-11-14 17:14:33 +01:00
Jan Steemann d37f4593b0 fixed grammar 2014-11-14 17:00:06 +01:00
Jan Steemann 2c0f5b96c9 issue #1098: added better error checking 2014-11-14 16:56:25 +01:00
Jan Steemann 777f70c8e2 fixed error message 2014-11-14 16:45:51 +01:00
Jan Steemann 0390ea34e6 hide system applications by default 2014-11-13 11:31:12 +01:00
Jan Steemann 7cd1eb5474 more warnings 2014-11-12 14:52:54 +01:00
Jan Steemann d4084e97e4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-11-12 14:51:35 +01:00
scottashton f8bd383808 show warnings in aql result 2014-11-12 13:59:04 +01:00
Jan Steemann 81c1919f44 minor adjustments for task API 2014-11-12 11:27:47 +01:00
Frank Celler 88d1f78464 Merge remote-tracking branch 'origin/2.3' into devel 
Conflicts:
	CHANGELOG
 2014-11-12 04:57:41 +01:00
Jan Steemann 04a78c95c4 added functions to highlighter 2014-11-11 23:14:24 +01:00
Jan Steemann 82331b290a issue #1083: do not show just 7 document attributes 2014-11-10 12:00:46 +01:00
Michael Hackstein fc2a4d82d0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-11-08 22:38:00 +00:00
Frank Celler f74849611d release version 2.3.0-beta2 2014-11-07 19:38:08 +01:00
Frank Celler ca15a1d22b Merge branch 'devel' of github.com:triAGENS/ArangoDB into 2.3 
Conflicts:
	CHANGELOG
	Documentation/Books/Users/NewFeatures/NewFeatures23.mdpp
	Documentation/Books/Users/Upgrading/Upgrading23.mdpp
	Documentation/Books/Users/Upgrading/UpgradingChanges23.mdpp
	js/apps/system/aardvark/frontend/js/views/foxxActiveView.js
	js/apps/system/aardvark/frontend/js/views/queryView.js
 2014-11-07 19:12:42 +01:00
Heiko Kernbach d9d6d5a062 added new shortcut to shortcut list 2014-11-07 17:30:35 +01:00
Heiko Kernbach 8f62bd4e24 added tooltip help for importing documents 2014-11-07 16:52:56 +01:00
Heiko Kernbach 6db183c681 bugfix: user extra attribuet now called userData 2014-11-07 16:19:24 +01:00
Heiko Kernbach 3c13953b23 added remove prog view button 2014-11-07 16:05:47 +01:00
Heiko Kernbach e7132b2009 removed download query button if current query is broken 2014-11-07 16:02:21 +01:00
Heiko Kernbach 912a9d2026 changed docs progress view delay 2014-11-07 15:37:37 +01:00
Heiko Kernbach 10368540ad added feature for truncating a collection 2014-11-07 14:49:45 +01:00
Heiko Kernbach 2e9a4a649a added feature for truncating a collection 2014-11-07 14:49:25 +01:00
Heiko Kernbach 34e6ac17e7 added ctrl+return and cmd+return for saving a document using the json editor 2014-11-07 14:19:19 +01:00
Heiko Kernbach 9da7e32c16 added edit database menu for small navigation bar 2014-11-06 17:41:22 +01:00
Heiko Kernbach f2699f1304 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-11-06 17:38:04 +01:00
Heiko Kernbach e261ff5242 jslint 2014-11-06 17:37:48 +01:00
Heiko Kernbach afbec2aa2b added delay for progress view 2014-11-06 17:35:17 +01:00
Michael Hackstein 3fecf7d4cb Fixed document view tests 2014-11-06 14:54:11 +00:00
Michael Hackstein 166407d4f9 Fixed user management view test 2014-11-06 14:45:24 +00:00
Michael Hackstein 8483a8bd45 Fixed aardvark router test 2014-11-06 14:36:09 +00:00
Heiko Kernbach c6f8e6c201 fixed wrong styling of active submenu 2014-11-06 15:35:35 +01:00
Heiko Kernbach afe860262b changed icons for importing and exporting json collections 2014-11-06 15:32:07 +01:00
Heiko Kernbach 7e99c16f01 fixed type, fixed event not triggering refiltering documents 2014-11-06 15:09:28 +01:00
Michael Hackstein 6ae3f3958c Made karma.conf again jenkins compatible 2014-11-06 13:41:48 +00:00
Michael Hackstein 4e5438f374 Removed JSLint warning in Frontend 2014-11-06 13:41:12 +00:00
Heiko Kernbach fb98a3ca96 fixed firefox pagination styling bug 2014-11-06 14:01:07 +01:00
Jan Steemann c61d8d9035 grammar 2014-11-06 13:42:57 +01:00
Michael Hackstein dc6314481e Removed console output 2014-11-05 16:36:10 +00:00
Michael Hackstein c3f35a5a37 The swagger JSON file is now opened in a new tab/window by default 2014-11-05 16:33:47 +00:00
Michael Hackstein e4f15f3632 Reverted my changes for Swagger URL Export 2014-11-05 16:25:21 +00:00
Michael Hackstein 715920f57e Added all files to karma again 2014-11-05 11:32:22 +00:00
Michael Hackstein 614aac3eba Fixed tests for query view 2014-11-05 11:25:10 +00:00
Michael Hackstein c1a889b87b Fixed tests for statistics bar 2014-11-05 10:16:03 +00:00
Michael Hackstein f7a29e6c1d Fixed indention 2014-11-05 10:01:58 +00:00
Michael Hackstein fa459bd603 Fixed all dashboard view tests 2014-11-05 09:59:23 +00:00
Michael Hackstein 3fe3e6dbd6 Fixed merge conflict. Still waiting for a fix from Frank for falsly matching of %2F as / in routes 2014-11-05 09:41:26 +00:00
Michael Hackstein 465ceefa16 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-11-04 16:30:10 +00:00
Michael Hackstein 11bc1a0931 Added some faked functions to queryViewSpec. Causes some tests to pass again 2014-11-04 16:28:52 +00:00
Jan Steemann 42aa5b927e fixed download of AQL query results in web interface 2014-11-04 01:31:51 +01:00
Jan Steemann 7367d3400b fixed download of AQL query results in web interface 2014-11-04 01:31:12 +01:00
Jan Steemann 358c596b0e issue #1069: Add 'raw' link to swagger ui so that the raw swagger json can easily be retrieved 
This adds a link to the Swagger API docs to an application's detail view in
  the **Applications** tab of the web interface. The link produces the Swagger
  JSON directly. If authentication is turned on, the link requires authentication,
  too.

Conflicts:
	CHANGELOG
 2014-11-04 01:19:21 +01:00
Jan Steemann 166e41a512 issue #1069: Add 'raw' link to swagger ui so that the raw swagger json can easily be retrieved 
This adds a link to the Swagger API docs to an application's detail view in
  the **Applications** tab of the web interface. The link produces the Swagger
  JSON directly. If authentication is turned on, the link requires authentication,
  too.
 2014-11-04 01:16:56 +01:00
Jan Steemann 2e7392cb7f issue #998: Incorrect application URL for non-system Foxx apps 2014-11-04 00:10:29 +01:00
Jan Steemann 52e897f3e2 some cleanup 2014-11-04 00:09:50 +01:00
Jan Steemann d3ff754352 issue #998: Incorrect application URL for non-system Foxx apps 2014-11-04 00:08:10 +01:00
Jan Steemann 434835d8f4 added keywords 2014-11-03 23:45:05 +01:00
Jan Steemann 229b1be34c added keywords 2014-11-03 23:43:39 +01:00
Jan Steemann 2e6da78211 added derived file 2014-11-03 23:22:42 +01:00
Jan Steemann 9edba8f96e issue #1075: Aardvark: user name required even if auth is off 
The fix for this prefills the username input field with the current user's
  accout name if any and `root` (the default username) otherwise. Additionally,
  the tooltip text has been slightly adjusted.
 2014-11-03 23:22:08 +01:00
Jan Steemann c3a5b9a92d updated documentation 2014-11-03 15:32:00 +01:00
Frank Celler 7e7262aa7f release version 2.3.0-beta1 2014-11-01 23:05:50 +01:00
Frank Celler 51f643e1db release version 2.3.0-alpha7 2014-11-01 20:44:05 +01:00
Frank Celler 703a14aabd Merge branch 'devel' of github.com:triAGENS/ArangoDB into 2.3 2014-11-01 20:30:19 +01:00
Jan Steemann 025d73ae03 re-added support for fullCount 2014-11-01 15:20:05 +01:00
Jan Steemann 26c3b0174f fixed tests 2014-10-31 19:58:20 +01:00
Jan Steemann 4f68960ed7 removed Ahuacatl [skip ci] 2014-10-31 17:31:00 +01:00
Frank Celler 82bf05f50f Merge branch 'devel' of github.com:triAGENS/ArangoDB into 2.3 
Conflicts:
	configure.ac
 2014-10-31 10:39:42 +01:00
Jan Steemann d4d3e37a0d added internal.parseFile 2014-10-30 19:18:05 +01:00
Jan Steemann c19060da27 changed www.arangodb.org to www.arangodb.org 2014-10-30 19:17:25 +01:00
Jan Steemann f6146eb71e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-30 17:37:21 +01:00
Heiko Kernbach faced9a8d8 merge error 2014-10-30 17:37:01 +01:00
Jan Steemann 83252851e6 report warnings in queries 2014-10-30 17:33:15 +01:00
Heiko Kernbach e79fd49817 merge 2014-10-30 15:54:55 +01:00
Heiko Kernbach 1ae7c494a6 karma test 2014-10-30 14:55:37 +01:00
Jan Steemann 4418e58315 removed old-style Doxygen sections 2014-10-30 01:16:07 +01:00
Jan Steemann cf6fcb2fc1 linted python files, regenerated derived files 2014-10-29 23:56:20 +01:00
Jan Steemann 0d232e9601 removed debug output 2014-10-29 22:47:31 +01:00
Frank Celler 396a684f90 release version 2.3.0-alpha6 2014-10-29 13:31:21 +01:00
gschwab 22a4b28d36 small doku changed for /_api/gharial/g/edge/e?dropCollection=true 2014-10-28 14:09:33 +01:00
Jan Steemann 2ec0d5b838 fixed shellView error handling 2014-10-27 11:37:53 +01:00
Jan Steemann e581aa6612 fixed usage of AQL user-defined functions from web UI 2014-10-27 11:09:20 +01:00
Jan Steemann 0aa639c7e0 issue #1056: "fs": zip functions fail with passwords 2014-10-25 00:37:26 +02:00
Jan Steemann dc2691b83b added derived file 2014-10-24 23:40:20 +02:00
Michael Hackstein d87137328a Regenerated Swagger documentatioN 2014-10-22 11:00:00 +02:00
Frank Celler 6def59d804 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-21 12:28:45 +02:00
Frank Celler a7d93abe43 fixed requireApp in development mode 2014-10-21 12:28:33 +02:00
Michael Hackstein 55f2d57fb4 Reunified ahuacatl-general-graph and aql-general-graph. Fixed JSLint in aql 2014-10-20 12:42:17 +02:00
Frank Celler a3892fb672 fixed collection prefix for users and sessions 2014-10-20 10:59:54 +02:00
Michael Hackstein 0313c74b66 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-20 09:36:39 +02:00
Michael Hackstein a783081742 Made useage of the model more backbone like in queryView 2014-10-20 09:36:35 +02:00
Heiko Kernbach 8f5788d693 added click event + style for changing active database through tiles of dbs view 2014-10-17 15:27:18 +02:00
Heiko Kernbach 01992b0718 preperation: allow users to abort queries if their execution take too long 2014-10-17 15:03:38 +02:00
Heiko Kernbach 0d4b2c5af5 fixed a js bug 2014-10-17 12:14:14 +02:00
Heiko Kernbach b89583f34a #1053 - step1: now limiting returned arguments in documentation view for single document 2014-10-17 11:56:26 +02:00
Heiko Kernbach ab0d3e1732 added y value formatting for page faults values - dashboard 2014-10-17 11:33:13 +02:00
Jan Steemann 99befdc0a6 removed unused file 2014-10-16 02:03:28 +02:00
Jan Steemann edae662eb4 added res.send() and res.sendFile() 2014-10-15 17:33:10 +02:00
Jan Steemann 766faddaf1 changed copyright from triAGENS GmbH to ArangoDB in ArangoShell 2014-10-14 13:54:38 +02:00
Michael Hackstein 5e1166e38c Removed debug output 2014-10-10 16:14:10 +02:00
Michael Hackstein 22955e25be Fixed repositioning of edge label #1017. 2014-10-10 15:34:13 +02:00
Michael Hackstein 267c48eeca Cluster Interface fixes for AWS. To be conntinued 2014-10-10 14:06:28 +02:00
Heiko Kernbach 42f12d0ac6 Merge 2014-10-10 12:01:12 +02:00
Heiko Kernbach 144c8b43e1 fixed display bug when a notification title is too long, optimized css for notifications 2014-10-10 11:59:55 +02:00
Heiko Kernbach 8ea7a44bd3 fixed modal view not hiding after successful deletion of a collection 2014-10-10 11:13:03 +02:00
Jan Steemann 6553d463b7 added derived file 2014-10-10 10:38:12 +02:00
Heiko Kernbach e12d027273 fixed non valid javascript code, aaardvark is now using internal base64 decode function 2014-10-09 18:40:13 +02:00
Jan Steemann 71c41c9017 added style for collection status "loading" 2014-10-09 17:12:24 +02:00
Heiko Kernbach 637b1582b2 fixed unuseful format of data for request chart in the dashboard (frontend) 2014-10-09 14:50:09 +02:00
Willi Goesgens e433a2831e Add a new wrapper which does fork + waitpid in one js call, so we're closer to the flame and less eventually miss something. 2014-10-08 16:48:30 +02:00
Jan Steemann ff80fafba5 fixed cached lookups of collections on the server, which may have caused spurious problems after collection rename operations 2014-10-08 14:59:02 +02:00
Jan Steemann 7c78bd1d61 added derived file 2014-09-29 14:41:33 +02:00
Max Neunhoeffer 046d4f524d Implement getSome for RemoteBlock. 2014-09-26 16:19:25 +02:00
Max Neunhoeffer cf5e1be91e Version version of HTTP API done. 2014-09-24 16:17:18 +02:00
Max Neunhoeffer 1f74a64b58 Implement POST for HTTP API for queries. 2014-09-23 16:51:03 +02:00
Jan Steemann c0a9d189c5 better error messages if mkdir fails 2014-09-18 17:48:05 +02:00
Jan Steemann 5c820cea34 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-09-16 16:33:47 +02:00
Alan Plum c145ede1a2 Don't use applicationContext.collection for system apps. 2014-09-15 23:31:05 +02:00
Jan Steemann 481a16fd7a removed bitarray indexes 2014-09-15 14:19:38 +02:00
Jan Steemann 4e6f6f2cbd finalized move to cxx 2014-09-14 00:06:00 +02:00
Jan Steemann 3487d7c9ba added derived file 2014-09-10 15:56:02 +02:00
Michael Hackstein 03cf0d69fb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-09-10 15:50:28 +02:00
Michael Hackstein 9b62c7367b Deprecated _directedRelation and _undirectedRelation in general-graphs. Created _relation in general-graphs creating a _directedRelation. Handling undirected relations is now given to the user / api-implementor as arangodb itself does not offer any direction constrains which caused some confusion 2014-09-10 15:50:22 +02:00
Jan Steemann 7d74347590 issue #1016: AQL editor bug 2014-09-10 13:39:10 +02:00
Michael Hackstein d6d16f0643 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-09-10 13:19:27 +02:00
Jan Steemann bb56982988 fixed copy&paste error 2014-09-09 23:32:58 +02:00
Jan Steemann 4522299ce8 fixed escaping of deletion button in AQL queries overview 2014-09-09 21:09:26 +02:00
Jan Steemann 11a490170d jslint 2014-09-09 20:38:18 +02:00
Jan Steemann 3bda3a1c0d fixed cursor positioning in collections search 2014-09-09 20:36:01 +02:00
Jan Steemann 80f7f61649 prevent XSS in user management views 2014-09-09 20:32:57 +02:00
Jan Steemann 2f89193e6c prevent XSS in AQL editor 2014-09-09 20:18:13 +02:00
Michael Hackstein 7c940d4d44 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-09-09 12:53:36 +02:00
Michael Hackstein 449936b99e Added a more precise information returned from gharial for collections 2014-09-09 12:53:31 +02:00
Alan Plum b0995dfdb7 Replaced PBKDF2_HMAC with PBKDF2_HMAC_SHA1 for OSX compat. 2014-09-08 14:32:40 +02:00
Jan Steemann 4fe43c5b49 added derived files 2014-09-08 10:59:07 +02:00
Alan Plum 469af580e5 Added PBKDF2-HMAC. 2014-09-05 16:23:37 +02:00
Frank Celler 4ffec6e914 tried to silence rpmlint: remove empty files, remove unused scripts, fixed initgroups, fixed identical files, remove __DATE__ 
Conflicts:
	CHANGELOG
	Makefile.in
 2014-09-05 09:28:21 +02:00
Alan Plum 99f9088830 Removed cookie logic from sessions app, simplified jwt logic. 2014-09-04 21:34:46 +02:00
Alan Plum 63e7c8132c Fixed stray unused "sid" property. 2014-09-04 15:58:32 +02:00
Alan Plum 2eb42db0d7 Session uid should be unambiguous. 2014-09-04 13:40:26 +02:00
Alan Plum e86c98dfe2 Enabled unused: true, ported aardvark jslint to jshint. 2014-09-02 22:18:18 +02:00
Alan Plum 71155440e6 Removed jslint headers from system apps. 2014-09-02 22:14:57 +02:00
Alan Plum bff47e558b Removed jslint headers from actions. 2014-09-02 22:14:56 +02:00
Alan Plum 3156a245f6 Stricter jshintrc. 2014-09-02 22:12:46 +02:00
Alan Plum 6a3386e55a Fixed jshint headers. 2014-09-02 22:12:45 +02:00
Jan Steemann 574b3f3d18 added ArangoShell tutorial 2014-08-30 19:46:20 +02:00
Jan Steemann b558899367 added derived files 2014-08-27 18:57:26 +02:00
Jan Steemann 794b909e8b issue #999: clear old result when submitting new query 2014-08-27 11:14:46 +02:00
Jan Steemann 4568c094c9 issue #1000: AQL Editor: Autofocus textarea 2014-08-27 10:58:01 +02:00
Alan Plum 9489a3cd50 Implemented session.getExpiry, session.hasExpired. 2014-08-27 10:29:44 +02:00
Heiko Kernbach 7c035ad49a document export bugfix, added filters to doc export function 2014-08-26 16:45:56 +02:00
Heiko Kernbach 0f215c7f71 css changes 2014-08-26 16:13:14 +02:00
Alan Plum de9a1c6efc Replaced sessions collection upgrade task. 2014-08-25 10:17:31 +02:00
Heiko Kernbach 1218d3b35b added export feature for documents and for query results 2014-08-22 16:54:53 +02:00
Heiko Kernbach 9fb9aa2cf1 added possibility to move selected documents to another collection 2014-08-22 15:06:07 +02:00
Heiko Kernbach 2472622b7c docs view bugfix 2014-08-22 11:40:31 +02:00
Heiko Kernbach ba072055ce Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-08-22 11:39:58 +02:00
Heiko Kernbach 2e6d4562d0 style changes + dashboard now async ajax calls 2014-08-22 11:39:51 +02:00
Alan Plum 172e1b936d Added more Foxx app unit tests. 2014-08-22 10:59:24 +02:00
Heiko Kernbach cc58900515 scss style change for progress view 2014-08-21 17:18:13 +02:00
Heiko Kernbach e4e4d1f9c0 fixed wrong event binding to whole table rows instead of tbody only 2014-08-21 16:47:20 +02:00
Heiko Kernbach f57bea8608 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-08-21 16:43:25 +02:00
Heiko Kernbach d17402f873 changed behaviour of sorting documents - front-end 2014-08-21 16:43:17 +02:00
Alan Plum 38cfd52c0f Removed redundant potato. 2014-08-21 16:42:14 +02:00
Alan Plum c8d1f5f93b Added tests for users app setup and error types. 2014-08-21 16:41:07 +02:00
Alan Plum c42628f0c5 Prettier stacks for users app errors. 2014-08-21 16:39:50 +02:00
Alan Plum 19062d9d57 Added tests for simple-auth app. 2014-08-21 15:32:10 +02:00
Thomas Schmidts 573fd51a5e Changed the links to the documentation 2014-08-21 15:07:01 +02:00
Heiko Kernbach 5a58c53585 docs view page size input bugfix 2014-08-21 14:35:55 +02:00
Heiko Kernbach 8aafb99c5f added sort-bey feature for filtering documents of a collection 2014-08-21 14:19:57 +02:00
Heiko Kernbach 750c87ed38 css changes for dropdown class 2014-08-21 14:19:19 +02:00
Heiko Kernbach aa57a43502 changed ace editor style 2014-08-21 12:25:12 +02:00
Heiko Kernbach d3b0dccb9d graph sorting menu stays open if view has to be rerendered 2014-08-21 12:16:50 +02:00
Heiko Kernbach 5f1a29bf71 added missing event to change the style of the toggle button 2014-08-21 12:11:30 +02:00
Heiko Kernbach 398b7fa5c1 sorting stays open if value changed 2014-08-21 11:52:41 +02:00
Heiko Kernbach 970626c333 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-08-21 11:15:10 +02:00
Heiko Kernbach aedebfda20 fixed issue #991 - database search view broken 2014-08-21 11:15:00 +02:00
Alan Plum ea4f769c5f Fixed user storage not reloading internal users db. 2014-08-21 11:06:35 +02:00
Heiko Kernbach a598c421ba added sorting for users view 2014-08-21 10:57:35 +02:00
Heiko Kernbach 5ecabb9001 prep for foxx sorting 2014-08-20 19:52:02 +02:00
Heiko Kernbach 8bd979e3e5 addad desc sorting for graphs view 2014-08-20 19:18:47 +02:00
Heiko Kernbach f352ca610a added desc sorting for databases 2014-08-20 18:53:36 +02:00
Heiko Kernbach 5ec16122c1 font size now 16px in code editor 2014-08-20 15:56:42 +02:00
Heiko Kernbach 81a6e558eb fixed document editor code view font 2014-08-20 15:49:05 +02:00
Alan Plum c62715e460 Merge pull request #920 from triAGENS/foxx-app-sessions 
Replace Foxx authentication with Foxx app-based (modular) authentication.
 2014-08-20 15:19:01 +02:00
Heiko Kernbach 132e758c66 documentsview bugfix 2014-08-20 13:54:48 +02:00
Heiko Kernbach 21e4554128 changed styling of documents view 2014-08-20 13:39:42 +02:00
Heiko Kernbach f21ad2b471 docs view css, added pagesize option for documents 2014-08-20 13:24:57 +02:00
Heiko Kernbach bdbdaaf0bf removed some local storage functions 2014-08-20 11:29:18 +02:00
Heiko Kernbach ddb6155870 fixed a modal view bug 2014-08-20 11:28:31 +02:00
Alan Plum e0e003d060 Migrated session/user routes and models to joi. 2014-08-20 11:16:06 +02:00
Alan Plum e73ab38720 Code style. 2014-08-20 11:14:31 +02:00
Alan Plum 00a0b4513a Aardvark: allow (un-)mounting non-internal system apps, prohibit mounting reserved paths. 2014-08-20 11:13:27 +02:00
Alan Plum fefe0d0e6d Replaced org/arangodb/users internals with users app compatible format. 2014-08-20 11:10:50 +02:00
Alan Plum 6a89d78929 Removed oauth2 app from system apps. 2014-08-20 10:57:48 +02:00
Alan Plum 38297b88cc Fixed sessions app relying on exports from static mount path. 2014-08-20 10:57:47 +02:00
Alan Plum af2b1c1ff6 Added bundled apps as system apps. 2014-08-20 10:57:46 +02:00
Heiko Kernbach 727d8a3f17 fixed a document filter state bug 2014-08-20 10:52:18 +02:00
Heiko Kernbach ed1942c8d0 improved way of importing and exporting aql queries 2014-08-19 17:08:27 +02:00
Heiko Kernbach 777decd050 scss-lint changes 2014-08-19 15:44:25 +02:00
Heiko Kernbach 4b7309892d scss-lint changes 2014-08-19 15:44:03 +02:00
Heiko Kernbach 7c70351a7d added support for multiple document deletion, fixed a a bug when wrong count of documents was returned 2014-08-19 15:37:49 +02:00
Heiko Kernbach 029d9d7c18 added filter state for documents filter 2014-08-19 13:23:52 +02:00
Heiko Kernbach 9622061c16 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-08-19 10:57:24 +02:00
Heiko Kernbach 03bc501706 move to async calls for fetching documents and operating aql queries 2014-08-19 10:57:15 +02:00
Heiko Kernbach 8df1e9e5e1 fixed a wrong notification initialization bug 2014-08-19 10:56:17 +02:00
Heiko Kernbach e894e50ce3 fixed visual bug at notification menu 2014-08-19 10:55:52 +02:00
Frank Celler 9fa3d22d6c towards new dispatcher interface 2014-08-18 23:37:32 +02:00
Heiko Kernbach e4a406def4 removed ajaxStart function 2014-08-18 17:17:24 +02:00
Heiko Kernbach d5a1266163 added progess indicator view 2014-08-18 17:10:03 +02:00
Heiko Kernbach 5209a761db changed the way of downloading user queries 2014-08-18 15:07:58 +02:00
Heiko Kernbach c5c1c08098 fixed wrong font rendering, safari browser 2014-08-15 13:46:49 +02:00
Heiko Kernbach dd226830c2 design changes modal validation, brighter checking of values 2014-08-14 17:57:37 +02:00
Heiko Kernbach adfdec9cb8 changed style of validation in modal views 2014-08-14 17:19:16 +02:00
Heiko Kernbach 6070acb954 validation now on focusout instead of keyup event 2014-08-14 16:59:50 +02:00
Heiko Kernbach c62b81f547 enabled pretty printing in js shell by default 2014-08-14 14:53:33 +02:00
Heiko Kernbach 4979513dc8 added validation rules for modal views 2014-08-14 14:03:15 +02:00
Jan Steemann ab080d8b73 added derived files 2014-08-13 16:02:19 +02:00
Heiko Kernbach 34ee4517ab added more regex validation 2014-08-12 18:06:23 +02:00
Heiko Kernbach 00761a36e6 merge 2014-08-12 15:11:28 +02:00
Heiko Kernbach 039f7884aa added functionality to validate modals content 2014-08-12 15:11:14 +02:00
Frank Celler f6e242039d relaxed % and escaping 2014-08-12 14:53:59 +02:00
Heiko Kernbach db04ef88a5 changed the look of the import query feature 2014-08-11 18:18:20 +02:00
Heiko Kernbach c4006bdec8 _from and _to links in documenView are now clickable and redirecting to their destination 2014-08-11 17:08:38 +02:00
Heiko Kernbach b97a3d3221 added autofocus for modals 2014-08-11 16:16:30 +02:00
Heiko Kernbach 679db54c5a merge 2014-08-11 15:54:58 +02:00
Heiko Kernbach 46657fee1d changed look and feel of document editor + delete function added 2014-08-11 15:54:41 +02:00
Frank Celler cc91cd1cb0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-08-11 12:43:47 +02:00
Heiko Kernbach 836e7f23bd added a bug where query collection not recognizing current user 2014-08-08 14:25:45 +02:00
Heiko Kernbach d6f62ac834 js/collections/arangoQueries.js 2014-08-08 14:25:13 +02:00
Heiko Kernbach cc440aaaaa jslint 2014-08-08 13:28:31 +02:00
Heiko Kernbach 0c716ab129 modified query collection so that name of query must be unique 2014-08-08 13:27:17 +02:00
Heiko Kernbach cbcca7cb51 merge 2014-08-08 13:04:56 +02:00
Heiko Kernbach 124906435e added import/export feature. aql queries now stored in user collection 2014-08-08 13:04:39 +02:00
Heiko Kernbach 2fe601e97d added event when document cannot be saved 2014-08-08 13:00:34 +02:00
Michael Hackstein d64a45e23d Added generated swagger files 2014-08-07 14:58:05 +02:00
Michael Hackstein 8dde9e7531 Fixed a bug in the automatic retry collection, it does not show the prompt for the user to enter cluster credentials 2014-08-07 14:53:03 +02:00
Frank Celler be06ef7f25 new upgrade-database (formely known as version-check) and new startup procedure 2014-08-07 14:12:19 +02:00
Heiko Kernbach e96a51f44d merge 2014-08-06 14:29:34 +02:00
Heiko Kernbach 64f3dba10c query view frontend 2014-08-06 14:28:54 +02:00
Jan Steemann dbe107ce65 jslint 2014-08-06 13:50:21 +02:00
Jan Steemann 55e0622e06 throw "real" exceptions when passing bad parameters to update/replace/remove/exists 2014-08-06 13:38:33 +02:00
Michael Hackstein 919f713ca5 Added an upgrade cluster button when cluster is shutdown. And further adoption to asynchronous code 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/clusterDownView.js

Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/collections/clusterShards.js
 2014-08-06 11:48:58 +02:00
Heiko Kernbach abf221ed82 merge 2014-08-06 09:36:13 +02:00
Heiko Kernbach 2d1c62903d prep for import and export of aql queries 2014-08-06 09:35:45 +02:00
Michael Hackstein 4a815d6730 Added automatic retry file to karma tests 2014-08-06 09:20:55 +02:00
Michael Hackstein ba08d7e5fd Fixed a bug in cluster dashboard, which made it impossible to view the dashboard for a multi machine cluster. #883 2014-08-06 09:18:28 +02:00
Michael Hackstein 53abe18fe5 Fixed cluster dashboard on server failure 2014-08-06 09:18:19 +02:00
Michael Hackstein b3dedc10c9 Fixed a redircetion bug (Dead Coordinator -> Revive Coordinator -> Dead Coordinator -> Revive Coordinator) did not load cluster interface twice 2014-08-06 09:18:00 +02:00
Michael Hackstein 15f535ed61 Fixed a bug with retrying whenever the connection was lost 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/collections/clusterShards.js
 2014-08-06 09:17:34 +02:00
Michael Hackstein 2a9c88e85b Added unreachable view 2014-08-06 09:16:50 +02:00
Michael Hackstein db5b7c2086 If no coordinator is available the interface will tell you. Screen needs to be prettified. Still some issues when interface comes back, null-pointer exceptions 2014-08-06 09:16:36 +02:00
Michael Hackstein 7aa7697ded Continued implementing async functionality in cluster dashboard 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/showClusterView.js
 2014-08-06 09:16:08 +02:00
Michael Hackstein 06e9a949d5 Cluster Servers and Coordinators are now working async. It is now possible to contact a cluster even if some of the coordinators are down 2014-08-06 09:14:42 +02:00
Michael Hackstein 9d85b25674 Started moving synchronous cluster implementation to asynchronous one. Synchronous is broken on some browsers as soon as one coordinator is dead 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/showClusterView.js
 2014-08-06 09:14:28 +02:00
Jan Steemann c7e2ccee51 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-08-05 10:13:03 +02:00
Jan Steemann 3a4cf3eac5 added derived file 2014-08-05 10:12:32 +02:00
Heiko Kernbach 21629e8284 karma jslint 2014-08-01 20:44:13 +02:00
Heiko Kernbach d3af798a5c karma jslint error 2014-08-01 20:40:18 +02:00
Heiko Kernbach 342c8f00d8 added missing karma config entries 2014-08-01 20:38:47 +02:00
Heiko Kernbach b477843b27 added model, collection, view, css for custom query storage 2014-08-01 20:20:01 +02:00
Heiko Kernbach bef094db2e merge 2014-08-01 18:20:44 +02:00
Heiko Kernbach acecadb2e1 jslint fixes 2014-08-01 18:20:28 +02:00
Heiko Kernbach 9ead031a73 added visual feedback for user editing a document or edge 2014-08-01 18:16:06 +02:00
Max Neunhoeffer 390f0fe605 Implement distributeShardsLike 2014-08-01 17:05:04 +02:00
Heiko Kernbach 5700394a69 fixed specs for documentsViewSpec 2014-08-01 15:15:56 +02:00
Heiko Kernbach 3b51bbe26f fixed and cleaned up tooltips 2014-08-01 15:01:22 +02:00
Heiko Kernbach 5abdc1e4b4 removed console log 2014-08-01 14:39:28 +02:00
Heiko Kernbach ad318b0ab9 fixed karma spec 2014-08-01 14:35:32 +02:00
Heiko Kernbach 1f41d215fd fixed divider bug in dbSelectionView templaet 2014-08-01 14:26:15 +02:00
Heiko Kernbach ff3d95746f changed keywords in aql-theme for ace editor 2014-07-31 19:10:49 +02:00
Heiko Kernbach 4a3796186d added new functions and keywords into aql theme for ace editor 2014-07-31 18:40:41 +02:00
Heiko Kernbach 198b152970 fixed dbselectionviewspec 2014-07-31 18:25:33 +02:00
Heiko Kernbach cee3035d70 manage dbs: removed unnecessary divider if not needed 2014-07-31 17:53:09 +02:00
Heiko Kernbach ad51f9797f changed Graph Management label to Graphs 2014-07-31 17:47:30 +02:00
Heiko Kernbach 134975f5f1 changed copyright to arangodb gmbh 2014-07-31 17:37:46 +02:00
Michael Hackstein 83d49c0d9d Fixed a minor bug where it was not allowed to remove a vertex from a graph by its key 2014-07-30 09:41:57 +02:00
Alan Plum 0f5c65e636 gharial: added missing body params. 2014-07-25 16:23:34 +02:00
Alan Plum edccd22286 Fixed aardvark config not showing falsey defaults and formatting. 2014-07-25 15:36:45 +02:00
Heiko Kernbach 83ccb3c339 changed lib to minified version 2014-07-24 14:14:05 +02:00
Heiko Kernbach a09f66cb4f fixed select2 modal bug 2014-07-24 14:06:06 +02:00
Heiko Kernbach 796b407d51 moved back to previous version 2014-07-24 14:05:51 +02:00
Heiko Kernbach e7f4d396a6 new select2 version, fixed a bug where using backspace results in frontend inusability 2014-07-24 10:38:01 +02:00
Jan Steemann 2943ac073c added derived file 2014-07-24 09:15:13 +02:00
Frank Celler 5f695d327b Merge pull request #942 from triAGENS/enjoi-all-the-apps 
Convert gharial and aardvark to joi
 2014-07-23 20:25:57 +02:00
Alan Plum 28cd18a8dd Linting. 2014-07-23 19:41:59 +02:00
Alan Plum 9e13e84b31 Workaround for booleans-as-numbers (thank you, PHP). 2014-07-23 17:05:04 +02:00
Alan Plum 760938c238 Removed unused pathParam to prevent breakage. 2014-07-23 11:20:35 +02:00
Alan Plum 9d752c951f Converted gharial and aardvark to joi. 2014-07-23 11:20:35 +02:00
Max Neunhoeffer a8e3236560 Snapshot, legend cache started. 2014-07-22 16:59:19 +02:00
Michael Hackstein 330e73289a The application view will now always sort your apps by name 2014-07-22 13:35:49 +02:00
Michael Hackstein 472240948a Fixed JSLint warning in gharial 2014-07-21 14:41:34 +02:00
Michael Hackstein 05a6760adb Fixed return code in gharial, when trying to delete a non existing vertex collection. 2014-07-21 10:23:54 +02:00
Michael Hackstein 2999212360 Added a more elaborate spy on the App in cluster view tests 2014-07-18 16:59:55 +02:00
Michael Hackstein dc2ba5391b Fixed indention of spec 2014-07-18 16:53:17 +02:00
Michael Hackstein 135a447c67 Removed unnecessary deletion of values in tests. Might have sideeffects 2014-07-18 16:52:56 +02:00
Michael Hackstein b13149ea5f Removed pointless logging 2014-07-18 15:12:01 +02:00
Michael Hackstein f0fc951089 Impoved spies in routerSpec and fixed indention in router 2014-07-18 14:57:58 +02:00
Michael Hackstein 49ef4a57b7 Cleaned up aardvark tests. 2014-07-18 13:20:04 +02:00
Michael Hackstein 6481c3217f Fixed ordering of error responses in gharial 2014-07-18 10:53:52 +02:00
Michael Hackstein 6736098790 Improved spies in router spec 2014-07-18 09:11:27 +02:00
Michael Hackstein ac84c9f8ef Cleaned up window.App after test cases 2014-07-17 16:38:18 +02:00
clintwood (Office) abe72bec38 AQL Syntax: Added AQL data modification keywords to syntax highlighting. 2014-07-17 15:54:56 +02:00
clintwood (Office) fb0a309b3c AQL Editor: Query only on selected text if a selection exists. 2014-07-17 15:54:47 +02:00
clintwood (Office) f28e829586 Fix: Save (Update) on AQL query editor will now persist changed query text. 2014-07-17 15:47:51 +02:00
Michael Hackstein 679996d5b4 Properly cleaning up the modal dialog after tests now 2014-07-16 15:39:45 +01:00
Michael Hackstein 85f3c7a447 Added some tests for applications overview. 2014-07-16 15:39:16 +01:00
Michael Hackstein 5df8cf0896 Fixed a minor mistake where it was not possible to install a foxx App 2014-07-16 15:11:43 +01:00
Michael Hackstein 06599c6e41 Added some more tests for gharial adapter 2014-07-16 13:33:21 +01:00
Michael Hackstein 1d824226e7 Added test for te version check to not trigger the update dialog if version is devel 2014-07-16 13:32:57 +01:00
Michael Hackstein b23e0e6cbb Readded deactivated test for moduarity joiner in frontend. 2014-07-16 13:31:57 +01:00
Michael Hackstein ae68358dec Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-16 12:51:34 +01:00
Michael Hackstein 871db072e7 Added tests for gharial error return codes. Fixed a bug pn false return code on the way 2014-07-16 11:04:39 +01:00
gschwab 2e878bfde0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-16 09:31:17 +02:00
gschwab ea1d653836 fixed jslint 2014-07-16 09:31:08 +02:00
Frank Celler 70825ae10a fixed V8 compiler for ARM 
Conflicts:
	CHANGELOG
 2014-07-15 20:30:16 +02:00
Frank Celler 6ec2cf2a3c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-15 20:20:42 +02:00
Michael Hackstein 3ecae27acd Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-15 16:57:33 +01:00
Michael Hackstein db33dd22d2 Fixed a minor bug in gharial where there was no correct error code was thrown when trying to store a vertex in a non existing graph. Also allowed the _create method of graph module to take options like waitForSync 2014-07-15 16:57:24 +01:00
gschwab 9b22e50648 added some css, html and checks 2014-07-15 13:14:33 +02:00
Heiko Kernbach 3293208b6a fixed graphviewer navigation 2014-07-11 13:54:48 +02:00
scottashton ba2d7a7745 collapse edge definitions when graph is created 2014-07-11 13:30:03 +02:00
Frank Celler cf81e3ff00 generate .cpp file instead of .c file 2014-07-10 19:13:12 +02:00
Michael Hackstein e43caaea0d FIxed tests for cluster down view 2014-07-10 16:39:49 +02:00
Michael Hackstein 6f017e2920 Added a specific cleanup when deleting cluster plan or midifying it 2014-07-10 11:41:31 +02:00
Michael Hackstein ca959a0653 Added a test that the graph viewer is not loaded for graphs without edge definitions 2014-07-10 09:51:33 +02:00
Michael Hackstein a6bf48831b Fixed #941. Showing a collection did send a count request, as well as a fullCount for the query. fullCount in this case is superflous and has been removed. On the way fixed an issue with the number of documents not updating while filtering. 2014-07-10 09:33:05 +02:00
Michael Hackstein 9beab0aaff It is no longer possible to view graphs having no edge definitions 2014-07-09 16:40:36 +02:00
Michael Hackstein 47c8f709a9 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-09 15:15:39 +02:00
Michael Hackstein 5d90ffef37 Fixed parameter types for boolean query parameter. Fixed return code for edge creation. 400 is thrown on invalid edge, 404 is thrown if collection or graph not found 2014-07-09 15:15:25 +02:00
scottashton c6a5425930 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-09 14:43:15 +02:00
scottashton 267c8ba451 minor fixes in gharial and ahuacatl 2014-07-09 14:43:06 +02:00
Michael Hackstein 74c8752d97 Fixes false positioning of edge #894. Tested in FF, Chrome, Safari, IE11 (all newest versions) 2014-07-09 12:19:22 +02:00
Michael Hackstein 1f795fec66 Improved gharial and general graph documentation. Gharial now documents waitForSync, keepNull and if-match 2014-07-08 17:18:15 +02:00
Michael Hackstein f763f0aa13 Added an error for the graph module. It will be thrown on the attempt to add an orphan collection that is already used. Also alloed orphan collections for restrictions in fluentAQL 2014-07-08 13:53:39 +02:00
Michael Hackstein aeacb9279a Fixed a problem with waitForSync parameter. Returned type is string, not boolean as expected 2014-07-08 13:08:09 +02:00
Michael Hackstein 3f6e1c3555 Unified gharial error responses with normal API 2014-07-08 10:46:18 +02:00
Michael Hackstein b67a016b4c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-08 08:03:12 +02:00
Michael Hackstein 3f7e2a7b76 Fixed failing gharial examples 2014-07-08 08:03:03 +02:00
Frank Celler 793f7e8859 generated files 2014-07-07 18:46:39 +02:00
Michael Hackstein 7383fc4fdd Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-07 15:18:39 +02:00
Michael Hackstein 72a9b7e5aa Added waitForSync support for creation of vertices and edges in gharial 2014-07-07 15:18:35 +02:00
scottashton 64a72ed12b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-07 14:22:41 +02:00
scottashton c5bfe5a33c changed gharial to match php api 2014-07-07 14:21:58 +02:00
Michael Hackstein a9a8efb14b Fixed documentation of gharial. Status code assertion did fail due to waitForSync parameter 2014-07-07 09:51:05 +02:00
Michael Hackstein 4701ad8635 Fixed tests for document view. Frontend should be green again 2014-07-07 09:41:39 +02:00
Michael Hackstein 8fe6f0260d Fixed sorting of documents to use internal total function 2014-07-07 09:31:54 +02:00
Michael Hackstein c588a1ca4c Fixed tests for documents view in admin interface. there was some functionality missing thx @jsteemann 2014-07-07 09:17:30 +02:00
Jan Steemann e0920209f7 added generated file 2014-07-06 15:27:02 +02:00
Frank Celler 40edb310f2 generated files 2014-07-06 13:43:53 +02:00
Jan Steemann c12df38eb2 fixed broken examples 2014-07-06 02:25:19 +02:00
Jan Steemann 0b4040265f added derived files 2014-07-06 00:46:03 +02:00
Jan Steemann 64916fd9d8 next attempt 2014-07-05 16:25:35 +02:00
Jan Steemann dce300224c attempt to fix test 2014-07-05 16:19:10 +02:00
Jan Steemann aba9fd431f web interface didn't update the view after filtering documents 2014-07-05 14:43:30 +02:00
Jan Steemann cbf7e27f68 added derived files 2014-07-03 17:12:56 +02:00
Michael Hackstein 202deaae85 Fixed issues in gharial module. By default the do not wait for sync http codes are returned. You can now optionally send waitForSync true to all modifying endpoints 2014-07-03 10:53:18 +02:00
Michael Hackstein 7b22c0c2a5 Added a correct 404 return code to gharial when trying to remove a vertex/edge which does not exists. Also added tests for return codes 2014-07-02 15:03:06 +02:00
Michael Hackstein 75059ac757 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-02 14:16:28 +02:00
Michael Hackstein 0ad3a34266 Added a simple get graph function to gharial. 2014-07-02 14:07:12 +02:00
Michael Hackstein 2fd21ceac5 Improved router spec. It now checks for correct width send on resize 2014-07-02 10:29:56 +02:00
Jan Steemann eae94f97a8 removed dead code 2014-07-02 00:21:58 +02:00
Jan Steemann 0a230b77e3 jshund 2014-07-02 00:17:25 +02:00
Michael Hackstein aac1d3ecde Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-01 16:52:21 +02:00
Michael Hackstein fd635bddc0 Reactivated and fixed cluster frontend tests 2014-07-01 16:52:15 +02:00
Jan Steemann a5cf53d417 fixed examples 2014-07-01 16:48:47 +02:00
Alan Plum 1624c6a1b8 Formatting. 2014-07-01 15:08:38 +02:00
Alan Plum ab4e208e7d Simplified config value validation in aardvark. 2014-07-01 14:41:03 +02:00
Alan Plum 1d497135cf Allow specifying config options when mounting apps in aardvark. 2014-07-01 14:35:08 +02:00
Jan Steemann 815bb8480a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-01 13:12:47 +02:00
Jan Steemann 4cd20bfb7c fixed syncs across multiple files 2014-07-01 13:12:36 +02:00
gschwab 0d9ef4892c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-01 11:47:38 +02:00
gschwab 8e3b800a69 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
 2014-07-01 11:47:28 +02:00
Michael Hackstein 8e1680340d Fixed indention and minor errors in cluster specs 2014-07-01 11:35:01 +02:00
scottashton fe8665d682 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-01 10:31:57 +02:00
scottashton 8c211c41c2 more tests 2014-07-01 10:31:53 +02:00
Michael Hackstein a387964ca2 Added Spec files to make JSLINT and fixed all errors in these files 2014-07-01 09:34:01 +02:00
scottashton 422c102e34 tests for graph model 2014-07-01 09:12:10 +02:00
Michael Hackstein 11a2f23c2b Fixed a bug in graph viewer to list the label attribute 2014-06-30 17:19:13 +02:00
Michael Hackstein 9762c20424 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-30 16:51:56 +02:00
Michael Hackstein 7944301f2e Fixed requesting of random vertices in graph viewer. Warning for empty graph will now displayed only if the graph is really empty, not on bad luck 2014-06-30 16:51:29 +02:00
scottashton ed7ef4fa80 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 16:27:56 +02:00
scottashton 53a676e387 graphManagement covered 2014-06-30 16:27:52 +02:00
gschwab 58ea71bba1 removed comments 2014-06-30 16:19:58 +02:00