1
0
Fork 0
Commit Graph

3577 Commits

Author SHA1 Message Date
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
Frank Celler 42c5f0e3a8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-11 22:54:08 +01:00
Frank Celler 289a7dc0e0 fixed unloadAll for system modules 2014-02-11 22:54:02 +01:00
Heiko Kernbach e128c0aca4 redirect bugfix, optimizations 2014-02-11 19:32:00 +01:00
Heiko Kernbach ef86071517 scroll to focus method 2014-02-11 18:41:05 +01:00
Heiko Kernbach 43f431d036 added missing css pointer 2014-02-11 18:00:08 +01:00
Heiko Kernbach 45917d9400 info-view bugfix, updated new icons 2014-02-11 17:18:55 +01:00
Michael Hackstein 4e98ca48ea Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-11 16:43:53 +01:00
Michael Hackstein eb077df3f5 Added Head and script parts for the planner interface 2014-02-11 16:43:47 +01:00
Max Neunhoeffer 01e31ea1ef Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-11 16:22:59 +01:00
Max Neunhoeffer 7ff31c8805 Start documentation for authorization in cluster plan. 2014-02-11 16:22:26 +01:00
Heiko Kernbach 7a2f404afa bugfix + jslint 2014-02-11 16:20:31 +01:00
Michael Hackstein 3c9683667c Added new planner html to manifest 2014-02-11 16:16:14 +01:00
Heiko Kernbach 1c47028361 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-11 16:03:07 +01:00
Heiko Kernbach bbc65a3040 usability document view 2014-02-11 16:02:57 +01:00
Michael Hackstein bc16cfae86 Merge remote-tracking branch 'origin/devel' into sharding
Conflicts:
	Documentation/InstallationManual/Installing.md
	arangosh/CMakeLists.txt
2014-02-11 15:52:49 +01:00
Max Neunhoeffer a78cbf832f Take out a debugging statement and change an error message. 2014-02-11 15:42:01 +01:00
Max Neunhoeffer 97ff9d086d Forward planner and kickstarter to arangosh. 2014-02-11 15:40:33 +01:00
Michael Hackstein c7036a67f7 Started changing the Application list tiles to be equal to Collection tiles. Not all functionality available yet 2014-02-11 15:07:44 +01:00
Frank Celler 5b7eb66c9d added iced coffee script 2014-02-11 14:49:01 +01:00
Frank Celler 4d707a7758 fixed doc for require 2014-02-11 14:38:56 +01:00
Max Neunhoeffer 09c7bf25c2 Allow forbidding coordinators or DBservers on some dispatchers. 2014-02-11 14:37:45 +01:00
Heiko Kernbach c43d879aac Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-11 14:16:07 +01:00
Frank Celler b017cc04b1 added process module 2014-02-11 14:15:27 +01:00
Heiko Kernbach a99815de0b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-11 14:06:33 +01:00
Heiko Kernbach 2a5e8340a4 serveral bugfixes document editing view 2014-02-11 13:57:43 +01:00
Frank Celler da0453daa6 removed moduleNames, fixed app module 2014-02-11 13:48:37 +01:00
Frank Celler fe8bab5457 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
2014-02-11 13:27:22 +01:00
Frank Celler c6ce5c7406 made module loader more node compatible, added coffee script support 2014-02-11 13:26:11 +01:00
Max Neunhoeffer 08077cccb4 Add isHealthy for cluster in kickstarter. 2014-02-11 12:55:25 +01:00
Max Neunhoeffer 9932305c2d Sort out proper logging for kickstarter. 2014-02-11 11:28:36 +01:00
Michael Hackstein 2098eac723 The index.html of the frontend is now composed from several parts. It will be reusable for the sharding frontend then 2014-02-11 11:07:29 +01:00
Max Neunhoeffer 95f01d879c Add cleanup functionality for cluster kickstarter. 2014-02-11 11:03:50 +01:00
Michael Hackstein f87b594a1c Added new classes for the tiles in collection overview. They should now be easily reusable for Databases and Applications 2014-02-11 09:58:09 +01:00
Max Neunhoeffer d168b0ff7f Finalise Kickstarter. 2014-02-11 09:52:32 +01:00
Max Neunhoeffer 945c80f23d Handle errors in check port better. 2014-02-11 09:52:14 +01:00
Michael Hackstein b76101de64 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-11 08:53:25 +01:00
Michael Hackstein 232c616288 Fixed jenkins crying... 2014-02-11 08:53:20 +01:00
scottashton 80768b564b fixed waitForSync in graph api, adjusted documentation, delete tests in api-http-spec.rb due to change in ruby lib 2014-02-10 17:53:21 +01:00
Jan Steemann d72f9680da Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-10 17:47:00 +01:00
Jan Steemann d52724475f cap constraints 2014-02-10 17:46:54 +01:00
Max Neunhoeffer 432a52d5c5 Fix a few typos. 2014-02-10 16:10:48 +01:00
Max Neunhoeffer 1571a7d0fb Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-10 16:08:48 +01:00
Max Neunhoeffer 77df9b6781 Add documentation for kickstarter and planner. 2014-02-10 15:58:38 +01:00
Jan Steemann 0479fd652f geo indexes 2014-02-10 15:53:33 +01:00
Jan Steemann 88bfe8f18c fulltext indexes 2014-02-10 14:55:27 +01:00
Jan Steemann 399ddebbd3 ensureIndex 1st 2014-02-10 14:36:32 +01:00
Jan Steemann 11c470ddd4 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-10 14:15:49 +01:00
Max Neunhoeffer d8d568297c Fix command line args. 2014-02-10 13:30:11 +01:00
Max Neunhoeffer 9113732a53 Add a print for debugging. 2014-02-10 13:27:09 +01:00
Max Neunhoeffer 64f17d5238 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-10 13:23:06 +01:00
Max Neunhoeffer 8fa256b0c5 New option arangodExtraArgs 2014-02-10 13:22:43 +01:00
Michael Hackstein 849f799f30 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-10 12:02:56 +01:00
Michael Hackstein 2e3e9b6e3b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-10 11:59:36 +01:00
Michael Hackstein 4fd06a6f32 Finished with general positioning of elements in scss. Much much (much)* simpler now 2014-02-10 11:59:26 +01:00
Max Neunhoeffer 06907b7e9f Cleanup paths in planner and kickstarter. 2014-02-10 11:56:23 +01:00
Michael Hackstein 7094f4378e Converted footer view to scss and added resizing functionality. 2014-02-09 23:07:21 +01:00
Frank Celler 7528779137 Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	CMakeLists.txt
	VERSION
	arangod/Ahuacatl/ahuacatl-functions.c
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/vocbase-defaults.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/document.json
	js/apps/system/aardvark/api-docs/edge.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/css/buttons.css
	js/apps/system/aardvark/frontend/css/documentsView.css
	js/apps/system/aardvark/frontend/js/templates/applicationsView.ejs
	js/apps/system/aardvark/frontend/js/templates/documentsView.ejs
	js/server/modules/org/arangodb/ahuacatl.js
	js/server/tests/ahuacatl-graph.js
2014-02-09 18:39:11 +01:00
Frank Celler 98ed813138 added json reading 2014-02-09 18:27:47 +01:00
Frank Celler 741ab9da9e added stream and events 2014-02-09 18:26:16 +01:00
Frank Celler 13b361555f new version 2014-02-09 18:25:44 +01:00
Michael Hackstein d875e213fb Improvements for navbar in SCSS , simplified code and removed old navbar.css from manifest. 2014-02-09 13:28:26 +01:00
Michael Hackstein 3d9bdcc210 Navbar now completely moved to Scss 2014-02-09 13:10:26 +01:00
Michael Hackstein 61aeeeceae Renamed logo (missing d) and optimized navbar setup 2014-02-08 09:12:09 +01:00
Michael Hackstein 2670c30ef3 Started moving from css to scss for better maintanence. Also started cleanup process 2014-02-08 08:55:49 +01:00
Frank Celler 0bc50d9d10 release version 1.4.9 2014-02-07 21:45:05 +01:00
Jan Steemann 154c4c0ec0 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-07 16:38:44 +01:00
Jan Steemann 002938aa04 AQL in coordinator 2014-02-07 16:38:35 +01:00
Max Neunhoeffer fe25b3a1d1 Start documentation for sharding. 2014-02-07 16:08:28 +01:00
Jan Steemann 078dca98ae fixed a test 2014-02-07 10:00:58 +01:00
Jan Steemann 20008734b9 fixed documentation 2014-02-06 16:12:10 +01:00
Jan Steemann 30a5871098 jslint 2014-02-06 15:56:33 +01:00
Jan Steemann c5eb7376e8 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-06 15:54:42 +01:00
Jan Steemann b4d9f10f17 fixed some database methods 2014-02-06 15:54:34 +01:00
Max Neunhoeffer 4f2f96b635 Kickstart finally working, seemingly. 2014-02-06 14:32:05 +01:00
Max Neunhoeffer 30f3468a40 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-06 14:10:29 +01:00
Max Neunhoeffer 7bc57b0852 Fix kickstarter bugs with multiple dispatchers. 2014-02-06 14:09:58 +01:00
Jan Steemann c38c038492 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsItemView.css
	js/apps/system/aardvark/frontend/css/graphlayout.css
2014-02-06 13:18:52 +01:00
Jan Steemann 96f1bfa70d removed unused variable 2014-02-06 13:12:34 +01:00
Jan Steemann 9a3c5c4277 use limit parameter 2014-02-06 13:10:04 +01:00
Jan Steemann c36b959c69 jslint 2014-02-06 12:21:16 +01:00
Jan Steemann 57365cdcb0 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-06 12:17:51 +01:00
Jan Steemann b5550e17a6 updated tests and documentation 2014-02-06 12:11:17 +01:00
Max Neunhoeffer 9295939d98 First working version of planner/kickstarter. 2014-02-06 12:06:23 +01:00
Max Neunhoeffer d6a5825fe4 Change names in files. 2014-02-06 09:14:16 +01:00
Max Neunhoeffer 00b03f8bf1 Rename files. 2014-02-06 09:09:07 +01:00
Jan Steemann 10eb807366 fixed HTTP CRUD operations 2014-02-05 17:19:45 +01:00
Jan Steemann dafa0a3760 added test cases 2014-02-04 17:53:38 +01:00
Jan Steemann f448a5139a jslint 2014-02-04 17:14:52 +01:00
Jan Steemann 1df92a97b4 fixed JSLint warnings 2014-02-04 17:12:41 +01:00
Jan Steemann ce9136cbfa Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-04 17:10:04 +01:00
Jan Steemann 3a783dca76 added tests 2014-02-04 17:09:58 +01:00
Max Neunhoeffer 127e7009ef Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-04 14:45:19 +01:00
Max Neunhoeffer 56a629b795 Startup agents seems to work. 2014-02-04 14:44:56 +01:00
Jan Steemann 35c5c9012e added test cases 2014-02-04 11:51:04 +01:00
Max Neunhoeffer 0c8de8a3ae Add fs.makeAbsolute needed by kickstarter. 2014-02-04 11:36:28 +01:00
Jan Steemann 52040eaad6 added tests, fixed segfault 2014-02-04 09:54:56 +01:00
Michael Hackstein c340f8f4a3 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-04 09:21:16 +01:00
Michael Hackstein c83f4621c1 Fixed tests for new graphviwer toolbox layout 2014-02-04 09:21:03 +01:00
Jan Steemann a9c1fd005e test suite for CRUD 2014-02-03 19:26:05 +01:00
Jan Steemann 67a3f306d6 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-03 18:25:13 +01:00
Jan Steemann 18b38771dc added cluster CRUD tests 2014-02-03 18:24:57 +01:00
Jan Steemann 6bb4f0f0ac added SKIPLIST AQL function
Conflicts:
	CHANGELOG
2014-02-03 16:54:35 +01:00
Jan Steemann fe9464afec added SKIPLIST AQL function 2014-02-03 16:37:07 +01:00
Max Neunhoeffer 868bf4f0ea Remove a print statement. 2014-02-03 14:00:14 +01:00
Max Neunhoeffer 67ba924aa9 Set up framework for kickstarters/dispatchers. 2014-02-03 13:58:25 +01:00
Michael Hackstein 4dc635e59c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-03 11:42:48 +01:00
Michael Hackstein 08858d414b Added new version of graphViewer Icons 2014-02-03 11:42:18 +01:00
Jan Steemann 4339d5aab6 removed unused variable 2014-02-02 09:21:43 +01:00
Claudius Weinberger 2748152fc5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	js/apps/system/aardvark/frontend/css/buttons.css
2014-02-01 17:28:18 +01:00
Claudius Weinberger 7d29bfcf6a some ui improvements 2014-02-01 17:26:13 +01:00
Jan Steemann 3db9bbe0cc evil mimetype detection attempt 2014-02-01 17:02:42 +01:00
Max Neunhoeffer a0371ec7d9 Finish planning stage of kickstarter? 2014-02-01 15:07:48 +01:00
Jan Steemann 1a10cb52eb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-01 12:08:35 +01:00
Jan Steemann d9bc39c576 don't fail if body response is undefined 2014-02-01 12:08:08 +01:00
Michael Hackstein 0ee6183d3d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-01 09:47:28 +01:00
Michael Hackstein 1e21d3750f Fixed tests for graph previewer 2014-02-01 09:47:19 +01:00
Max Neunhoeffer 698e240501 First draft of kickstarter. 2014-02-01 01:51:31 +01:00
Jan Steemann 4a99cde395 jslintified several tests 2014-02-01 01:50:58 +01:00
Jan Steemann 8be60b04db Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-01-31 23:59:01 +01:00
Jan Steemann 74c0457b4b added version check for admin interface 2014-01-31 23:58:36 +01:00
Michael Hackstein f580bd1ade Fixed tests for translated arrow positions. 2014-01-31 23:38:33 +01:00
Michael Hackstein 6b12a0babc The db selection select box is now readable in firefox 2014-01-31 23:09:24 +01:00
Michael Hackstein 0c59b93390 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-31 22:57:47 +01:00
Michael Hackstein 7c063d3572 The graph viewer now has arrows 2014-01-31 22:57:03 +01:00
Michael Hackstein 6f44fcf00e Made unexpanded vertices semi-transparent, i am not yet happy with this 2014-01-31 21:41:40 +01:00
Michael Hackstein 7085c6cb6d The context menu in the graphviewer now has style of OSX 2014-01-31 21:38:47 +01:00
Max Neunhoeffer c2e6c16395 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-31 19:34:55 +01:00
Max Neunhoeffer b6c3600ecc Add an include needed to please the compiler on Linux. 2014-01-31 19:31:36 +01:00
Max Neunhoeffer 73f3dbc328 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-31 18:56:47 +01:00
Michael Hackstein 2a289bf28d Fixed a bug where the group-by list of the graphviewer has not been stored locally 2014-01-31 18:17:25 +01:00
Michael Hackstein 0b0d4c5dd7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-31 17:38:20 +01:00
Michael Hackstein 0c62714017 Fixed a bug where dragging of nodes was not possible and connecting them with edges made everything even worse 2014-01-31 17:38:15 +01:00
Max Neunhoeffer c31df01dbb Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-31 16:04:54 +01:00
Max Neunhoeffer 3fadaa438a Start cluster actions and move cluster test there. 2014-01-31 16:02:45 +01:00
Frank Celler 014afdf792 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-31 15:56:21 +01:00
Frank Celler 29f075cfce added external processes 2014-01-31 15:55:51 +01:00
Michael Hackstein f7735391df Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-31 14:06:51 +01:00
Jan Steemann 04d40c10e9 fixed wrong REST API parameter type in documentation 2014-01-31 13:56:24 +01:00
Jan Steemann dab81b1702 fixed wrong REST API parameter type in documentation 2014-01-31 13:54:47 +01:00
Jan Steemann 9643469631 do not allow changing shard key attributes 2014-01-31 13:19:03 +01:00
Michael Hackstein 46c9b0e83b Added a confirmation dialog before deleting nodes/edges 2014-01-31 13:04:55 +01:00
Jan Steemann 48e3a5828c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
2014-01-31 11:31:09 +01:00
Jan Steemann 8f8c664c5d Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-31 11:29:44 +01:00
Jan Steemann 83af3c9617 truncate sharded 2014-01-31 11:29:36 +01:00
Max Neunhoeffer 3966ce0ac7 Rename sharding dir to cluster 2014-01-31 11:24:01 +01:00
Jan Steemann bd7c5d4113 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-01-31 11:23:38 +01:00
Jan Steemann 4ead86d0f7 removed some unused variables 2014-01-31 11:23:27 +01:00
Michael Hackstein d30585ceb2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-31 09:29:00 +01:00
Michael Hackstein 817013004b Fixed a bug where node creation does not work determinisiticly 2014-01-31 09:28:53 +01:00
Jan Steemann a5d4b1b5a1 make change for issue #755 less strict 2014-01-31 02:07:27 +01:00
Jan Steemann d17e049ed7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-01-31 02:02:49 +01:00
Jan Steemann ea7772295b issue #755 2014-01-31 02:02:25 +01:00
Jan Steemann b7ad436d19 issue #755: TRAVERSAL does not use strategy, order and itemOrder options 2014-01-31 01:52:07 +01:00
Michael Hackstein a219bc8342 Changed internal layout of the graphviewer, This fixes issues with the context menu, click events and display of edges to be 2014-01-31 01:16:38 +01:00
Michael Hackstein e22972578c Headerbar buttons now have a cursor: pointer 2014-01-31 01:14:45 +01:00
Michael Hackstein cb4d9deb3b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-31 01:09:51 +01:00
Claudius Weinberger fadb568728 fixed merge conflict 2014-01-31 01:00:49 +01:00
Claudius Weinberger 7f92c53519 Some layout changes 2014-01-31 00:56:56 +01:00
Michael Hackstein 6ffd56760c Fixed a bug in the WI where it was not possible to install a foxx in a specific version 2014-01-30 23:55:17 +01:00
Jan Steemann eb632130b2 fixed documentation 2014-01-30 23:42:48 +01:00
Jan Steemann f4c9b4bc7a documentation updates 2014-01-30 23:31:03 +01:00
Jan Steemann 7bc4f06b6e fixed failing tests 2014-01-30 23:12:40 +01:00
Michael Hackstein 521a46088c Fixed a bug with undefined values printed to console.log but they had no effect 2014-01-30 20:39:37 +01:00
Michael Hackstein 875100a195 Encapsulated the GraphViewer menu into a container with padding 2014-01-30 20:38:49 +01:00
Michael Hackstein 86d8ddb71e Removed pointless console.log 2014-01-30 20:37:21 +01:00
Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsView.css
	js/apps/system/aardvark/frontend/css/layout.css
	js/apps/system/aardvark/frontend/js/routers/router.js
2014-01-30 19:40:21 +01:00
Jan Steemann 4f3070715c implemented first() and last() 2014-01-30 19:11:48 +01:00
Jan Steemann 6b00e2ccc2 updateByExample sharded 2014-01-30 17:54:25 +01:00
Jan Steemann 8d1ac573a6 removeByExample sharded 2014-01-30 17:40:19 +01:00
Jan Steemann 51a58b7844 collection.any() sharded 2014-01-30 17:30:39 +01:00
Michael Hackstein a51979818a Added test for graph deletion confirmation 2014-01-30 17:13:23 +01:00
Michael Hackstein 54346784ca Added confirm dialog to graph deletion 2014-01-30 16:56:31 +01:00
Jan Steemann 7a8f2257cc batchSize 2014-01-30 16:09:25 +01:00
Michael Hackstein 301b8ac7c2 The graph management delete button is now correct red color and hover effect does not change it to green 2014-01-30 16:05:47 +01:00
Michael Hackstein 402d80930b Fixed spelling mistake 2014-01-30 15:15:08 +01:00
Michael Hackstein 0b57142b5d Fixed colour discrepeancy of API views 2014-01-30 15:12:04 +01:00
Michael Hackstein fd80bf7387 Unified datatable colouring of odd and even 2014-01-30 15:11:23 +01:00
Jan Steemann ae05c0c5d3 byExample() sharded 2014-01-29 17:55:33 +01:00
Michael Hackstein fcb30082c9 Unified modal dialog closing icon from graphviewer and main interface 2014-01-29 15:48:39 +01:00
Michael Hackstein 1a8fdab48a The Manage Graphs button is now allways displayed 2014-01-29 15:45:32 +01:00
Jan Steemann 57aa26bf4a all() with skip/limit 2014-01-29 14:57:28 +01:00
Jan Steemann 5f8a59d696 all() sharded 2014-01-29 13:51:12 +01:00
Michael Hackstein 71e9eda131 The Search field in the graph viewer is now visible 2014-01-28 17:05:25 +01:00
Max Neunhoeffer c3f01237b0 Implement replace and update on cluster.
This still has a freeing too early bug with TRI_json_t.
2014-01-28 16:49:44 +01:00
Michael Hackstein b8557a3c2b Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2014-01-28 14:35:20 +01:00
Michael Hackstein 19228f5f43 Fixed a wrong label for new foxx importer in web interface 2014-01-28 14:35:13 +01:00
Jan Steemann 95da462279 mount default apps in /system 2014-01-28 14:34:49 +01:00
Michael Hackstein ffa1ff9eed Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-28 14:34:47 +01:00
Jan Steemann fe7f89a8f1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-01-28 14:34:12 +01:00
Jan Steemann 3bc0cf49c4 mount default apps in /system 2014-01-28 14:33:47 +01:00
Michael Hackstein 0bf874b8e6 Fixed a wrong label for new foxx importer in web interface 2014-01-28 14:10:30 +01:00
Michael Hackstein 8d100b688e Added some more information for the secondary server 2014-01-28 14:07:01 +01:00
Michael Hackstein dbcdd72da4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-28 09:48:04 +01:00
Michael Hackstein 983f616add Removed unnecessary information that server is connected on startup 2014-01-28 09:43:53 +01:00
Jan Steemann 0a2d61a42a added SHORTEST_PATH AQL function, allow user-defined functions for filtering in TRAVERSAL etc. 2014-01-28 01:51:27 +01:00
Jan Steemann e90ee8c572 shut up jslint 2014-01-27 17:30:44 +01:00
Jan Steemann e88fe036d6 updated documentation 2014-01-27 17:29:29 +01:00
Jan Steemann a0122b851e updated documentation 2014-01-27 17:28:29 +01:00
Michael Hackstein 2b327912d5 Foxx Controller will now react to int and integer. Furthermore it throws an error if an illegal attribute is defined 2014-01-27 16:20:32 +01:00
Frank Celler bd69ad9843 release version 1.4.8 2014-01-27 13:36:41 +01:00