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

3904 Commits

Author SHA1 Message Date
Claudius Weinberger bbc81f92a8 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 17:47:20 +01:00
Michael Hackstein ff17b1303d Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 17:31:51 +01:00
Michael Hackstein 81a08bf66d Implemented redirecter for index.html 2014-02-28 17:31:46 +01:00
gschwab 24e23f9a7b Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 17:10:03 +01:00
gschwab 225d1297f1 fixed multicluster bug 2014-02-28 17:09:57 +01:00
Claudius Weinberger 3a7beaf832 a few changes at the navigationbar 2014-02-28 16:34:30 +01:00
Max Neunhoeffer ab04e19702 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 16:27:00 +01:00
Max Neunhoeffer 1c2858f80a Hand on authorization header in dispatcher and planner action. 2014-02-28 16:26:34 +01:00
gschwab baf0e25448 provided model as argument 2014-02-28 15:58:31 +01:00
Max Neunhoeffer 75890f183a Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 15:38:51 +01:00
Max Neunhoeffer 7544adcc8d Fix JS testing framework with new path setup. 2014-02-28 15:38:25 +01:00
gschwab 0ec595162f pimped clusterDown view 2014-02-28 15:37:35 +01:00
Michael Hackstein fa8995a903 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 15:13:22 +01:00
Michael Hackstein 7ab394c7ad Removed relinking of index to cluster 2014-02-28 15:13:19 +01:00
Max Neunhoeffer 423bec9a2b Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 15:11:18 +01:00
Max Neunhoeffer f3095dbaf7 Servers in cluster are not themselves dispatchers. 2014-02-28 15:10:42 +01:00
Michael Hackstein e3dc0f29e2 The interfaces will now redirect based on their arangos rule: Dispatchers point to cluster.html, all others point to index.html 2014-02-28 15:01:38 +01:00
Max Neunhoeffer 9939b46a16 Disable dispatcher on servers in cluster. 2014-02-28 14:56:28 +01:00
Max Neunhoeffer 6393030f20 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 14:43:45 +01:00
Max Neunhoeffer c358c677b0 Fix typo. 2014-02-28 14:43:35 +01:00
Michael Hackstein d683c30b2f Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 14:32:56 +01:00
Michael Hackstein c6e644a07a THe Cluster planner will now always point to base path independent of bookmarks. So it is not possible that events are not set 2014-02-28 14:32:51 +01:00
scottashton 6c4bbd28c8 added dashboard to showClusterView 2014-02-28 14:32:43 +01:00
scottashton edb061aa90 added dashboard to showClusterView 2014-02-28 14:31:17 +01:00
Michael Hackstein be9bfd0244 Removed debug console logs 2014-02-28 14:23:10 +01:00
Michael Hackstein 11d65be9f1 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 14:20:31 +01:00
Michael Hackstein 94c43cceba DBServer/Coordinator Stati are now updated properly 2014-02-28 14:20:25 +01:00
Max Neunhoeffer 0a8555fab3 Sort out path to javascript files. 2014-02-28 14:19:04 +01:00
Michael Hackstein 799fc918ef Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 13:52:28 +01:00
Michael Hackstein bc40cc5113 Started to fix rerendering / reloading bug in cluster dashboard 2014-02-28 13:52:13 +01:00
Jan Steemann 4615310e97 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 13:50:56 +01:00
Jan Steemann fd08bb0feb use indexes in AQL 2014-02-28 13:50:39 +01:00
Michael Hackstein 4c2e021254 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 13:47:02 +01:00
Michael Hackstein cd92c69d8a Fixed route to plan and start clusters 2014-02-28 13:46:44 +01:00
gschwab c8c2df0f07 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 13:34:34 +01:00
gschwab 07bc9128b9 global wait dialog for long-time operations 2014-02-28 13:34:18 +01:00
Max Neunhoeffer 0dec16279c Fix missing require for base64Encode. 2014-02-28 13:17:32 +01:00
Max Neunhoeffer c342713481 Create logPath directory in kickstarter if not already there. 2014-02-28 12:28:05 +01:00
Max Neunhoeffer eb62ca7f54 Fix name. 2014-02-28 12:19:19 +01:00
Max Neunhoeffer d201cdbd03 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 12:16:13 +01:00
Max Neunhoeffer 454f86ef01 New setup of paths on cluster kickstarter. 2014-02-28 12:15:31 +01:00
Michael Hackstein 543a65a5e0 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 12:09:20 +01:00
Michael Hackstein 352ccf903f Fixed js error in kickstarter 2014-02-28 12:09:08 +01:00
Frank Celler f22f1525d2 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	etc/relative/arangod.conf
 2014-02-28 12:03:11 +01:00
Frank Celler 9a410a5b71 added config for server state 2014-02-28 12:02:21 +01:00
Max Neunhoeffer 0ede95adb8 Hand on authorization information to other dispatchers. 2014-02-28 11:49:43 +01:00
Max Neunhoeffer 05055f3d5d Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 11:41:01 +01:00
gschwab 4340d7e2bb renamed button from 'Create Cluster' to 'Launch Cluster' 2014-02-28 11:11:23 +01:00
gschwab 1291e7e0d2 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 11:09:27 +01:00
gschwab 87c44e49c0 changed icon, its size and position 2014-02-28 11:09:18 +01:00
Jan Steemann c4cfe7a2ea fixed AQL geo queries 2014-02-28 10:26:31 +01:00
Max Neunhoeffer 10aec4ec4d Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 10:00:14 +01:00
gschwab 6b5ef57249 changed images for different cluster scenarios and changed default values for single machine 2014-02-28 09:56:54 +01:00
Jan Steemann b79313e697 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 09:56:53 +01:00
Jan Steemann e505a99a4e fixed fulltext query 2014-02-28 09:56:44 +01:00
gschwab ca00b64133 changed order of cluster scenarios 2014-02-28 09:51:09 +01:00
gschwab 7981eed626 buttons and corresponding functionality deleted 2014-02-28 09:48:19 +01:00
Michael Hackstein 9cfc2dbfb6 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/routers/clusterRouter.js
 2014-02-28 09:39:07 +01:00
Michael Hackstein d403e69486 Fixed relaunch and shutdown and dsiplay of testPlan if a plan is existent and loading 2014-02-28 09:38:25 +01:00
Max Neunhoeffer b61dfa3c12 Cleanup results of launch and friends in kickstarter. 
Add allowAgents option for dispatchers.
 2014-02-28 09:31:16 +01:00
Jan Steemann 65feb43294 adjusted test expectations 2014-02-28 09:29:52 +01:00
Jan Steemann c04377e4cd Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 08:59:48 +01:00
Frank Celler cb15de59f7 Merge branch '2.0' of github.com:triAGENS/ArangoDB into sharding 2014-02-27 22:41:06 +01:00
Frank Celler 08ed329ae6 removed wrong app 2014-02-27 22:02:58 +01:00
Jan Steemann 78b4f712f2 temporarily disable failing assertion 2014-02-27 20:12:17 +01:00
Frank Celler d0a1e6b123 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into 2.0 2014-02-27 18:50:38 +01:00
Jan Steemann 8897f2e040 fixed jslint warnings 2014-02-27 18:03:28 +01:00
Jan Steemann e9c6f17594 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 17:45:31 +01:00
Jan Steemann 897d6f4dcd fixed cluster authentication 2014-02-27 17:45:03 +01:00
scottashton ef0ba2c800 created new dashboard route in showClusterView 2014-02-27 17:44:15 +01:00
scottashton c8856ab3f6 created new dashboard route in showClusterView 2014-02-27 17:41:15 +01:00
Frank Celler f9d1562c5e Merge branch 'sharding' of github.com:triAGENS/ArangoDB into 2.0 2014-02-27 17:38:52 +01:00
scottashton 616dd60028 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 17:12:33 +01:00
gschwab 89c784361c handle cluster shutdown 2014-02-27 17:12:30 +01:00
scottashton a0fbfeba19 added dashboard view to cluster 2014-02-27 17:12:28 +01:00
gschwab 001551dc9e Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 16:52:24 +01:00
gschwab 5eca05b858 shutdown action added 2014-02-27 16:52:19 +01:00
Frank Celler 9a6d2e3f84 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into 2.0 2014-02-27 16:51:18 +01:00
Michael Hackstein 73bf22a285 Routes to cluster collections and shards are now fixed and updated 2014-02-27 16:48:41 +01:00
gschwab e633c24fd1 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 16:35:32 +01:00
gschwab 9db0f3105a route fixed 2014-02-27 16:35:27 +01:00
Max Neunhoeffer 2ca78ea168 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-27 16:21:28 +01:00
Max Neunhoeffer a0e187cc29 Finish sharding chapter in user documentation. 2014-02-27 16:20:53 +01:00
scottashton 49d5d3efae Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 16:12:06 +01:00
scottashton 56eea1463c refactoring dashboard 2014-02-27 16:11:34 +01:00
Michael Hackstein 461e07a66b The overview is now partly active and working. Routes for DBS and sharoders are broxorn 2014-02-27 16:01:38 +01:00
Michael Hackstein 6169e326a4 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 15:45:25 +01:00
Michael Hackstein 1d556efec6 Added merge and updated reloading of routes in the collections 2014-02-27 15:44:45 +01:00
gschwab 0cd8ad48cb added some stuff 2014-02-27 15:44:01 +01:00
gschwab faa780f932 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 15:41:46 +01:00
gschwab 5ce2db85be blub 2014-02-27 15:41:40 +01:00
Jan Steemann ed43b0cce9 jslint 2014-02-27 14:58:53 +01:00
Michael Hackstein 452789c730 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 14:44:53 +01:00
Michael Hackstein d716c0b593 Added correct routes to frontend. Models and collections todo. Info may now be collected from one coordinator 2014-02-27 14:44:50 +01:00
Jan Steemann 242b31a1ab Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 14:21:03 +01:00
Jan Steemann 4bab2cbf35 fixed queries 2014-02-27 14:20:57 +01:00
Michael Hackstein 7ed4f7c602 Added foxx routes for cluster and dispatchers, they are now cluster resp. dispatcher only 2014-02-27 14:13:13 +01:00
Max Neunhoeffer 8659f0569e Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-27 13:55:02 +01:00
Max Neunhoeffer 4c495ae297 Only use one agent ==> incredible speedup. 2014-02-27 13:54:41 +01:00
scottashton b89beee791 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 13:51:59 +01:00
scottashton 61abe8a789 refactoring dashboard 2014-02-27 13:51:49 +01:00
Frank Celler b50e0cba84 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-27 13:32:12 +01:00
Frank Celler ce3f8ba45b added dispatcherDisabled check 2014-02-27 13:32:06 +01:00
Frank Celler dc7f16e2ae release version 2.0.0-alpha1 2014-02-27 13:28:13 +01:00
Jan Steemann 5660d6419a Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 13:27:00 +01:00
Jan Steemann c387b697e8 fixed test 2014-02-27 13:26:40 +01:00
Frank Celler 3c992b0bbe removed old files 2014-02-27 13:16:54 +01:00
Max Neunhoeffer 37908e7c00 Please jshund. 2014-02-27 11:59:40 +01:00
Max Neunhoeffer 74eb4ed39c Fix isHealthy check. 2014-02-27 11:49:45 +01:00
Max Neunhoeffer a1614f759c Take out etcd steroids. 2014-02-27 11:41:33 +01:00
Max Neunhoeffer 0009020e5d Rename etcd executable to etcd-arango 2014-02-27 11:40:37 +01:00
Max Neunhoeffer 23ea910235 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-27 10:55:24 +01:00
Jan Steemann 157df03f66 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 10:53:15 +01:00
gschwab 2833b9200e Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 10:51:34 +01:00
gschwab d7d41d7ca5 merged project planner into cluster 2014-02-27 10:51:27 +01:00
Jan Steemann 4de0014ed3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 10:51:20 +01:00
Jan Steemann 1209298476 fixed client tests 2014-02-27 10:49:29 +01:00
Max Neunhoeffer 135f9b26ac Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-27 09:20:40 +01:00
Frank Celler e10bab8059 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-27 09:16:02 +01:00
Frank Celler 8406f51435 Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	CHANGELOG
	VERSION
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/Ahuacatl/ahuacatl-codegen.c
	build.h
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/graph/traversal.js
	js/common/modules/org/arangodb/graph/traversal.js
	js/server/modules/org/arangodb/ahuacatl.js
	lib/HttpServer/HttpCommTask.h
 2014-02-27 09:13:03 +01:00
Max Neunhoeffer 64558d76e0 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-27 09:00:41 +01:00
Max Neunhoeffer 893e7a87b1 Adjust READMEs to reality. 2014-02-27 08:53:21 +01:00
Frank Celler bc56d26ea3 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-27 08:52:27 +01:00
Jan Steemann 3d5149b022 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	arangosh/V8Client/arangosh.cpp
 2014-02-26 21:34:34 +01:00
Jan Steemann f5269fa3de fixed traversals 2014-02-26 21:28:40 +01:00
Jan Steemann 8e44bc80a5 return error if etcd binary is not present 2014-02-26 20:24:20 +01:00
Jan Steemann 85e0a5e9c3 client tests 2014-02-26 20:07:37 +01:00
Jan Steemann 316f23a9b5 fixed invalid test return values 2014-02-26 20:05:01 +01:00
Jan Steemann 6b0f7da114 fix invalid database name 2014-02-26 19:35:18 +01:00
Jan Steemann d420e40e4c jslint 2014-02-26 19:16:40 +01:00
gschwab b89d0ed584 deleted unused icon 2014-02-26 18:13:01 +01:00
gschwab 2d187f1998 default 'active' when creating new user 2014-02-26 17:44:54 +01:00
gschwab 7caed403ff status bar cleaned up 2014-02-26 17:34:30 +01:00
Jan Steemann fe74e030ea fixed keygen test 2014-02-26 16:47:38 +01:00
Frank Celler 4a4fcfd72f Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-26 16:38:47 +01:00
Frank Celler e58c0d00d6 be tolerant 2014-02-26 16:38:39 +01:00
gschwab 51d7f97766 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-26 16:04:06 +01:00
gschwab 1d43106cb0 status bar redesigned 2014-02-26 16:03:55 +01:00
Michael Hackstein 0d958e5bf1 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-26 15:06:54 +01:00
Michael Hackstein f2bddcb140 First version of planner import functionality 2014-02-26 15:06:50 +01:00
Jan Steemann 4bbfdb827d Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-26 15:04:32 +01:00
Jan Steemann 3195da8ff0 use more appropriate assertions 2014-02-26 15:04:15 +01:00
Max Neunhoeffer 89761d5c7e Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-26 14:39:20 +01:00
Max Neunhoeffer bacfafea7f Rename non-cluster tests. 2014-02-26 14:38:55 +01:00
Jan Steemann 2db3d4b42d fixed tests 2014-02-26 14:35:14 +01:00
Max Neunhoeffer d09da8789e Slightly change naming convention for tests. 2014-02-26 14:28:16 +01:00
Max Neunhoeffer 16a2fa6770 Split noncluster and general shell-keygen tests. 2014-02-26 14:27:55 +01:00
Jan Steemann 42465ce876 properly return collection status 2014-02-26 14:23:06 +01:00
Jan Steemann 5c3d81eea3 test split 2014-02-26 13:53:23 +01:00
Jan Steemann 7b9fcf59da documentation 2014-02-26 13:53:07 +01:00
Jan Steemann b634aff8a8 renamed test 2014-02-26 13:45:08 +01:00
Jan Steemann bb0f87cfdc fixed bug in Graph.pathTo 2014-02-26 13:40:08 +01:00
Jan Steemann 276a3cf3a1 added SHORTEST_PATH AQL function, fixed bug in Graph.pathTo 2014-02-26 13:34:42 +01:00
gschwab c737ea0c77 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-26 13:31:59 +01:00
gschwab 70e10e7a84 fixed tooltips 2014-02-26 13:31:20 +01:00
Jan Steemann 8e05df9950 split tests 2014-02-26 13:21:10 +01:00
Jan Steemann ef55d080c5 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-26 13:06:22 +01:00
Jan Steemann 028bf5b94b re-added isvolatile to result 2014-02-26 13:06:14 +01:00
Michael Hackstein 48136b3eaf Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-26 12:51:46 +01:00
Michael Hackstein acbf225e83 Updated the icons in the plan selection view 2014-02-26 12:51:41 +01:00
Max Neunhoeffer 26c8e03272 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-26 11:48:21 +01:00
Max Neunhoeffer 45c4ae13ec Load collection when truncated. 2014-02-26 11:47:41 +01:00
Heiko Kernbach d0503da9d9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-26 11:35:37 +01:00
Heiko Kernbach 3befaff6fc testview incl. template for uploading json 2014-02-26 11:35:09 +01:00
Jan Steemann 27e59aa9a3 do not cache collection status 2014-02-26 11:25:24 +01:00
Jan Steemann 610df5ce35 allow empty examples 2014-02-26 11:22:49 +01:00
Jan Steemann a3cb0423c2 added derived file 2014-02-26 11:07:57 +01:00
Jan Steemann 99a4db23f2 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-26 11:02:19 +01:00
Jan Steemann 96938512c1 return numberOfShards, shardKeys 2014-02-26 11:02:08 +01:00
Max Neunhoeffer 19765bd859 Fix test for deletion of documents on cluster. 2014-02-26 10:48:48 +01:00
Jan Steemann d61a1178a9 fixed undefined variable access 2014-02-26 10:39:36 +01:00
Jan Steemann 24e4ad502f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-26 10:38:26 +01:00
Jan Steemann 24d607c7ee fixed undefined variable access 2014-02-26 10:38:17 +01:00
gschwab d5193c4dd5 fixed tooltips 2014-02-26 10:22:37 +01:00
Max Neunhoeffer 86faf20dbb Disable transactions server test on cluster. 2014-02-26 10:17:05 +01:00
Max Neunhoeffer ff43f0601b Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-26 08:41:28 +01:00
Michael Hackstein bb43b30a84 Clicking on links in the overview will now open new tabs 2014-02-25 18:29:47 +01:00
Michael Hackstein 927a5de782 Added a link to the cluster overview and replaced tcp with http and ssl with https for clickable links 2014-02-25 18:27:46 +01:00
Michael Hackstein 0636233f02 Upgraded the scenario selector and inserted upload of plan buttons, however they are not working yet. Also the test planner now offers usefull defaults in the input fields 2014-02-25 17:49:20 +01:00
Michael Hackstein f28076fdf8 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-25 17:24:44 +01:00
Michael Hackstein b30eb6b051 Added stubs to upload the cluster info, it is not working yet 2014-02-25 17:24:39 +01:00
Jan Steemann 23ba186b0d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/CapConstraint/cap-constraint.c
	js/apps/system/aardvark/frontend/scss/_tiles.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/frontend/scss/style.scss
	js/common/modules/org/arangodb/users-common.js
 2014-02-25 17:21:14 +01:00
Jan Steemann 2ec6dc1997 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-25 17:05:09 +01:00
Jan Steemann 98ceb07b77 add initial user 2014-02-25 17:05:02 +01:00
scottashton a4b5e7ed03 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-25 16:55:09 +01:00
scottashton 47919f8670 refactoring dashboard 2014-02-25 16:54:56 +01:00
gschwab 9720aed04f missing ; added 2014-02-25 16:52:58 +01:00
Max Neunhoeffer af02a45e45 Disable test on cluster. 2014-02-25 16:16:33 +01:00
Frank Celler 3c5f3a656b Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-25 15:32:12 +01:00
Frank Celler f2121ff442 cleanup 2014-02-25 15:32:07 +01:00
scottashton 7dc145dd60 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-25 14:35:56 +01:00
scottashton 42302d3c48 dashboard refactoring 2014-02-25 14:35:47 +01:00
gschwab 4b8e9565ae fixed css for node list 2014-02-25 14:11:08 +01:00
Jan Steemann 0d57a95d52 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-25 14:08:08 +01:00
Jan Steemann e1f3b6f2d4 react on empty shard lists 2014-02-25 14:08:00 +01:00
gschwab f0e19f8aaa the lib does not work properly with firefox, so the part of the lib is deactivated. 2014-02-25 13:55:01 +01:00
gschwab cd43b58d53 hide search options 2014-02-25 13:08:52 +01:00
gschwab 4e764437be prevent deleting active user 2014-02-25 12:58:28 +01:00
Max Neunhoeffer 5f15e04edc Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-25 12:46:33 +01:00
Frank Celler 569778ae10 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-25 12:07:46 +01:00