Torkel Ödegaard
d9096110f8
Merge branch 'master' into alerting
...
Conflicts:
pkg/api/dashboard.go
pkg/models/dashboards.go
pkg/services/sqlstore/dashboard.go
2016-07-11 18:28:07 +02:00
Torkel Ödegaard
08202dcb83
Merge branch 'v3.1.x'
2016-07-11 09:39:17 +02:00
Torkel Ödegaard
65683ab241
feat(table): added sanitize html option to column styles for table panel, fixes #4596
2016-07-11 09:38:06 +02:00
Torkel Ödegaard
68a8d9bc91
feat(apps): more work on plugin dashboard sync
2016-07-08 13:41:46 +02:00
bergquist
88e208bddf
feat(gf-form): add support for small input fields
2016-06-25 23:30:51 +02:00
bergquist
dd8c3d0355
Merge branch 'master' into alerting
2016-06-20 10:44:48 +02:00
bergquist
3adee1eda0
tech(sass): sasslint fixes for css3
...
Pseudo-elements must start with double colons pseudo-element
2016-06-20 10:37:47 +02:00
bergquist
8ec311ade4
Merge branch 'master' into alerting
2016-06-16 16:29:41 +02:00
Torkel Ödegaard
ec0b09450c
Merge branch 'export-dashboard'
...
Conflicts:
conf/defaults.ini
pkg/setting/setting.go
public/app/core/components/grafana_app.ts
public/app/core/core.ts
public/app/features/dashboard/dashboardCtrl.js
2016-06-16 08:06:43 +02:00
Torkel Ödegaard
4b78ab5bcd
feat(graph): graph tooltip sort order PR refactored/changed #4944 , changed the layout graph display options, #4944
2016-06-15 17:20:55 +02:00
Torkel Ödegaard
ed7a539ddb
feat(alerting): thresholds rethink
2016-06-14 16:45:51 +02:00
Torkel Ödegaard
e3b281dbac
feat(alerting): more work on alerting thresholds
2016-06-12 11:43:18 +02:00
Torkel Ödegaard
5b6fb3b124
feat(alerting): level handle progress
2016-06-11 23:52:25 +02:00
Torkel Ödegaard
ec640bd5da
feat(alerting): more work on alerting ui
2016-06-11 23:31:49 +02:00
Torkel Ödegaard
1500c0e954
feat(alerting): alert threshold handles progress
2016-06-11 22:33:02 +02:00
Torkel Ödegaard
0b919c752b
feat(alerting): poc of dragable alert handles
2016-06-11 14:37:33 +02:00
Torkel Ödegaard
2b4a9954b1
feat(alerting): progress on alerting UI and model, refactoring of dashboard parser and tests into extractor component, moved tests from sqlstore to alerting package
2016-06-11 10:13:33 +02:00
bergquist
1686d86c3b
Merge branch 'master' into alerting_definitions
2016-05-30 08:26:08 +02:00
Torkel Ödegaard
c3708b3096
feat(import): import directly from grafana.net id/url now works
2016-05-27 16:11:05 +02:00
Torkel Ödegaard
201d30a944
fix(export): style fixes and markup fixes for share modal
2016-05-25 13:01:40 +02:00
Torkel Ödegaard
392407136d
Merge branch 'export-dashboard' of github.com:grafana/grafana into export-dashboard
2016-05-25 12:33:30 +02:00
Matt Toback
8d988f9582
Export dashboard bulletfactory ( #5160 )
...
* create descriptions and styles for share dropdown
* Updating actual modal layout for Sharing
* Updated the modals to follow the new styles, fixed the wrapping issue on the main menu. Standardized buttons.
2016-05-25 12:30:27 +02:00
Torkel Ödegaard
10c47ee27c
feat(footer): some minor changes to footer to make it look good in light theme, closes #4889
2016-05-24 08:11:28 +02:00
Torkel Ödegaard
9a7817a271
Merge branch 'master' into footer
...
Conflicts:
pkg/api/frontendsettings.go
2016-05-23 20:59:23 +02:00
Trent White
a52869507e
hide footer on non-dashboard pages
2016-05-23 12:46:13 -04:00
Trent White
cffcc4c7a5
make footer unordered list. add new icons.
2016-05-20 16:44:19 -04:00
Trent White
c727c3c441
resize and color of links
2016-05-20 15:58:14 -04:00
Torkel Ödegaard
f00cbc0aeb
fix(panel height): fixed issue with singlestat height, fixes #4679 , fixes #4894 , fixes #5113
2016-05-20 12:23:26 +02:00
bergquist
fa19e0d9c6
style(modal): use standard valid styles
2016-05-16 17:03:01 +02:00
bergquist
2ce9d4571c
fix(alerting): fix spacing
2016-05-16 14:29:54 +02:00
bergquist
80f7fe8646
feat(alerting): add confirm text dialog when deleting dashboards with alerts
2016-05-16 11:54:28 +02:00
bergquist
2ccb3956a6
feat(alerting): set default value for query
2016-05-03 17:55:41 +02:00
bergquist
1624dc9dfd
feat(alerting): separate operator and level
2016-05-03 17:31:04 +02:00
bergquist
3c7e793c1f
feat(alerting): add color to alert state icons
2016-05-03 16:36:49 +02:00
Torkel Ödegaard
de26a17dc7
feat(footer): began work on page footer
2016-05-03 09:00:58 +02:00
Torkel Ödegaard
0e4b70a4a8
feat(query_editors): more work
2016-04-28 10:13:18 +02:00
Torkel Ödegaard
7b560f9080
feat(query editors): converted OpenTSDB editor to new form styles
2016-04-27 16:29:59 +02:00
Torkel Ödegaard
65b4945548
Merge branch 'master' into query-editor-style
2016-04-27 08:43:34 +02:00
bergquist
79ed99a940
fix(singlestat): fixes font size diffs for gauge
2016-04-26 10:00:13 +02:00
Torkel Ödegaard
bca0894f73
feat(query editors): progress on query editors
2016-04-26 09:58:55 +02:00
Torkel Ödegaard
bbf4d00319
fix(query editors): added select style to segment, used by data source selector
2016-04-25 15:49:33 +02:00
Torkel Ödegaard
6b813b4e2a
feat(query editors): remember collapsed state
2016-04-25 15:11:40 +02:00
Torkel Ödegaard
1a433de0b4
Merge branch 'master' into query-editor-style
2016-04-25 14:22:36 +02:00
Matt Toback
349f6b51a5
Updated link color in text panel to be -link-color
2016-04-22 11:32:19 -04:00
bergquist
db15bf23b8
fix(sass): fixes sass lint issue
2016-04-22 12:09:02 +02:00
bergquist
4e8396dbce
fix(graph): sets legend table scroll to auto
...
closes #4760
2016-04-19 13:41:35 +02:00
Torkel Ödegaard
39cdaf5175
ux(query-editors): more progress and fixes
2016-04-18 11:35:24 -04:00
Torkel Ödegaard
14ec69a160
Merge remote-tracking branch 'origin/master' into query-editor-style
2016-04-18 09:51:35 -04:00
Torkel Ödegaard
4515e66783
feat(query editors): more progress on ES query editor
2016-04-18 08:43:11 -04:00
Torkel Ödegaard
1069f485da
ux(query_editors): handle text overflow in collapsed mode
2016-04-17 22:24:40 -04:00
