1
0
Fork 0
Commit Graph

3037 Commits

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