 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 Toback
|
13720759a5
|
Merge pull request #4089 from grafana/matt-weekend-ui
Matt weekend ui
|
2016-02-20 15:00:44 -05: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 |
|