IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,443 Commits 5,454 Branches 554 Tags 1.9 GiB
3af4b1ff98
Commit Graph

2013 Commits

Author SHA1 Message Date
bergquist
b3f2f0fa1e ux(import): migrate to gf-form 2016-02-23 07:55:24 +01:00
Carl Bergquist
f788c8cb37 Merge pull request #3632 from mtanda/cloudwatch_annotation_describe_alarms 
(cloudwatch) multiple CloudWatch alarm annotation support
 2016-02-23 07:41:10 +01:00
utkarshcmu
16656af847 some more nav fixes 2016-02-22 14:03:05 -08:00
Matt
3b279983e6 Tried to reduce the opacity of the header bottom-border some to make it seem less intense. Want to get some feedback. Also added a box-shadow to the tags to smooth out the edges (something we've done at raintank) 2016-02-22 17:01:58 -05:00
Torkel Ödegaard
55d4392d90 fix(annotations editor): fixed lagging annotations editor view 2016-02-22 21:55:03 +01:00
Torkel Ödegaard
acfc119409 ux(): added New and Import under divider to dashboard subnav 2016-02-22 21:51:31 +01:00
Matt
2215095be8 adjusted button copy on New playlist page 2016-02-22 14:30:35 -05:00
Matt
28d2966819 Merge branch 'master' of https://github.com/grafana/grafana into select-form-updates 2016-02-22 14:25:34 -05:00
Torkel Ödegaard
92efd17952 fix(ux): fixed panel json edit view 2016-02-22 19:03:53 +01:00
Torkel Ödegaard
3a7ec2a26e fixed unit test 2016-02-22 19:00:48 +01:00
Torkel Ödegaard
56a05d78bd Merge branch 'popover-to-drop' 2016-02-22 18:56:54 +01:00
Torkel Ödegaard
fa5cf602f5 removed old popover and unused boostrap components 2016-02-22 18:56:35 +01:00
Torkel Ödegaard
c94659f552 ux(color popover): refactored color popover to use drop lib 2016-02-22 18:46:58 +01:00
bergquist
1164510004 ux(dashboard): migrate view json to gf-form 2016-02-22 18:03:51 +01:00
Matt
f24867029c Merge branch 'master' of https://github.com/grafana/grafana into select-form-updates 2016-02-22 11:47:50 -05:00
Matt
680ff95b8e Form adjustments and startting to add sidemenu 2016-02-22 11:39:11 -05:00
bergquist
31ea5f550f feat(playlist): changes tag result into a list 2016-02-22 16:45:14 +01:00
bergquist
fc62af6b3a style(admin): remove white spaces 2016-02-22 16:21:14 +01:00
Carl Bergquist
f8533e6641 Merge pull request #4083 from marknmel/patch-1 
Update kbn.js - correct typo for megabits/sec
 2016-02-22 16:08:25 +01:00
Carl Bergquist
87fec9d434 Merge pull request #4093 from utkarshcmu/minor-nav 
some nav fixes
 2016-02-22 16:07:39 +01:00
bergquist
b1e9327a2b ux(admin): migrates edit org page 2016-02-22 16:05:55 +01:00
bergquist
0aa4b47d59 ux(admin): migrated admin new user page to gf-form 2016-02-22 15:56:18 +01:00
bergquist
b9d50fa144 ux(admin): migrates admin edit user page 2016-02-22 15:32:55 +01:00
Torkel Ödegaard
3231d767d5 in progress work 2016-02-22 15:15:01 +01:00
Torkel Ödegaard
3f05b4bb1e fix(annotations): updated annotations query editor 2016-02-22 14:54:19 +01:00
Torkel Ödegaard
9eabd956b7 ux(): tweak to help popover annimation and fixed pull-right state 2016-02-22 14:20:43 +01:00
Torkel Ödegaard
eb58414600 ux(): fixed sidemenu submenu hover issue that caused it to be hidden as the mouse tried to move on to the submenu 2016-02-22 12:39:56 +01:00
Torkel Ödegaard
cb83c237f4 Merge branch 'master' of github.com:grafana/grafana 
Conflicts:
	public/sass/_grafana.scss
 2016-02-22 12:00:57 +01:00
Torkel Ödegaard
773a13dc26 fix(): fixed systemjs config for test 2016-02-22 11:45:10 +01:00
Torkel Ödegaard
8c2f7ac083 Merge branch 'master' of github.com:grafana/grafana 2016-02-22 11:42:11 +01:00
Torkel Ödegaard
f375c3000d ux(): help popover 2016-02-22 11:41:50 +01:00
bergquist
ea4ce0ce1f ux(playlist): finalize the ux for playlists 2016-02-22 11:29:09 +01:00
benrubson
c9fe2bab60 make it more smartly 2016-02-22 10:27:08 +01:00
bergquist
6c617ba28c fix(annotations): rearrange missplaced save button 2016-02-22 10:21:22 +01:00
Torkel Ödegaard
b98c826e95 ux(): worked on new popover 2016-02-22 10:17:35 +01:00
benrubson
2034d4b971 update kbn specs to make tests OK 2016-02-22 10:12:02 +01:00
bergquist
f225bb0032 ux(annotations): migrate annotations editors to new form 2016-02-22 10:07:02 +01:00
benrubson
69b87fdb9a make auto interval calculation more accurate 2016-02-22 08:55:52 +01:00
benrubson
6f70445654 Add some more auto interval steps 2016-02-22 08:02:01 +01:00
Torkel Ödegaard
145c14ed57 Merge branch 'master' of github.com:grafana/grafana 
Conflicts:
	public/sass/.sass-lint.yml
	tasks/options/sasslint.js
 2016-02-22 05:52:02 +01:00
benrubson
b9843fe6d1 Code style typo 2016-02-21 22:07:01 +01:00
benrubson
ab9757082e Code style typo 2016-02-21 22:00:00 +01:00
benrubson
d6e4fb46cf Add a minimum value option for template auto interval 2016-02-21 21:48:09 +01:00
Torkel Ödegaard
a93fe5b2b2 poc(): tether drop 2016-02-21 18:08:44 +01:00
Torkel Ödegaard
8f9c3c8381 lib(): added teather lib and tested it with the panel menu 2016-02-21 16:44:11 +01:00
Torkel Ödegaard
363f36dfae ux(): tweaks 2016-02-21 15:21:01 +01:00
Torkel Ödegaard
7328f4d3fd ux(): minor tweak 2016-02-21 13:07:17 +01:00
Torkel Ödegaard
8f3b6a23f6 fix(): gradient hover only on main submenu item 2016-02-21 12:49:30 +01:00
Torkel Ödegaard
cc4fdd6d0c ux(): fixed issue with cach buster for temlpates, and updated on hover style for sidemenu to look better 2016-02-21 12:47:57 +01:00
Torkel Ödegaard
3781a099dd fix(): removed css background that should not have been there in last commit 2016-02-21 09:06:59 +01:00
Torkel Ödegaard
e4d52b2851 fix(snapshot): fixed snapshot header, fixes #4094 2016-02-21 09:02:32 +01:00
Torkel Ödegaard
ac45ccbad7 fix(panel): fixed text panel issue due to recent style changes, fixes #4095 2016-02-21 08:51:01 +01:00
Torkel Ödegaard
1a412378db fix(forms): reverted back to old checkboxes as the new ones are broken and missing clear state, fixes #4096 2016-02-21 08:18:49 +01:00
utkarshcmu
17904a6e8b some nav fixes 2016-02-20 15:33:58 -08:00
Torkel Ödegaard
9c47fdeb2f ux(): tweaks to light theme 2016-02-21 00:31:35 +01:00
Torkel Ödegaard
808ac2cefc clean(): removed trailing whitespce 2016-02-21 00:08:35 +01:00
Torkel Ödegaard
aaf6dd2cd6 Merge branch 'avatar' 2016-02-21 00:06:45 +01:00
Torkel Ödegaard
08f7ccff38 feat(avatar): added server side proxy and cache of gravatar requests 2016-02-21 00:06:28 +01:00
Matt
a2731da987 Errant space and no new line on animations mixin! grr 2016-02-20 14:44:21 -05:00
Matt
a8e1572955 Merge branch 'master' of https://github.com/grafana/grafana into matt-weekend-ui 2016-02-20 14:40:25 -05:00
Matt
3ca8e8a6d2 Added a mixin to handle vendor prefixes for animations. Trying out slight opacity on menu 2016-02-20 14:40:16 -05:00
Torkel Ödegaard
bf4a00b663 ux(): added lines backgrounds, did not add them to the page background, could not make them look good / fit in without being distracting 2016-02-20 18:50:41 +01:00
Torkel Ödegaard
4ab041f79e ux(): added sass linter, almost no rules enabled yet 2016-02-20 18:31:09 +01:00
Torkel Ödegaard
f808baafa7 ux(): fixes to side menu and gravatar url 2016-02-20 17:43:26 +01:00
Torkel Ödegaard
1f28ff6890 ux(): added gf-form-select-wrapper 2016-02-20 17:21:35 +01:00
Torkel Ödegaard
640c9a49d8 ux(): merge fixes 2016-02-20 16:51:54 +01:00
Torkel Ödegaard
5d51b439d2 ux(): trying to cleanup new form styles, probably broken it 2016-02-20 16:34:40 +01:00
Matt
9ae050f0e5 Trying to fix gf-form styles 2016-02-20 10:18:16 -05:00
Torkel Ödegaard
c77f91213c ux(): minor tweak 2016-02-20 16:16:29 +01:00
Matt
ab4957684f Merged with master, I think 2016-02-20 10:13:18 -05:00
Torkel Ödegaard
1dbaabffbc ux(): dark shade / contrast mini tweak 2016-02-20 16:09:31 +01:00
Torkel Ödegaard
d42bfc2570 ux(): fixed compile issue with last commit 2016-02-20 15:48:42 +01:00
Torkel Ödegaard
9ed45ba761 ux(): clean / simplify markup and css for navbar button 2016-02-20 15:36:52 +01:00
Matt
9d893eec01 Adding delay and animation to submenu 2016-02-20 09:02:12 -05:00
Torkel Ödegaard
52241b8e0b ux(): completed gf-size class rename 2016-02-20 14:48:10 +01:00
Torkel Ödegaard
701a2fdcf3 ux(): tweaks and polish, and also simpifying width classes, gf-size-xxx and gf-size-max-xx are now width-(1-30), and max-width-(1-30) 2016-02-20 14:21:39 +01:00
Torkel Ödegaard
995f17493e ux(): updated influxdb datasource edit forms 2016-02-20 12:55:47 +01:00
Torkel Ödegaard
eb787adccd ux(): added style guide to admin page 2016-02-20 11:35:10 +01:00
Torkel Ödegaard
57e6e0092d ux(): more work on style guide 2016-02-20 11:32:50 +01:00
Torkel Ödegaard
a685e46fb6 ux(): minor tweaks 2016-02-20 11:05:06 +01:00
Matt
1144988443 Merged trent's styles and added admin submenu 2016-02-19 22:00:29 -05:00
Matthew Toback
27dc32e2e8 Started moving select box styles into gf-form 2016-02-19 21:24:46 -05:00
Trent White
6721cec73f created secondary button style, added a couple of variables, played with the plugins page to get the underline in place. Worth a look, but check that I was building everything properly :) 2016-02-19 18:22:24 -05:00
Trent White
18bbefee1c saw how checkbox images were called in css variables, so updated pageImgURL variable. 2016-02-19 17:39:18 -05:00
Trent White
bd0357b637 added angular gradient to page and login. Tweaked header underline to not be so heavy. Tweaked stacked logo on login. Created an alternative to avatar when there's no connection to gravatar - could use work, but I think you get the idea. 2016-02-19 17:34:09 -05:00
Matt Toback
49507ea377 Beginnings of changes 2016-02-19 14:09:48 -05:00
marknmel
2c0b191ef5 Updated typos - Kilobits, Megabits and Gigabits 
Update typos - Kilobits, Megabits and Gigabits - not Kilobites, Megabites, or Gigabites
 2016-02-19 10:24:49 -05:00
marknmel
02ac7a4001 Update kbn.js 
data rate for Mbits has typo - should be megabits/sec - not megabites/sec
 2016-02-19 10:05:01 -05:00
Torkel Ödegaard
fbe422008a ux(): began work on sasslint 2016-02-19 15:58:26 +01:00
Torkel Ödegaard
d0d21ba9a6 ux(): updated orange color and fixed sidemenu background on dark theme 2016-02-19 15:33:24 +01:00
bergquist
c78669353f ux(playlist): migrate playlists page to new styles 2016-02-19 15:19:01 +01:00
bergquist
afb62638a8 ux(import): convert to new css format 2016-02-19 15:04:49 +01:00
Torkel Ödegaard
4a062b6d00 ux(): colors refactoring 2016-02-19 14:24:19 +01:00
bergquist
6590e6fae8 feat(panel-menu): remove duplicate in fullscreen 
closes #4064
 2016-02-19 14:18:26 +01:00
bergquist
ab7bbd5a44 ux(datasource): align name and http settings 2016-02-19 14:08:23 +01:00
bergquist
317f2d043f ux(playlist): migrate to new stylesheet 2016-02-19 13:53:29 +01:00
Torkel Ödegaard
c21b353042 ux(): color/grays palate refactoring 2016-02-19 12:26:59 +01:00
bergquist
d769f6c084 ux(timepicker): fix css for the timepicker 2016-02-19 09:13:22 +01:00
Torkel Ödegaard
e24e34619a ux(): began long on tiresome work on color refactors, polished button styles, added buttons to styleguide 2016-02-18 20:41:23 +01:00
Torkel Ödegaard
ac1648c946 ux(): minor tweaks 2016-02-18 19:47:00 +01:00
Torkel Ödegaard
65f9cc986a ux(): styleguide with auto generated colors generated from the sass variable files 2016-02-18 18:01:24 +01:00
Torkel Ödegaard
252cd4901b ux(): added style guide page 2016-02-18 18:01:23 +01:00
bergquist
a2b69e96b9 fix(playlist): give buttons more space to not squash 2016-02-18 15:58:02 +01:00
Torkel Ödegaard
3a0a8810d1 ux(): making light theme better and changing page header 2016-02-18 15:22:20 +01:00
Torkel Ödegaard
b9c60125e8 fix(ux): fixed broken tight forms (mainly query editors) 2016-02-18 14:57:04 +01:00
Torkel Ödegaard
cae975cb39 ux(): fixed login, signup, signup step2 and invite views 2016-02-18 14:44:36 +01:00
Torkel Ödegaard
2f2326006d Merge remote-tracking branch 'origin/master' into style-changes-bulletfactory 2016-02-18 13:37:31 +01:00
Torkel Ödegaard
22fac87473 added little more spacing between sections 2016-02-18 12:28:49 +01:00
Torkel Ödegaard
3003a8cb6e ux(sass): a lot of polish on headings and margins, ONLY USE bottom margins, othewise margin collapse causes issues 2016-02-18 12:16:47 +01:00
bergquist
f4908b6315 feat(panel): disable span options in fullscreen 
closes #4018
 2016-02-18 11:19:29 +01:00
bergquist
63ca9f6f5a fix(legend): only add overflow scroll when needed 
In firefox the scrollbar is always show when setting
overflow: scroll. This commit makes sure the overflow
setting is only applied when needed.

closes #4049
 2016-02-18 11:08:13 +01:00
Torkel Ödegaard
25ca751ab8 Merge branch 'style-changes-bulletfactory' of github.com:grafana/grafana into style-changes-bulletfactory 2016-02-18 09:44:46 +01:00
Torkel Ödegaard
08c1def8b7 ux(): minor update 2016-02-18 09:44:40 +01:00
utkarshcmu
71210dd624 Merge branch 'master' of https://github.com/grafana/grafana into user-removal 2016-02-17 23:09:23 -08:00
Trent White
b5d4a678d4 pinned sidebar min-height fix 2016-02-17 12:55:57 -05:00
Torkel Ödegaard
8193d50da7 ux(): updated graph form styles 2016-02-17 13:46:18 +01:00
Torkel Ödegaard
ffc9a8322b Merge pull request #4054 from mtanda/cloudwatch_template_dimension_fix 
(cloudwatch) fix template replace in legend
 2016-02-17 06:11:26 +01:00
Mitsuhiro Tanda
f28eec8be3 (cloudwatch) fix template replace with panel repeat 2016-02-17 11:59:53 +09:00
Mitsuhiro Tanda
807c052fea (cloudwatch) fix dimension template replace in legend 2016-02-17 11:55:11 +09:00
Matt Toback
45e232ef62 Added a calc to make the page height 100%. Well supported, verified on caniuse 2016-02-16 16:32:09 -05:00
Torkel Ödegaard
9accb962aa ux(sass): temp fix for dashboard edit tabs 2016-02-16 15:21:07 +01:00
Torkel Ödegaard
4ab3542c88 ux(): fixes 2016-02-16 15:12:20 +01:00
Torkel Ödegaard
5a67ca255f ux(): fixes to light theme 2016-02-16 15:03:33 +01:00
Torkel Ödegaard
c97dbf390e ux(): fixed invite box 2016-02-16 14:39:45 +01:00
Torkel Ödegaard
008a031493 ux(sass): fixes and tweaks 2016-02-16 14:07:41 +01:00
Torkel Ödegaard
b05939ec9a ux(sass): work on sass variables, getting messy 2016-02-16 12:15:09 +01:00
Torkel Ödegaard
7c917156ee ux(sass): variable refactoring 2016-02-16 10:42:06 +01:00
Torkel Ödegaard
febad7b1d7 ux(saas): variable renaming 2016-02-16 09:42:46 +01:00
Carl Bergquist
1febd578a4 Merge pull request #4020 from AxelVoitier/master 
Adding units volt-ampere (VA), kilovolt-ampere (kVA) and volt-ampere reactive (var)
 2016-02-16 09:00:19 +01:00
Torkel Ödegaard
1cd3985913 ux(sass): variable renaming 2016-02-16 08:30:37 +01:00
Torkel Ödegaard
058c905432 ux(sass): variable renaming 2016-02-16 08:17:08 +01:00
Torkel Ödegaard
41b775561a ux(): datasource form tweaks 2016-02-16 07:57:58 +01:00
Marcus Kempe
14312d225c Added exporting graph data to CSV with series.alias in columns. 2016-02-15 22:49:25 +01:00
Torkel Ödegaard
262a03667e ux(): updated some forms with the new flexbox based classes 2016-02-15 22:37:48 +01:00
Torkel Ödegaard
422decde3b ux(): trying out flexbox for new form styles 2016-02-15 22:24:28 +01:00
Torkel Ödegaard
6fc2b69697 ux(sass): restored old responsive rules 2016-02-15 19:04:35 +01:00
Torkel Ödegaard
594ab0e2b5 ux(sass): restored missing clearfix class 2016-02-15 18:44:49 +01:00
Torkel Ödegaard
9045be0c12 ux(sass): rename less folder to sass 2016-02-15 18:17:06 +01:00
Torkel Ödegaard
bc4c71a7c6 ux(sass): added bootstrap 4 grid and breakpoint system 2016-02-15 18:04:45 +01:00
Torkel Ödegaard
18079aaced ux(sass): restored label colors 2016-02-15 17:15:54 +01:00
Torkel Ödegaard
47644f2755 ux(): restored dropdown divider class 2016-02-15 17:14:02 +01:00
Torkel Ödegaard
43b91ea0d6 ux(saas): renamed scss partial files to have underscore before 2016-02-15 17:07:46 +01:00
Torkel Ödegaard
83bf63641c ux(): mini light theme fix 2016-02-15 16:55:39 +01:00
Torkel Ödegaard
1e891f434d move to sass is starting to work 2016-02-15 16:44:23 +01:00
Torkel Ödegaard
30ddfc7a28 ux(): fix for dashboard header 2016-02-15 16:09:05 +01:00
Torkel Ödegaard
5447bd007a ux(css): migrated from less to saas 2016-02-15 16:02:58 +01:00
Torkel Ödegaard
f8e233e400 commit(): saas changs 2016-02-15 15:27:41 +01:00
Torkel Ödegaard
c961d6218d ux(less): removed normalize 2016-02-15 14:43:33 +01:00
Torkel Ödegaard
1176b68c6a ux(less): moved and consolidated remaining bootstrap stuff, now only grid system left 2016-02-15 14:24:51 +01:00
Torkel Ödegaard
580cd510d5 ux(less): moved mixins out from bootstrap and removed unused mixins 2016-02-15 14:18:17 +01:00
Torkel Ödegaard
c11322a016 ux(less): more less cleanup, restructuring 2016-02-15 13:51:56 +01:00
Torkel Ödegaard
35a1a04f50 ux(buttons): began work on buttons consolidation and cleanup / refactor 2016-02-15 11:50:31 +01:00
Torkel Ödegaard
7c9728df47 ux(less): refactoring and cleanup 2016-02-15 10:49:20 +01:00
utkarshcmu
b9b3b75c0c Fixing snapshot templating bug 2016-02-14 22:13:59 -08:00
Torkel Ödegaard
37b031afcf ux(css): more progress on css refactor / cleanup 2016-02-14 22:33:03 +01:00
Torkel Ödegaard
fcc3a7f6e4 ux(less): more less refactoring and cleanup, modals, and dropdowns 2016-02-14 22:13:06 +01:00
Torkel Ödegaard
5836a6ec4b ux(less): more less refactoring and cleanup, consolidating alerts 2016-02-14 21:50:06 +01:00
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
utkarshcmu
47b6f01c8b confirmation box added for user removal 2016-02-13 18:21:18 -08:00
utkarshcmu
68225d64aa Converted org_users_ctrl to typescript 2016-02-13 17:55:49 -08: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
Axel Voitier
e00f9611f4 Adding units volt-ampere (VA), kilovolt-ampere (kVA) and volt-ampere reactive (var). 2016-02-13 19:23:30 +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
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
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
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
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
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
Trent White
581fb8ebfd dropdown.less added 2016-02-10 18:14:52 -05:00
Trent White
0fa0b3b256 style changes to forms, icons updates and new buttons 2016-02-10 18:14:26 -05:00
utkarshcmu
4c35c83b84 Minor html fix 2016-02-10 11:13:17 -08:00
Torkel Ödegaard
ae39ec8585 feat(plugins): changed so that plugins can load css async via util function exposed from app/plugins/sdk 2016-02-10 13:09:39 +01:00
Torkel Ödegaard
dfe0e258cd feat(text and css): html partials and css can be loaded via systemjs 2016-02-10 11:54:17 +01:00
Torkel Ödegaard
eda23252e1 Merge branch 'master' of github.com:grafana/grafana 2016-02-10 11:03:26 +01:00
Torkel Ödegaard
257b824d4f feat(plugins): better logging and handling of loading plugins, try to create plugins dir if it does not exist, fixes #3974 2016-02-10 11:03:12 +01:00
bergquist
b469904c7f fix(login): hide divider if no oath 
closes #3980
 2016-02-10 10:41:43 +01:00
Torkel Ödegaard
509b37eb91 dependency(): upgraded angularjs to 1.5.1 2016-02-10 10:15:11 +01:00
Torkel Ödegaard
1ce34ed907 Merge pull request #3968 from daniellee/issue3831 
Fixes when panel repeat is removed by clearing the templating variables
 2016-02-10 09:41:06 +01:00
Torkel Ödegaard
f9e7b14f2c cleanup(): removed old file 2016-02-10 08:32:16 +01:00
Torkel Ödegaard
dad394523f fix(build): fixed minor issue in systemjs builder, and added SystemJs cache buster 2016-02-10 06:50:17 +01:00
Mitsuhiro Tanda
5c7689388d fix template url for annotation editor 2016-02-10 11:42:59 +09:00
Torkel Ödegaard
fe2e6b8a80 feat(apps): began work on support for apps that contain data sources 2016-02-09 18:37:08 +01:00
Torkel Ödegaard
8784be9a14 feat(plugins): made it possible to have relative plugin template urls 2016-02-09 18:17:32 +01:00
Daniel Lee
72415be2db fix(dashboard): fixes when panel repeat with templating removed 
The original panel should clear all the templating variables and
    look like it did before repeat was selected. Fixes #3831. Also
cleans up after a row repeat is removed
 2016-02-09 14:59:24 +01:00
Torkel Ödegaard
9653f43466 fix(): unit tests 2016-02-09 14:41:43 +01:00
Torkel Ödegaard
1acbd5b7d8 :merge branch 'app-pages' 
Conflicts:
	examples/nginx-app/module.js
	examples/nginx-app/partials/stream.html
	examples/nginx-app/plugin.json
 2016-02-09 14:22:08 +01:00
Torkel Ödegaard
f0ecbd3878 feat(apps): removed some on hover stuff from sidemenu to make it ready to merge to master 2016-02-09 14:20:41 +01:00
Torkel Ödegaard
9dcfe6dc39 feat(apps): more work on app pages and sidemenu subnav 2016-02-09 14:06:23 +01:00
Torkel Ödegaard
397e4e4766 fix(img): img link on login 2016-02-09 12:20:09 +01:00
Torkel Ödegaard
5b9ed82d29 feat(plugins): working on plugin examples 2016-02-09 12:20:09 +01:00
Torkel Ödegaard
0def04ad34 feat(apps): more progress on app pages 2016-02-09 12:10:59 +01:00
Torkel Ödegaard
18eb9d6076 feat(apps): began work on app pages 2016-02-09 11:17:49 +01:00
bergquist
e7ff018487 feat(table): uses lodash to escape html 2016-02-09 11:16:07 +01:00
bergquist
ddb1d0c684 fix(table): escape / chars as well 2016-02-09 11:14:08 +01:00
bergquist
7d89cf228c fix(table): remove html for htmlencoding option 2016-02-09 11:14:08 +01:00
bergquist
5775c0a341 feat(table): remove option to disable html encoding 2016-02-09 11:14:08 +01:00
bergquist
d750908e36 feat(table): escape html by default 
closes #3673
 2016-02-09 11:14:08 +01:00
bergquist
b1a648608b test(table): rewrite invalid tests 2016-02-09 11:14:08 +01:00
Torkel Ödegaard
82d5d1b003 feat(plugins): working on plugin examples 2016-02-09 09:53:56 +01:00
Mitsuhiro Tanda
2cce057df1 (prometheus) add query result template query 2016-02-09 01:37:43 +09:00
Torkel Ödegaard
dea2234b14 Merge branch 'master' of github.com:grafana/grafana 2016-02-08 16:57:41 +01:00
Torkel Ödegaard
99a053bbdd feat(): removed unused routes and minor fixes 2016-02-08 16:57:29 +01:00
Carl Bergquist
a3b6efdbfa Merge pull request #2883 from mtanda/prometheus_annotation_support 
Prometheus annotation support
 2016-02-08 14:51:59 +01:00
Torkel Ödegaard
3a1dff6636 fix(): karma now works again, broken in last commit 2016-02-08 14:39:57 +01:00
Torkel Ödegaard
cf92011fb9 Merge branch 'master' of github.com:grafana/grafana 2016-02-08 14:35:45 +01:00
Torkel Ödegaard
0106033293 refactor(): removed stuff 2016-02-08 14:35:34 +01:00
Carl Bergquist
4a43cc1df6 Merge pull request #3958 from bergquist/ux_login 
Login: UX improvements
 2016-02-08 13:05:05 +01:00
bergquist
0f52b4397f feat(login): minor ux improvements 
make buttons bigger and introduce the login divider.

closes #3698
 2016-02-08 11:18:41 +01:00
Torkel Ödegaard
9c0da733e8 Merge branch 'master' of github.com:grafana/grafana 2016-02-08 10:31:36 +01:00
Torkel Ödegaard
de90ad8967 feat(influxdb): escape influxdb tag values, fixes #3950 2016-02-08 10:31:26 +01:00
bergquist
73bed3880f feat(graph): sets fixed height for right side legend 
closes #1277
 2016-02-08 09:49:53 +01:00
bergquist
edebdb166e fix(graph): add missing ctrl in variable 2016-02-08 09:24:30 +01:00
Torkel Ödegaard
7f83be3d0d ux(): mini fix! 2016-02-08 09:06:28 +01:00
Torkel Ödegaard
50920b1423 ux(forms): minor upgrade to new form design 2016-02-07 20:05:49 +01:00
Torkel Ödegaard
42b1c8c80d Merge branch 'master' into style-changes-mattttt 2016-02-07 19:47:14 +01:00
Torkel Ödegaard
a5d1e9ee43 fix(singlestat): fix for singlestat background and sparklines, fixes #3955 2016-02-07 18:37:07 +01:00