Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added scroll to org list modal #10960

Merged
merged 2 commits into from Feb 20, 2018
Merged

added scroll to org list modal #10960

merged 2 commits into from Feb 20, 2018

Conversation

Ijin08
Copy link
Contributor

@Ijin08 Ijin08 commented Feb 19, 2018

fixes #10774

modalscroll

@codecov-io
Copy link

codecov-io commented Feb 19, 2018

Codecov Report

Merging #10960 into master will decrease coverage by 0.15%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master   #10960      +/-   ##
==========================================
- Coverage    51.7%   51.55%   -0.16%     
==========================================
  Files         343      343              
  Lines       24362    24247     -115     
  Branches     1415     1415              
==========================================
- Hits        12597    12501      -96     
+ Misses      11065    11046      -19     
  Partials      700      700

@@ -71,6 +70,7 @@ export class OrgSwitchCtrl {
}

export function orgSwitcher() {
console.log('hej');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hej!

@torkelo torkelo merged commit 9f4b7ac into master Feb 20, 2018
@torkelo torkelo added this to the 5.0.0-beta5 milestone Feb 20, 2018
ryantxu added a commit to NatelEnergy/grafana that referenced this pull request Feb 21, 2018
* grafana/master:
  fix: elasticsearch terms size now allows custom values again, fixes grafana#10124
  dev: docker-compose setup for prom2.
  fix: scrollbar position now to max right pos, fixes grafana#10982
  Fixes for heatmap panel in Grafana 5 (grafana#10973)
  fix: added new known data source plugins, and minor migration fix for v1 dashboards
  fix: fixes to signup flow, fixes grafana#9816
  fix: fixed github oauth login with allowed orgs filter, fixes grafana#10964, reverts grafana#10851
  fix: plugin dashboard did not get plugin id after import
  added scroll to org list modal (grafana#10960)
  added an if to check for null to sort null as 0 (grafana#10961)
  fix: alert history list now shows on graphs with manually added annotation events, fixes grafana#10968
  provisioning: dont ignore sample yaml files
  added hash rate units for monitoring mining processes
@bergquist bergquist deleted the 10774_modal_scroll branch March 7, 2018 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unable to switch org when too many orgs listed
3 participants