Commit Graph

5928 Commits (6cdc1e4d3726657ad5840af684189c16dd6921fc)
 

Author SHA1 Message Date
Torkel Ödegaard 6cdc1e4d37 feat(ux): minor tweaks and fixes, added hover submenu dropdowns 9 years ago
Torkel Ödegaard e7a202fe4d Merge branch 'master' into style-changes-bulletfactory 9 years ago
Torkel Ödegaard b5dc1727d2 fix(postgres): If password or user is empty use empty quotes for connection string, #3985 9 years ago
Torkel Ödegaard 53f5cb6553 fix(api): org name taken error now returns HTTP status code 409, closes 9 years ago
Torkel Ödegaard f797b19825 fix(build): changed from postinstall script to regular grunt task for the copying of npm dependencies into public dir, fixes #4003 9 years ago
Torkel Ödegaard 814ca99e3d fix(google tag manager): fixed link to google tag manager, fixes #4005 9 years ago
Carl Bergquist c483b2ff98 Merge pull request #3999 from mtanda/cloudwatch_custom_metrics_namespace 9 years ago
Carl Bergquist 2496202417 Merge pull request #3998 from utkarshcmu/ds-conf-box 9 years ago
Matt Toback 3c6fadb6f8 Merge pull request #4001 from mattttt/matt-updates-to-bulletactor 9 years ago
Matt Toback 055e5aff2a Merge branch 'style-changes-bulletfactory' of https://github.com/grafana/grafana into matt-updates-to-bulletactor 9 years ago
Matt Toback 692878b0c0 Checkbox fixes for light and dark themes, ready to hand over to trent for new images 9 years ago
Matt Toback a6061ce555 Checkboxes working 9 years ago
Torkel Ödegaard 2ea548850e Merge branch 'master' into style-changes-bulletfactory 9 years ago
Trent White d8b43a3d76 button size tweaks, user form tweaks 9 years ago
Trent White 6189208fa5 org and user form tweaks 9 years ago
Trent White daf8db71a8 button spacing tweak. Dropdown hover color tweak, sexy pattern added 9 years ago
Trent White c186d8b2be button text position to center text vertically 9 years ago
Trent White cd40362d47 sidenav tweaks, creating a content channel for the main content on non-dashboard pages 9 years ago
Mitsuhiro Tanda 81ad469533 (cloudwatch) custom metrics namespace support 9 years ago
utkarshcmu bb77070aab Merge branch 'master' of https://github.com/grafana/grafana into ds-conf-box 9 years ago
utkarshcmu c051ff3eac Removed unused commented code 9 years ago
Trent White ff913333a2 update sidebar 9 years ago
Torkel Ödegaard ac5f7ecdea fix(img): fixed img link on signup 9 years ago
Torkel Ödegaard 4e33e80957 fix(): clicking on items in graphites add function menu did not work, now works again, broken in recent panel refactorings 9 years ago
Torkel Ödegaard bf1b60564e fix(png rendering): fixed broken png rendering due to recent panel change 9 years ago
Torkel Ödegaard 50ddf7913a docs(): work on example app 9 years ago
Torkel Ödegaard 39bb9ce118 Merge branch 'master' of github.com:grafana/grafana 9 years ago
Torkel Ödegaard 2d8180fc9c fix(panels): restored panel name to edit mode 9 years ago
utkarshcmu fac51d92c5 Added DS deletion confirmation modal 9 years ago
Trent White 581fb8ebfd dropdown.less added 9 years ago
Trent White 0fa0b3b256 style changes to forms, icons updates and new buttons 9 years ago
Torkel Ödegaard 3b21e9fcf0 Merge pull request #3991 from utkarshcmu/small-fix 9 years ago
utkarshcmu 4c35c83b84 Minor html fix 9 years ago
Torkel Ödegaard 37c6a1ddf0 feat(app routes): worked on app routes, added unit test, changed Grafana-Context header to start with X to be standard compliant, got cloud saas queries to work via app route feature and header template 9 years ago
Torkel Ödegaard 9c0b89b9b0 Merge branch 'master' of github.com:grafana/grafana 9 years ago
Torkel Ödegaard ae39ec8585 feat(plugins): changed so that plugins can load css async via util function exposed from app/plugins/sdk 9 years ago
bergquist e37817285a docs(readme): declare code as bash 9 years ago
Torkel Ödegaard dfe0e258cd feat(text and css): html partials and css can be loaded via systemjs 9 years ago
Torkel Ödegaard eda23252e1 Merge branch 'master' of github.com:grafana/grafana 9 years ago
Torkel Ödegaard 257b824d4f feat(plugins): better logging and handling of loading plugins, try to create plugins dir if it does not exist, fixes #3974 9 years ago
bergquist b469904c7f fix(login): hide divider if no oath 9 years ago
Torkel Ödegaard 509b37eb91 dependency(): upgraded angularjs to 1.5.1 9 years ago
Torkel Ödegaard 9dac382fbf dependency(): updated go lib go-xorm 9 years ago
Torkel Ödegaard ddbdb54c04 Merge branch 'master' of github.com:grafana/grafana 9 years ago
Torkel Ödegaard 181a671bfb dependency(): upgraded go-sql-driver/mysql, fixes #3969 9 years ago
Torkel Ödegaard 1ce34ed907 Merge pull request #3968 from daniellee/issue3831 9 years ago
Torkel Ödegaard f9e7b14f2c cleanup(): removed old file 9 years ago
Torkel Ödegaard dad394523f fix(build): fixed minor issue in systemjs builder, and added SystemJs cache buster 9 years ago
Torkel Ödegaard 1c50eb345c Merge pull request #3975 from mtanda/prometheus_fix_annotation 9 years ago
Mitsuhiro Tanda 5c7689388d fix template url for annotation editor 9 years ago