1
0
Fork 0
Commit Graph

3525 Commits

Author SHA1 Message Date
Max Neunhoeffer 5a37b46cab Improve error reporting of "single" test target. 2014-02-24 14:59:12 +01:00
Max Neunhoeffer d44915832b Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-24 11:02:44 +01:00
Max Neunhoeffer baa6e4fba3 Rename to exclude from standard unittests. 2014-02-24 11:02:30 +01:00
scottashton 15ea5f1a83 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-24 11:01:04 +01:00
scottashton 00f6cf381c fixed graph bugs 2014-02-24 11:00:58 +01:00
Max Neunhoeffer 7400214d9b Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-24 09:02:45 +01:00
Max Neunhoeffer 078f18138d Fix a filename from a renaming operation. 2014-02-22 23:55:22 +01:00
Heiko Kernbach 8981d51257 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-22 17:22:01 +01:00
Heiko Kernbach c99ab8bd74 css 2014-02-22 17:21:53 +01:00
Michael Hackstein d938bed8ea Merged devel and regenerated scss 2014-02-22 16:44:50 +01:00
Michael Hackstein 93f5b89a0c The central div is now central and no more 5 px off 2014-02-22 16:36:54 +01:00
Michael Hackstein e94faa2949 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-22 16:28:44 +01:00
Michael Hackstein 3388e0864e Fixed buttons in sharding only interfaces 2014-02-22 16:28:38 +01:00
Heiko Kernbach 5fd4c72bef Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-22 15:59:30 +01:00
Heiko Kernbach 6256232a81 css 2014-02-22 15:59:23 +01:00
scottashton 8f498447b9 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-22 15:47:23 +01:00
scottashton 7066cc2e01 dashboard refactoring 2014-02-22 15:46:57 +01:00
Heiko Kernbach 56991d0a77 css 2014-02-22 15:38:27 +01:00
gschwab 031cf6dc3e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	js/apps/system/aardvark/frontend/js/templates/queryView.ejs
2014-02-22 15:36:32 +01:00
gschwab 1790ee4dd9 git commit --amend --reset-author 2014-02-22 15:28:07 +01:00
Heiko Kernbach d7dc6ef6a8 updated labels 2014-02-22 15:27:10 +01:00
scottashton d4dff8745e Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-22 14:52:22 +01:00
scottashton 312c229718 dashboard refactoring 2014-02-22 14:52:18 +01:00
Heiko Kernbach f18bff2d72 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-22 14:14:02 +01:00
Heiko Kernbach 2e18ea0390 added bar graphs for distribution data 2014-02-22 14:13:50 +01:00
Michael Hackstein d190c35cb5 Removed the invisible AND from filters 2014-02-22 13:31:49 +01:00
Michael Hackstein f3d272d3e4 Fixed filter pagination 2014-02-22 13:30:23 +01:00
Michael Hackstein dede4aa400 Merged styles and stuff from devel 2014-02-22 12:29:02 +01:00
Michael Hackstein ed5399cd3f Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-22 12:28:01 +01:00
Michael Hackstein f00b398e89 Now complete line of dropdown is clickable 2014-02-22 12:27:25 +01:00
scottashton cd0e576819 dashboard refactoring 2014-02-22 12:24:45 +01:00
scottashton d966bcacf2 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-22 12:22:21 +01:00
scottashton e384988548 dashboard refactoring 2014-02-22 12:21:40 +01:00
Heiko Kernbach 9b2ba05ed3 css merge 2014-02-22 12:14:46 +01:00
scottashton 3b3d5f1b3b dashboard refactoring 2014-02-22 12:13:46 +01:00
Heiko Kernbach f47dd177b7 merge 2014-02-22 12:11:40 +01:00
Heiko Kernbach d8e1520b26 d3 graph 2014-02-22 12:09:44 +01:00
scottashton 04c314753d dashboard refactoring 2014-02-22 12:08:49 +01:00
Michael Hackstein 3bad7c9c18 The download menu is now hidden by default 2014-02-22 11:52:42 +01:00
Michael Hackstein 8cb5a1e07c Merge remote-tracking branch 'origin/devel' into sharding
And regenerated scss

Conflicts:
	js/apps/system/aardvark/frontend/js/templates/foxxInstalledView.ejs
	js/apps/system/aardvark/frontend/scss/_buttons.scss
	js/apps/system/aardvark/frontend/scss/_colors.scss
	js/apps/system/aardvark/frontend/scss/generated.css
2014-02-22 11:42:18 +01:00
Michael Hackstein 283c86a116 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-22 11:38:53 +01:00
Michael Hackstein 5fc5922349 Fixed graphviewer dropdown menu and several other css mismatches 2014-02-22 11:11:58 +01:00
scottashton 84ab966bcf dashboard refactoring 2014-02-22 10:52:45 +01:00
scottashton 2c2fc69c0a dashboard refactoring 2014-02-22 10:51:19 +01:00
Heiko Kernbach 090b9675d2 prep for distributed graphs 2014-02-22 10:51:00 +01:00
Heiko Kernbach 0eb14db9ed added highcharts library 2014-02-22 10:35:25 +01:00
Michael Hackstein b100eb85e4 Removed unused routes and views and templates 2014-02-22 08:44:24 +01:00
Michael Hackstein e9d8392e48 Fixed dropdown layout which was broken for imports 2014-02-22 08:15:55 +01:00
Michael Hackstein 629c533b6a Added new button definitions to scss, no bootstrap required there anymore 2014-02-22 00:16:41 +01:00
scottashton b5afb561e9 dashboard refactoring 2014-02-22 00:03:56 +01:00