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

3279 Commits

Author SHA1 Message Date
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