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

51 Commits

Author SHA1 Message Date
Michael Hackstein 53abe18fe5 Fixed cluster dashboard on server failure 2014-08-06 09:18:19 +02:00
Michael Hackstein 7aa7697ded Continued implementing async functionality in cluster dashboard 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/showClusterView.js
 2014-08-06 09:16:08 +02:00
Michael Hackstein c085a24d15 Fixed scss-lint warnings 2014-05-28 23:39:28 +02:00
Frank Celler 0f70998408 fixed merge errors 2014-05-25 23:47:29 +02:00
Claudius Weinberger 7c00fad11a cluster dashboard changes 2014-05-25 23:33:38 +02:00
Michael Hackstein 841f01e390 Added a close button to cluster popup 
Conflicts:
	js/apps/system/aardvark/frontend/scss/_modals.scss
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-05-25 23:33:05 +02:00
Claudius Weinberger 68e9316a12 cluster dashboard changes 
Conflicts:
	js/apps/system/aardvark/frontend/scss/cluster.css
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-05-25 23:32:07 +02:00
Michael Hackstein dd28af0d3a Fixed style of new dashboard in cluster overview on click 
Conflicts:
	js/apps/system/aardvark/frontend/scss/cluster.css
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-05-25 23:25:51 +02:00
scottashton 00a4c8b27e fixed scss bug 2014-05-12 12:55:11 +02:00
scottashton 5b644570d9 fixed scsslint errors 2014-05-12 11:51:26 +02:00
Michael Hackstein 9596b7d9c0 Resized the legend of graphs based on screen-width 2014-05-03 21:05:46 +02:00
scottashton 4bbf9970a9 minor bugfixes and resizing of detailcharts 2014-04-23 16:46:44 +02:00
scottashton 0e96bcde17 SCSS HELL 2014-04-17 17:27:05 +02:00
scottashton e4d5dfd7f2 clusterdashboard refactoring, backbone events are now passed into modalview 2014-04-17 14:12:13 +02:00
scottashton f1bf4e427b scss-linted files and started clusterserver dashboard ng 2014-04-16 17:03:24 +02:00
gschwab 552566fa28 fixed css for cluster# 2014-04-11 15:12:55 +02:00
gschwab 527d88747b added connection check for multi machine cluster 2014-03-24 09:19:50 +01:00
scottashton 0e3da446d1 kill modal.css 2014-03-21 15:32:24 +01:00
Heiko Kernbach 4fb7409cd9 fixed visual bugs in scss 2014-03-20 16:00:42 +01:00
scottashton d5f3352411 css refactoring 2014-03-19 13:39:22 +01:00
scottashton 24b9e9492f DASHBOARD CLEANUP 2014-03-17 15:04:09 +01:00
Michael Hackstein ad8e6cf172 SCSS-Lint fix 2014-03-09 09:06:23 +01:00
gschwab a3f449f62a generated new cluster.css 2014-03-07 17:01:32 +01:00
Michael Hackstein cdf2552d93 Fixed merge conflicts and fixed scss conflicts 
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

Conflicts:
	js/apps/system/aardvark/frontend/scss/_colors.scss
	js/apps/system/aardvark/frontend/scss/_tiles.scss
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-03-07 15:26:10 +01:00
Michael Hackstein db31aec469 Generated css 2014-03-07 15:16:03 +01:00
Michael Hackstein 169b3f3138 Last second style fixes 2014-03-04 15:37:47 +01:00
Michael Hackstein 3fe7b5d75d Fixed style of GUI button and made Coordinator Icon clickable 2014-03-04 09:20:37 +01:00
Michael Hackstein 182fd37a43 Styled gui button for cluster overview 2014-03-04 09:15:36 +01:00
Michael Hackstein dc6882ffec Style fixes 2014-03-04 09:02:00 +01:00
scottashton 09e5069ec8 cleaned up merge mess 2014-03-03 15:24:10 +01:00
scottashton 6c3a3717d0 fixed cluster chart 2014-03-03 15:12:11 +01:00
Michael Hackstein 24f98d69db Fixed a bug where it was not posible to shutdown a cluster, change the plan and restart it without reloading 2014-03-03 14:13:40 +01:00
Michael Hackstein 6d3441ec87 Resizing of Application image now works again 2014-03-03 11:04:02 +01:00
Michael Hackstein 472c755f43 Added Style for close button 2014-03-03 09:49:58 +01:00
Michael Hackstein 7940a3cf01 Fixed shutdownbutton size and moved icons for coordinators and db servers 2014-03-01 22:07:49 +01:00
Michael Hackstein 00b504301d Updated Coordinator icon 2014-03-01 20:55:19 +01:00
scottashton edef8592b7 sharedClusterView refactoring 2014-02-28 19:02:09 +01:00
gschwab d7d41d7ca5 merged project planner into cluster 2014-02-27 10:51:27 +01:00
Michael Hackstein 0636233f02 Upgraded the scenario selector and inserted upload of plan buttons, however they are not working yet. Also the test planner now offers usefull defaults in the input fields 2014-02-25 17:49:20 +01:00
Jan Steemann 23ba186b0d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/CapConstraint/cap-constraint.c
	js/apps/system/aardvark/frontend/scss/_tiles.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/frontend/scss/style.scss
	js/common/modules/org/arangodb/users-common.js
 2014-02-25 17:21:14 +01:00
Michael Hackstein 0538a0ef5b The cluster overview now displays information about servers that have either not registered or have been shutteddown normally. 2014-02-24 17:32:13 +01:00
Michael Hackstein d938bed8ea Merged devel and regenerated scss 2014-02-22 16:44:50 +01:00
Michael Hackstein dede4aa400 Merged styles and stuff from devel 2014-02-22 12:29:02 +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 c965238579 Imported buttons scss 2014-02-21 23:35:19 +01:00
Michael Hackstein 9dda1559bb Some css fixes 2014-02-21 21:24:05 +01:00
Michael Hackstein f71ede2d17 Added a view for the shard distribution 2014-02-21 17:04:19 +01:00
Michael Hackstein d0d61fb5a3 Integerated the new underscore templates in the admin interface. Performancebost of 50% yay 2014-02-20 20:31: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
Michael Hackstein e8134d4a75 First version of cluster server overview 2014-02-18 16:45:10 +01:00