Commit Graph
5949 Commits
Author SHA1 Message Date
Torkel Ödegaard 9e0ed7bc8e ux(less): less cleanup of unused styles, restructuring and consolidating, part 2 2016-02-14 21:00:25 +01:00
Torkel Ödegaard 50c79df70f ux(less): less cleanup of unused styles, restructuring and consolidating 2016-02-14 20:44:41 +01:00
Torkel Ödegaard f888716d81 ux(less): refactoring and restructuring less files 2016-02-14 20:05:22 +01:00
Torkel Ödegaard 5274f93db7 ux(less): began less / bootstrap less cleanup and restructuring 2016-02-14 18:02:53 +01:00
Torkel Ödegaard e32ee9f02e ux(admin): admin pages overhaul 2016-02-14 17:37:05 +01:00
Torkel Ödegaard 48c936e9a9 Merge branch 'style-changes-bulletfactory' of github.com:grafana/grafana into style-changes-bulletfactory 2016-02-14 15:09:22 +01:00
Torkel Ödegaard b77bce1961 Merge branch 'master' of github.com:grafana/grafana into style-changes-bulletfactory 2016-02-14 15:09:10 +01:00
Torkel Ödegaard f3d277cbab ux(): general ux polish and experimental work on page header 2016-02-14 13:41:42 +01:00
Torkel Ödegaard afa4ee9a28 Merge branch 'master' of github.com:grafana/grafana 2016-02-14 10:39:30 +01:00
Torkel Ödegaard 92f4442356 fix(influxdb): fixed annotations editor, broken recently in master due to plugin changes, fixes #4023 2016-02-14 10:39:20 +01:00
Torkel Ödegaard fa06040ed2 ux(): updated playlist, other other minor fixes 2016-02-13 22:12:15 +01:00
Torkel Ödegaard eae4bb74dd ux(profile): update profile forms with new form markup and classes 2016-02-13 20:54:00 +01:00
Torkel Ödegaard caa765ec32 ux(forms): major simplification of norm-form markup and css 2016-02-13 19:42:05 +01:00
Torkel Ödegaard 1004515bda ux(fix): fixed page header height without using fixed height, now 100% height works 2016-02-13 17:01:18 +01:00
Torkel Ödegaard 7d75e0e53c ux(): minor fixes and cleanup, fixes for white theme 2016-02-13 16:45:07 +01:00
Torkel Ödegaard f7e3297a0f ux(): updated navbar on all pages to new style, no subnav/dropdown yet though 2016-02-13 14:32:20 +01:00
Torkel Ödegaard 14952de2ee Merge pull request #4009 from utkarshcmu/viewer-bug
Viewers restricted to edit panel
2016-02-13 10:30:02 +01:00
Trent White f98dbd249e update navbar and elements on playlist snapshots and change apps to plugins 2016-02-12 17:20:58 -05:00
Torkel Ödegaard b369b7e495 ux(): added page-dashboard body class 2016-02-12 18:55:45 +01:00
utkarshcmu 23167a0bb3 Viewers restricted to edit panel 2016-02-12 07:34:56 -08:00
Torkel Ödegaard 8c1195b277 refactor(): no change, only minor refactor, and update of fontsize to 14px 2016-02-12 15:00:47 +01:00
Torkel Ödegaard 6cdc1e4d37 feat(ux): minor tweaks and fixes, added hover submenu dropdowns 2016-02-12 11:21:42 +01:00
Torkel Ödegaard e7a202fe4d Merge branch 'master' into style-changes-bulletfactory 2016-02-12 10:14:06 +01:00
Torkel Ödegaard b5dc1727d2 fix(postgres): If password or user is empty use empty quotes for connection string, #3985 2016-02-12 10:10:07 +01:00
Torkel Ödegaard 53f5cb6553 fix(api): org name taken error now returns HTTP status code 409, closes 2016-02-12 10:01:52 +01:00
Torkel Ödegaard f797b19825 fix(build): changed from postinstall script to regular grunt task for the copying of npm dependencies into public dir, fixes #4003 2016-02-12 09:58:00 +01:00
Torkel Ödegaard 814ca99e3d fix(google tag manager): fixed link to google tag manager, fixes #4005 2016-02-12 09:52:52 +01:00
Carl Bergquist c483b2ff98 Merge pull request #3999 from mtanda/cloudwatch_custom_metrics_namespace
(cloudwatch) custom metrics namespace support
2016-02-12 09:47:42 +01:00
Carl Bergquist 2496202417 Merge pull request #3998 from utkarshcmu/ds-conf-box
Added DS deletion confirmation modal
2016-02-12 09:46:41 +01:00
Matt Toback 3c6fadb6f8 Merge pull request #4001 from mattttt/matt-updates-to-bulletactor
Matt updates to bulletactor
2016-02-11 15:55:32 -05:00
Matt Toback 055e5aff2a Merge branch 'style-changes-bulletfactory' of https://github.com/grafana/grafana into matt-updates-to-bulletactor 2016-02-11 15:47:50 -05:00
Matt Toback 692878b0c0 Checkbox fixes for light and dark themes, ready to hand over to trent for new images 2016-02-11 15:46:37 -05:00
Matt Toback a6061ce555 Checkboxes working 2016-02-11 15:29:57 -05:00
Torkel Ödegaard 2ea548850e Merge branch 'master' into style-changes-bulletfactory
Conflicts:
	pkg/api/index.go
	public/less/sidemenu.less
2016-02-11 21:23:54 +01:00
Trent White d8b43a3d76 button size tweaks, user form tweaks 2016-02-11 14:41:21 -05:00
Trent White 6189208fa5 org and user form tweaks 2016-02-11 14:18:55 -05:00
Trent White daf8db71a8 button spacing tweak. Dropdown hover color tweak, sexy pattern added 2016-02-11 13:00:36 -05:00
Trent White c186d8b2be button text position to center text vertically 2016-02-11 12:27:32 -05:00
Trent White cd40362d47 sidenav tweaks, creating a content channel for the main content on non-dashboard pages 2016-02-11 12:02:12 -05:00
Mitsuhiro Tanda 81ad469533 (cloudwatch) custom metrics namespace support 2016-02-12 00:30:33 +09:00
utkarshcmu bb77070aab Merge branch 'master' of https://github.com/grafana/grafana into ds-conf-box 2016-02-11 07:03:04 -08:00
utkarshcmu c051ff3eac Removed unused commented code 2016-02-11 07:01:45 -08:00
Trent White ff913333a2 update sidebar 2016-02-11 09:53:48 -05:00
Torkel Ödegaard ac5f7ecdea fix(img): fixed img link on signup 2016-02-11 15:49:55 +01:00
Torkel Ödegaard 4e33e80957 fix(): clicking on items in graphites add function menu did not work, now works again, broken in recent panel refactorings 2016-02-11 15:25:34 +01:00
Torkel Ödegaard bf1b60564e fix(png rendering): fixed broken png rendering due to recent panel change 2016-02-11 14:34:15 +01:00
Torkel Ödegaard 50ddf7913a docs(): work on example app 2016-02-11 14:28:04 +01:00
Torkel Ödegaard 39bb9ce118 Merge branch 'master' of github.com:grafana/grafana 2016-02-11 13:42:33 +01:00
Torkel Ödegaard 2d8180fc9c fix(panels): restored panel name to edit mode 2016-02-11 13:42:18 +01:00
utkarshcmu fac51d92c5 Added DS deletion confirmation modal 2016-02-11 00:06:04 -08:00