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

3577 Commits

Author SHA1 Message Date
Heiko Kernbach 77a76da9b0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-20 13:12:29 +01:00
Heiko Kernbach e00c398ab8 jquery update + cleanup, swagger-fix 2014-02-20 13:12:15 +01:00
Max Neunhoeffer 740eb86cdb Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-20 12:54:21 +01:00
Max Neunhoeffer 96c6298a1c Please jslint. 2014-02-20 12:54:03 +01:00
Jan Steemann 8238c0515b removed undocumented API method 2014-02-20 12:54:01 +01:00
Max Neunhoeffer d2538cefeb Add http_server and ssl_server tests to js framework. 2014-02-20 12:52:03 +01:00
Guido Schwab 6b39964f02 delete user fixed 2014-02-20 12:40:45 +01:00
Guido Schwab 4b5babd813 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-20 12:34:29 +01:00
Guido Schwab 2657fd9063 fixed userModel and notifications 2014-02-20 12:34:20 +01:00
Michael Hackstein d3805eceb8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-20 11:18:30 +01:00
Michael Hackstein e7b796173f Unified badges and buttons on tiles 2014-02-20 11:17:12 +01:00
Jan Steemann 29c09e1ef7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-20 10:04:43 +01:00
Jan Steemann a0c3a7fe56 improved users API 2014-02-20 10:04:13 +01:00
Jan Steemann c6f865c55f fixed jslint warnings 2014-02-20 09:56:06 +01:00
Jan Steemann 9577923c7a fixed jslint warnings 2014-02-20 09:55:51 +01:00
Jan Steemann 75b4447191 removed debug stuff 2014-02-20 09:55:38 +01:00
Jan Steemann f8980f94a5 initialise foxx on startup 2014-02-20 09:22:39 +01:00
Heiko Kernbach 064e609217 fixed document pagination after using filter method 2014-02-19 18:37:54 +01:00
Jan Steemann 82d84e92dd more sleeping 2014-02-19 18:33:11 +01:00
Jan Steemann 72aead39fa Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-19 17:10:20 +01:00
Jan Steemann d92dd90aac fixed instance race condition 2014-02-19 17:10:11 +01:00
scottashton efacd64d34 cluster dygraph 2014-02-19 17:09:09 +01:00
scottashton 5268410276 cluster dygraph 2014-02-19 17:06:09 +01:00
Michael Hackstein efa911632f Merge remote-tracking branch 'origin/devel' into sharding 2014-02-19 16:12:00 +01:00
Michael Hackstein 7dcfc618b7 Added new class to cluster shard view 2014-02-19 16:11:38 +01:00
Michael Hackstein 1158400fa6 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-19 16:10:09 +01:00
Heiko Kernbach dafbe9f025 gritter cleanup 2014-02-19 16:00:55 +01:00
Heiko Kernbach d04a34e720 cleanup 2014-02-19 15:51:13 +01:00
Max Neunhoeffer d0865c309f Fix testing.js. 2014-02-19 15:50:24 +01:00
Heiko Kernbach 4e3edc679e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-19 15:38:00 +01:00
Heiko Kernbach 7d64371ff0 ejs: karma + manifest 2014-02-19 15:37:52 +01:00
Michael Hackstein 1b1ba44dd0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-19 15:34:16 +01:00
Michael Hackstein cfbb499cfc Fixed jslint line to long crying 2014-02-19 15:34:12 +01:00
Heiko Kernbach 65bdad7617 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-19 15:33:10 +01:00
Heiko Kernbach c2e7d34669 1.0 ejs 2014-02-19 15:33:05 +01:00
Heiko Kernbach fe779c627d ejs update 0.9 -> 1.0 2014-02-19 15:32:48 +01:00
gschwab e7dc7aa3bb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-19 15:31:22 +01:00
Heiko Kernbach 2398ec0fa0 bugfix 2014-02-19 15:30:49 +01:00
gschwab b376b3a803 added logout and restricted images to gravatars 2014-02-19 15:30:31 +01:00
Jan Steemann 23c3ceab70 removed debug phrase 2014-02-19 15:15:35 +01:00
Jan Steemann 5c960e2ba1 derived file 2014-02-19 14:58:55 +01:00
Michael Hackstein 702f83b593 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-19 14:57:22 +01:00
Jan Steemann dc17e63f5a fixed jslint warning 2014-02-19 14:57:08 +01:00
Jan Steemann dd5b172e2c fixed race conditions 2014-02-19 14:55:21 +01:00
Heiko Kernbach 500f5283bc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-19 14:51:02 +01:00
Heiko Kernbach 7943824c80 user model update 2014-02-19 14:49:18 +01:00
Michael Hackstein 238a5b6413 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-19 14:45:05 +01:00
Michael Hackstein 4ada8bf451 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-19 14:37:27 +01:00
Michael Hackstein a7d0b59aee The general layout is now moved to a single class and the dropdowns have bin unified to one class 2014-02-19 14:36:51 +01:00
Frank Celler 726144ce39 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/ApplicationV8.cpp
 2014-02-19 14:30:46 +01:00
Frank Celler 991bcf0171 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-19 14:29:00 +01:00
Frank Celler c779325b5d added frontend-development switch 2014-02-19 14:28:51 +01:00
gschwab a70df24907 changed default logo 2014-02-19 13:25:59 +01:00
gschwab 67464b2145 more functionality for usermanagement 2014-02-19 13:13:16 +01:00
scottashton c2a69c844e finished dygraph 2014-02-19 13:03:13 +01:00
Michael Hackstein c71909e8c5 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-19 11:19:29 +01:00
Jan Steemann 9652ee8b14 cluster start 2014-02-19 11:06:12 +01:00
Jan Steemann b9043f6e4b Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-19 10:30:53 +01:00
Jan Steemann 66bc4c9a41 allow unique index creation on shard keys only 2014-02-19 10:30:41 +01:00
Frank Celler 066abd777c Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/js/routers/router.js
 2014-02-19 10:21:00 +01:00
Michael Hackstein 5bd7dce8d5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/scss/_colors.scss
 2014-02-19 08:40:21 +01:00
Michael Hackstein 599e5b3759 Added background transparent color to colors 2014-02-19 08:39:18 +01:00
gschwab dfb352a23c added some userManagement functionality 2014-02-19 08:38:04 +01:00
Michael Hackstein fca7f127dd Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-18 17:25:53 +01:00
Michael Hackstein cfc35c1017 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/templates/showCluster.ejs
	js/apps/system/aardvark/clusterFrontend/js/views/showClusterView.js
	js/apps/system/aardvark/frontend/scss/cluster.css
 2014-02-18 17:02:52 +01:00
Jan Steemann badf0d26db fixed jslint warning 2014-02-18 16:55:12 +01:00
scottashton 481a10e984 cluster 2014-02-18 16:53:06 +01:00
Jan Steemann 4c29662e90 initialise foxx 2014-02-18 16:47:55 +01:00
Michael Hackstein e8134d4a75 First version of cluster server overview 2014-02-18 16:45:10 +01:00
gschwab e17c4c870a merged 2014-02-18 16:40:33 +01:00
gschwab 26e95aa140 updated 2014-02-18 16:37:09 +01:00
gschwab ca6d852621 fixed some minor bugs 2014-02-18 16:35:49 +01:00
Heiko Kernbach 1e964b18d0 removed old/unnecessary notifications 2014-02-18 16:31:46 +01:00
Heiko Kernbach a2e1425b87 karma fix for navigationviewspec 2014-02-18 16:00:00 +01:00
Heiko Kernbach ce450dd994 removed console log 2014-02-18 15:07:14 +01:00
Heiko Kernbach 736ae9ec62 cleanup 2014-02-18 14:55:36 +01:00
Heiko Kernbach fe8d22cdd7 finished new notification system 2014-02-18 14:54:38 +01:00
Heiko Kernbach b69fad0381 merge origin/devel 2014-02-18 14:29:44 +01:00
Jan Steemann dc8e590bca inedges, outedges, edges 2014-02-18 13:46:09 +01:00
Heiko Kernbach 140a8f125b notifications 2014-02-18 12:27:39 +01:00
scottashton 82e9a87684 cluster view 2014-02-18 12:16:46 +01:00
scottashton 855c0791fc cluster view 2014-02-18 12:14:13 +01:00
Jan Steemann 39584f0735 adjusted user result structure 2014-02-18 12:05:05 +01:00
Max Neunhoeffer 1c05f12c67 Create system collections in kickstarter. 2014-02-18 11:52:09 +01:00
Jan Steemann 5cbfcd6dcc fixed example query 2014-02-18 11:13:20 +01:00
Michael Hackstein 46cdc95c6d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-18 10:40:28 +01:00
Michael Hackstein 10c380602a Added a foxx route for authentication. It is now possible to request the logged in user 2014-02-18 10:40:23 +01:00
Max Neunhoeffer a0d1888437 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-18 10:15:51 +01:00
Max Neunhoeffer 8b8c8d2fdc Fix jslint. 2014-02-18 10:15:32 +01:00
Jan Steemann 682e00245b fulltext 2014-02-18 10:14:52 +01:00
Jan Steemann 6c3c4b5dce near/within 2014-02-18 09:47:33 +01:00
gschwab 107748a228 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-18 09:27:56 +01:00
gschwab 5408e4b845 added usermanagement view 2014-02-18 09:27:45 +01:00
Jan Steemann 170bb488b9 fixed failing test 2014-02-18 09:04:51 +01:00
Michael Hackstein 49f91512ba Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-18 08:50:32 +01:00
Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	arangod/VocBase/document-collection.c
	arangosh/CMakeLists.txt
	js/apps/system/aardvark/test/karma/karma.conf.js
 2014-02-18 08:50:27 +01:00
Heiko Kernbach e8aaac38e2 css fix 2014-02-18 08:26:17 +01:00
Heiko Kernbach fce3cd2879 removed notification view 2014-02-18 08:23:57 +01:00
Max Neunhoeffer 4d1020321b Start to add command line tools for cluster and creation of system colls. 2014-02-17 23:58:52 +01:00
Michael Hackstein c4b14fcfac Added strong transparency to colors, used by tiles. Also added some more attributes to tile, still some overwrites found there 2014-02-17 22:16:09 +01:00
Michael Hackstein 36affeb5d7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-17 21:32:27 +01:00
Max Neunhoeffer b99e14b43b Add single test. 2014-02-17 18:09:14 +01:00
Max Neunhoeffer 8f6ae0c088 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-17 17:47:40 +01:00
Max Neunhoeffer aa0f4960fd Add boost test to JS test suite. 2014-02-17 17:47:20 +01:00
Jan Steemann 23c303da43 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-17 17:46:07 +01:00
Jan Steemann 73aa8226e3 geo query 2014-02-17 17:46:02 +01:00
Max Neunhoeffer 8ff2964c63 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/server/modules/org/arangodb/testing.js
 2014-02-17 17:24:33 +01:00
Max Neunhoeffer c567ea90c7 Add unittests_config target to JS testing framework. 2014-02-17 17:07:53 +01:00
Heiko Kernbach 286bcc658a notification prep. + karma fix 2014-02-17 16:46:15 +01:00
Jan Steemann 6491a6797f fixed jslint warnings 2014-02-17 16:44:26 +01:00
gschwab cecb40147d path fixed 2014-02-17 16:43:13 +01:00
Jan Steemann 05e59bae7b Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-17 16:41:21 +01:00
Jan Steemann 9f16760359 simple query range 2014-02-17 16:41:10 +01:00
Heiko Kernbach 899fa52876 added api-cmd for getting a complete user list 2014-02-17 16:37:50 +01:00
Jan Steemann b8381603d7 fixed invalid assignment 2014-02-17 16:31:22 +01:00
Max Neunhoeffer 05a8a91929 Reactivate some stuff for coordinator, not yet actually called. 2014-02-17 16:31:13 +01:00
Max Neunhoeffer 510c57aacc Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-17 14:05:33 +01:00
Max Neunhoeffer 568edcb8fb New test function. 2014-02-17 14:05:17 +01:00
Michael Hackstein df7dfc0b10 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/showClusterView.js
 2014-02-17 13:50:06 +01:00
scottashton 7c12ac72f1 scss for cluster 2014-02-17 13:47:42 +01:00
scottashton 279a0c8f43 cluster 2014-02-17 13:42:01 +01:00
Michael Hackstein ae2ce12a45 Added a collect by address for dbServers and coordinators to show them based on their machine 2014-02-17 13:40:24 +01:00
scottashton d7a56eea77 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-17 13:38:01 +01:00
Heiko Kernbach c9193d153f removed obsolesce test 2014-02-17 11:55:22 +01:00
Heiko Kernbach 238396e3c4 prep for new notifications, cleanup 2014-02-17 11:47:58 +01:00
Jan Steemann 25b622aab1 fixed jslint warnings 2014-02-17 11:21:01 +01:00
Jan Steemann c40d930fa6 issue #765: added SLICE AQL function 2014-02-17 11:09:03 +01:00
Jan Steemann a546f63714 fixed test 2014-02-17 09:56:27 +01:00
gschwab 067a202104 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-17 08:57:27 +01:00
gschwab 5e90b2fe04 added user and statistic view (fakey and inactive) 2014-02-17 08:57:17 +01:00
scottashton b5950f1fd9 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-17 08:21:58 +01:00
scottashton dc4714538c cluster View 2014-02-17 08:21:55 +01:00
Heiko Kernbach 2f96ac70ad new model for notification 2014-02-14 20:45:00 +01:00
Heiko Kernbach 04ab98b133 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-14 20:43:25 +01:00
Heiko Kernbach bcf587847a karma 2014-02-14 20:43:01 +01:00
Jan Steemann 3fd053eb1e updated tests 2014-02-14 18:44:36 +01:00
Frank Celler 65d7d8fdab Merge remote-tracking branch 'origin/devel' into sharding 2014-02-14 17:23:33 +01:00
Frank Celler 38cffe5401 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-14 16:52:13 +01:00
Heiko Kernbach 5a2a5508ef added new collection/model for notifications 2014-02-14 16:51:57 +01:00
Frank Celler 6d51527fb5 check for drive letter 2014-02-14 16:51:40 +01:00
Michael Hackstein 5cb9068719 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-14 16:36:08 +01:00
Michael Hackstein 86ae7ed443 Added a faked route to cluster js to receive the type of the network 2014-02-14 16:36:00 +01:00
scottashton 98a86abc98 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-14 16:33:56 +01:00
scottashton 631ff08dcc clusterFrontend 2014-02-14 16:33:33 +01:00
Max Neunhoeffer 98ed29ab84 Make check for useDatabase switchable for unittests. 2014-02-14 15:33:35 +01:00
Michael Hackstein e92f5ec5be Added svg and div into the showCluster template 2014-02-14 14:10:23 +01:00
scottashton 907f9127e9 starting clusterFrontend 2014-02-14 13:59:29 +01:00
Michael Hackstein 24d97170f9 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-14 13:40:53 +01:00
Michael Hackstein 00007a653f Fixed tests for cluster planner 2014-02-14 13:40:47 +01:00
Jan Steemann 710ce8efd1 updated and fixed documentation 2014-02-14 10:53:04 +01:00
Jan Steemann 3eab509562 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-14 10:31:07 +01:00
Jan Steemann 0f0ef8a33f updated index docs 2014-02-14 10:30:05 +01:00
Michael Hackstein a38b06c1a5 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-14 09:37:18 +01:00
Michael Hackstein dfd03e33ad Added download for the startup configuration and implemented the start of the cluster 2014-02-14 09:37:12 +01:00
Max Neunhoeffer fdd40a5c28 Minor changes in error reporting. 2014-02-14 09:14:33 +01:00
Jan Steemann 44dccf582c Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 18:14:59 +01:00
Jan Steemann f8476ce0b0 fixed tests 2014-02-13 18:14:53 +01:00
Frank Celler 92172bc59a Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-13 16:38:46 +01:00
gschwab 2111c7a98e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-13 16:35:28 +01:00
gschwab 8d8476834e tests fixed 2014-02-13 16:35:18 +01:00
Jan Steemann 14c14cc07c Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 16:30:56 +01:00
Jan Steemann f2cd112bf5 index ids 2014-02-13 16:30:48 +01:00
scottashton 512685313d Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 16:26:40 +01:00
scottashton 7e1562fcfd fixed bug in planSymmetricView.js 2014-02-13 16:26:09 +01:00
Frank Celler 6e588b468a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-13 16:26:07 +01:00
Max Neunhoeffer 0d742e4d52 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-13 16:19:44 +01:00
Max Neunhoeffer 339fe1e73d Drive on with testing framework in JavaScript. 2014-02-13 16:19:28 +01:00
Max Neunhoeffer e767ac9e45 Change handling of extraArgs slightly. Export PortFinder. 2014-02-13 16:19:06 +01:00
gschwab df7932f7ca tools dropdown fixed 2014-02-13 16:15:53 +01:00
Jan Steemann c9c8f4e62a added tests 2014-02-13 16:12:57 +01:00
gschwab 2bb45f052c resized page margins 2014-02-13 15:37:39 +01:00
Jan Steemann bb0f591349 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 15:33:39 +01:00
Jan Steemann 7970881b22 single-threaded plan changes 2014-02-13 15:33:29 +01:00
Frank Celler 16f7d558ba added node modules semver, numeral, moment, marked 2014-02-13 15:31:48 +01:00
Michael Hackstein 0474d47a1e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-13 15:12:56 +01:00
scottashton 9399387dac refactored planSymmetricView 2014-02-13 15:10:09 +01:00
Max Neunhoeffer e4ef112d31 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-13 13:50:24 +01:00
Max Neunhoeffer 2ce2857c7f Introduce timeout in PortFinder. 2014-02-13 13:50:05 +01:00
gschwab 485958a2a2 tests fixed 2014-02-13 13:10:54 +01:00
gschwab 4fefdeba7f dropdown menues fixed 2014-02-13 12:55:01 +01:00
scottashton ebc4e96da4 finished asymmetrical and symmetrical plan 2014-02-13 12:01:52 +01:00
scottashton f196f4361d finished asymmetrical and symmetrical plan 2014-02-13 12:00:50 +01:00
Jan Steemann fc84d4c005 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 11:18:49 +01:00
Frank Celler 95472a82eb Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
 2014-02-13 11:07:01 +01:00
Jan Steemann 6c670f2e2e Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 11:00:26 +01:00
Jan Steemann 4fc8cae57d index creation with ids 2014-02-13 11:00:08 +01:00
Michael Hackstein d6f705f8b9 Added further classes for selection 2014-02-13 10:32:50 +01:00
Michael Hackstein 25b4150464 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 10:20:31 +01:00
Michael Hackstein 0f9d44802b Started with server side, route now exists and reacts, no functionality yet. Fixed problem in db server entry, forgotten class 2014-02-13 10:20:26 +01:00
gschwab 30b9f20250 Highlighting for dropdown item fixed 2014-02-13 09:29:05 +01:00
Jan Steemann 4a8e4dbcaa Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 08:48:29 +01:00
Jan Steemann 70988aa215 removed withStats option 2014-02-13 08:48:22 +01:00
gschwab ee1ec1b08a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-13 08:45:19 +01:00
Michael Hackstein eb92d33261 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 08:44:19 +01:00
gschwab c58342f08a changed 'blubber' to 'Tools' 2014-02-13 08:43:19 +01:00
Michael Hackstein 401df1cfb2 Symmetric and Asymmetric planning menues now have a dialogue interface. Functioniality to be implemented 2014-02-13 08:42:48 +01:00
Frank Celler 89b6ca0ba3 fixed test setup 2014-02-12 22:04:19 +01:00
Jan Steemann 4dca29cf4e fixed dropIndex 2014-02-12 18:17:15 +01:00
Jan Steemann 74d419cc3d jshund 2014-02-12 17:15:12 +01:00
Jan Steemann deff511fbf removed unused variables 2014-02-12 17:14:27 +01:00
Jan Steemann f4213c02ff fixed jslint warning 2014-02-12 17:12:15 +01:00
Jan Steemann a8640a5a59 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-12 17:10:04 +01:00
Jan Steemann c4d52ff133 getIndexes, dropIndex 2014-02-12 17:09:47 +01:00
Jan Steemann 85f36777b8 prevent confusing message at startup 2014-02-12 17:07:10 +01:00
Michael Hackstein a151675474 The default route of the planner now starts with the selection of the plan type 2014-02-12 16:52:23 +01:00
scottashton e45b7d1d73 planSymmetricView 2014-02-12 16:35:34 +01:00
Max Neunhoeffer f66dc34221 Implement starting and stopping of a cluster. 2014-02-12 16:22:44 +01:00
Max Neunhoeffer eccb8dd365 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-12 16:11:11 +01:00
Max Neunhoeffer a2c954133f Start a new unittest framework running in arangod. 
This should run also on Windows and will allow for cluster tests.
 2014-02-12 16:10:21 +01:00
Michael Hackstein 4e6f826991 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-12 16:08:31 +01:00
Michael Hackstein d6fadca87d First version of plan for test setup and added stubs for other plans 2014-02-12 16:08:26 +01:00
scottashton a09b77ab55 finalized plaScenarioSelector, click events and karma tests 2014-02-12 15:55:22 +01:00
Michael Hackstein ac575e96cc Added routes for all plan creation dialogues 2014-02-12 15:18:26 +01:00
Michael Hackstein 79367d4aae Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-12 15:04:34 +01:00
Michael Hackstein 79be948d3a Added test for test cluster plan 2014-02-12 15:04:22 +01:00
Jan Steemann 9dc4c9f6c1 getIndexes, coordinator 2014-02-12 14:53:37 +01:00
gschwab 0d2f3b945f karma configuration fixed 2014-02-12 14:44:53 +01:00
gschwab ae3fa2ec77 more tests fixed 2014-02-12 14:36:27 +01:00
Jan Steemann db861e59dc simple index creation 2014-02-12 14:16:43 +01:00
Michael Hackstein a89aabfa26 Capitalized router name in Test and moved view spec to views 2014-02-12 14:15:14 +01:00
gschwab a21d499e51 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-12 14:12:40 +01:00
gschwab 6d55f35058 fixed test 2014-02-12 14:12:18 +01:00
Frank Celler 25878be3d4 added fix for absolute path 2014-02-12 13:54:32 +01:00
Michael Hackstein 511478e74d Capitalized class name of PlannerRouter 2014-02-12 13:29:58 +01:00
scottashton ca08841929 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-12 13:25:07 +01:00
scottashton c682dae057 planner 2014-02-12 13:21:20 +01:00
Jan Steemann ed93c458df fixed invalid return value 2014-02-12 13:14:14 +01:00
Jan Steemann 5270f994c9 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/css/layout.css
	js/server/modules/org/arangodb/arango-collection.js
 2014-02-12 12:53:08 +01:00
Jan Steemann f11577d952 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-12 12:47:57 +01:00
Jan Steemann 3dad329979 ensureIndex 2014-02-12 12:47:51 +01:00
Max Neunhoeffer 2f1b0fe061 Use API to shut down servers. 2014-02-12 12:17:52 +01:00
scottashton b1add1cf45 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-12 12:00:40 +01:00
scottashton dae77412a8 plannerFrontend Router setup and karma tests 2014-02-12 12:00:04 +01:00
Michael Hackstein 9fc6d3cad2 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-12 11:23:58 +01:00
Michael Hackstein 38db0842e5 A bit more styling in the planTest view 2014-02-12 11:23:24 +01:00
Heiko Kernbach 9cb13ca7c0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-12 10:40:31 +01:00
Heiko Kernbach f215495c0f karma&jslint 2014-02-12 10:40:23 +01:00
gschwab d91a283678 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-12 10:25:52 +01:00
gschwab 2910419738 database selection moved to navigation bar, links rearranged 2014-02-12 10:25:16 +01:00
Heiko Kernbach 421d0c8e93 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-12 10:24:59 +01:00
Heiko Kernbach 0a4d54440f some changes for user management 2014-02-12 10:24:53 +01:00
Max Neunhoeffer d92a5d9bea Add authentication between dispatchers. 2014-02-12 09:37:18 +01:00
Max Neunhoeffer 733e94ad0a Improve error reporting in arangosh with kickstarter. 2014-02-12 09:36:35 +01:00
scottashton ee822fb182 cleanup code, added linebreaks 2014-02-12 09:27:39 +01:00
Jan Steemann 28edb544fd fixed jslint warnings 2014-02-12 09:15:47 +01:00
Jan Steemann 10b406b0e9 flush the user authentication cache after any modifications 2014-02-12 09:12:48 +01:00
Frank Celler 5e5ace0ee3 fixed unloadAll for system modules 2014-02-12 08:32:35 +01:00
Michael Hackstein 67f4da6b9e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-12 08:28:09 +01:00
Heiko Kernbach b3a7c9fff3 jslint fix 2014-02-12 08:20:00 +01:00
Michael Hackstein 3a9170e370 Rough version of the test planner, no style, no funcitonality yet 2014-02-11 23:40:50 +01:00