diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c098617470..3fe83782c9 100644
--- a/CONTRIBUTING.md
+++ b/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/)
diff --git a/README b/README
index 4bd84bec7a..0c25ff101b 100644
--- a/README
+++ b/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
-
diff --git a/README.md b/README.md
index 6cf5de4e4a..206d174c6b 100644
--- a/README.md
+++ b/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
-
diff --git a/UnitTests/HttpInterface/api-graph-spec.rb b/UnitTests/HttpInterface/api-graph-spec.rb
index 75d49f8b8f..05032f47b9 100644
--- a/UnitTests/HttpInterface/api-graph-spec.rb
+++ b/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
diff --git a/html/admin/index.html b/html/admin/index.html
index aed008ed41..6aa05c9576 100644
--- a/html/admin/index.html
+++ b/html/admin/index.html
@@ -513,7 +513,7 @@
diff --git a/html/admin/media/icons/uservoice.png b/html/admin/media/icons/uservoice.png
deleted file mode 100644
index 3f529e5f2d..0000000000
Binary files a/html/admin/media/icons/uservoice.png and /dev/null differ
diff --git a/js/client/client.js b/js/client/client.js
index c834839934..755063abb1 100755
--- a/js/client/client.js
+++ b/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);
}
}
diff --git a/js/common/bootstrap/module-internal.js b/js/common/bootstrap/module-internal.js
index 00bcae9954..e3e549b474 100644
--- a/js/common/bootstrap/module-internal.js
+++ b/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
diff --git a/js/server/modules/org/arangodb/ahuacatl.js b/js/server/modules/org/arangodb/ahuacatl.js
index 3a87e163d4..c89a8126e9 100644
--- a/js/server/modules/org/arangodb/ahuacatl.js
+++ b/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;
}
////////////////////////////////////////////////////////////////////////////////
diff --git a/js/server/modules/org/arangodb/graph.js b/js/server/modules/org/arangodb/graph.js
index 035d9a37a4..d4edda6408 100644
--- a/js/server/modules/org/arangodb/graph.js
+++ b/js/server/modules/org/arangodb/graph.js
@@ -585,13 +585,14 @@ function Graph (name, vertices, edges) {
}
}
else {
- if (graphProperties.vertices !== vertices.name()) {
- throw "found graph but has different ";
- }
+ throw "graph with that name already exists";
+ //if (graphProperties.vertices !== vertices.name()) {
+ // throw "found graph but has different ";
+ //}
- if (graphProperties.edges !== edges.name()) {
- throw "found graph but has different ";
- }
+ //if (graphProperties.edges !== edges.name()) {
+ // throw "found graph but has different ";
+ //}
}
}
