Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

CONTRIBUTING.md

@@ -8,8 +8,8 @@ Please follow these guidelines if you want to contribute to ArangoDB:
 * Please make sure you have a GitHub account
 * Please look into the ArangoDB issue tracker on GitHub for similar/identical issues
 * For bugs: if the bug you found is not yet described in an existing issue, please file a new one. The new issue should include a clear description of the bug and how to reproduce it (including your environment)
+* For feature requests: please clearly describe the proposed feature, additional configuration options, and side effects
 * Please let us know if you plan to work an a ticket. This way we can make sure we avoid redundant work
-* For feature requests: feature requests should be directed to our feature request & voting system at arangodb.uservoice.com
 
 * Create a fork our repository. You can use GitHub to do this
 * Clone the fork to your development box and pull the latest changes from the ArangoDB repository. Please make sure to use the appropriate branch:
@@ -41,6 +41,5 @@ This will help us reproducing and finding bugs.
 
 * [ArangoDB website](https://www.arangodb.org/)
 * [ArangoDB on Twitter](https://twitter.com/arangodb)
-* [ArangoDB feature requests](https://uservoice.arangodb.com)
 * [General GitHub documentation](https://help.github.com/)
 * [GitHub pull request documentation](https://help.github.com/send-pull-requests/)

README

@@ -84,11 +84,7 @@ them:
 
   https://github.com/triAGENS/ArangoDB/issues
 
-You can use the Google group for questions concerning ArangoDB:
+You can use the Google group for improvements, feature requests, comments 
 
   http://www.arangodb.org/connect
 
-For feature requests, please use our feature request tracking & voting system at:
-
-    http://arangodb.uservoice.com
-

README.md

@@ -85,11 +85,7 @@ you report them:
 
     https://github.com/triAGENS/ArangoDB/issues
 
-You can use the Google group for questions concerning ArangoDB:
+You can use the Google group for improvements, feature requests, comments 
 
     http://www.arangodb.org/connect
 
-For feature requests, please use our feature request tracking & voting system at:
-
-    http://arangodb.uservoice.com
-

UnitTests/HttpInterface/api-graph-spec.rb

@@ -136,7 +136,7 @@ describe ArangoDB do
         doc1.code.should eq(201)
 
         doc2 = create_graph( prefix, "recreate", vertex_collection, edge_collection )
-        doc2.code.should eq(201)
+        doc2.code.should eq(400)
       end
 
       it "checks (re)create graph different name" do

html/admin/index.html

@@ -513,7 +513,7 @@
         <div id="footerCenter">
           ArangoDB<br />
           <div id="footerCenterContent">
-            <a> Stay in touch: </a><a href="https://twitter.com/arangodb" target="_blank"><img src="/_admin/html/media/icons/twitter.png" width="32" height="32"></a><a href="https://github.com/triAGENS/ArangoDB" target="_blank"><img src="/_admin/html/media/icons/git.png" width="32" height="32"></a><a href="https://www.arangodb.org" target="_blank"><img src="/_admin/html/media/icons/arangodb32.png" width="32" height="32"></a><a href="https://groups.google.com/group/arangodb" target="_blank"><img src="/_admin/html/media/icons/google.png" width="32" height="32"></a><a href="https://arangodb.uservoice.com" target="_blank"><img src="/_admin/html/media/icons/uservoice.png" width="32" height="32"></a>
+            <a> Stay in touch: </a><a href="https://twitter.com/arangodb" target="_blank"><img src="/_admin/html/media/icons/twitter.png" width="32" height="32"></a><a href="https://github.com/triAGENS/ArangoDB" target="_blank"><img src="/_admin/html/media/icons/git.png" width="32" height="32"></a><a href="https://www.arangodb.org" target="_blank"><img src="/_admin/html/media/icons/arangodb32.png" width="32" height="32"></a><a href="https://groups.google.com/group/arangodb" target="_blank"><img src="/_admin/html/media/icons/google.png" width="32" height="32"></a>
           </div>
         </div>
 

js/client/client.js

@@ -104,7 +104,7 @@ function clear () {
   if (internal.ARANGO_QUIET !== true) {
     if (typeof internal.arango !== "undefined") {
       if (typeof internal.arango.isConnected !== "undefined") {
-        if (internal.arango.isConnected() && typeof SYS_UNIT_TESTS == "undefined") {
+        if (internal.arango.isConnected() && typeof SYS_UNIT_TESTS === "undefined") {
           internal.print(arangosh.HELP);
         }
       }

js/common/bootstrap/module-internal.js

@@ -733,7 +733,7 @@
   internal.startCaptureMode = function () {
     internal.outputBuffer = "";
     internal.output = internal.bufferOutput;
-  }
+  };
  
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief stop capture mode
@@ -746,7 +746,7 @@
     internal.output = internal.stdOutput;
 
     return buffer;
-  }
+  };
  
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief start color printing

js/server/modules/org/arangodb/ahuacatl.js

@@ -2864,21 +2864,23 @@ function GRAPH_TRAVERSAL_TREE (vertexCollection,
 function GRAPH_EDGES (edgeCollection, 
                       vertex, 
                       direction) {
-  var c = COLLECTION(edgeCollection);
+  var c = COLLECTION(edgeCollection), result;
 
   // validate arguments
   if (direction === "outbound") {
-    return c.outEdges(vertex);
+    result = c.outEdges(vertex);
   }
   else if (direction === "inbound") {
-    return c.inEdges(vertex);
+    result = c.inEdges(vertex);
   }
   else if (direction === "any") {
-    return c.edges(vertex);
+    result = c.edges(vertex);
   }
   else {
     THROW(INTERNAL.errors.ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH, "EDGES");
   }
+
+  return result;
 } 
 
 ////////////////////////////////////////////////////////////////////////////////

js/server/modules/org/arangodb/graph.js

@@ -585,13 +585,14 @@ function Graph (name, vertices, edges) {
       }
     }
     else {
-      if (graphProperties.vertices !== vertices.name()) {
+      throw "graph with that name already exists";
-        throw "found graph but has different <vertices>";
+      //if (graphProperties.vertices !== vertices.name()) {
-      }
+      //  throw "found graph but has different <vertices>";
+      //}
 
-      if (graphProperties.edges !== edges.name()) {
+      //if (graphProperties.edges !== edges.name()) {
-        throw "found graph but has different <edges>";
+      //  throw "found graph but has different <edges>";
-      }
+      //}
     }
   }