public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,856 Commits 655 Branches 650 Tags
d95eabfeec00a2386a64db9461e119ff0c8ac4f6
Commit Graph
13856 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bergquist dfde6e75ed changelog: adds note about closing #10151 2017-12-13 14:41:28 +01:00
Johannes Schill c433597f99 Merge branch 'develop' into 9879-login 2017-12-13 14:21:39 +01:00
Johannes Schill b8bfe51b03 ux: wip - Login animation POC (#9879) 2017-12-13 14:20:07 +01:00
bergquist ee5f030ded changelog: adds note about closing #9318 2017-12-13 13:53:38 +01:00
Johannes Schill 0be9789364 ux: Move "Sign up" and "Reset password" to its own pages - and remove all inline styling (#9879) 2017-12-13 13:51:52 +01:00
bergquist bf999a4f82 fixes broken alert eval when first condition is using OR 
closes #9318
 2017-12-13 13:37:10 +01:00
Torkel Ödegaard ccbd18006e ux: org user management changes 2017-12-13 13:16:44 +01:00
bergquist dd3dd407ad removes unused property 2017-12-13 13:12:50 +01:00
Patrick O'Carroll 29d1ec561f fixed edit team header, fixes #10172 2017-12-13 12:48:49 +01:00
Patrick O'Carroll daf32c579d changed width to input fields (#10184) 2017-12-13 12:42:50 +01:00
Torkel Ödegaard cacbcb9c99 ux: added search box to ds list page, closes #10106 2017-12-13 11:29:29 +01:00
Torkel Ödegaard 22aa1f7e42 ux: change members to users 2017-12-13 11:21:33 +01:00
Torkel Ödegaard 60e2ba111f plugins: fixed plugin edit page and plugin page 2017-12-13 11:12:35 +01:00
Marcus Efraimsson c6a02bec81 dashfolders: Minor css fixes for bulk edit 2017-12-13 11:08:28 +01:00
Marcus Efraimsson a9ba7b912f dashfolders: Minor css fixes for bulk edit 2017-12-13 10:59:29 +01:00
Daniel Lee 02d3a9f365 docs: SSL Mode config settings for Postgres 2017-12-13 10:55:58 +01:00
Daniel Lee c98e15903e dashfolder: settings page for folder 
with rename and delete. Fixes #10120
 2017-12-13 10:54:08 +01:00
bergquist 355a12d7cb Merge branch 'Thib17-master' 
* Thib17-master:
  removes verbose logging
  Add a per-notifier ShouldNotify()
 2017-12-13 10:26:35 +01:00
bergquist 0b6169b3f5 removes verbose logging 2017-12-13 10:21:11 +01:00
Torkel Ödegaard 2465fcbd6b fix: FolderId and IsFolder when saving dashboard 2017-12-13 10:00:54 +01:00
Torkel Ödegaard d3858d8847 ux: fixed inactive view mode and removed animation 2017-12-13 09:49:24 +01:00
Patrick O'Carroll afc8948905 removed unused declaration 2017-12-13 09:46:55 +01:00
Patrick O'Carroll f28a434566 updated dashlink editor, now has list 2017-12-13 09:44:51 +01:00
Johannes Schill 6a2b1e52b2 Merge branch 'develop' into 9879-login 2017-12-13 09:22:48 +01:00
Johannes Schill 1f8c1a5cc3 fix: Handle state when no password is entered on registration page (#9879) 2017-12-13 09:09:58 +01:00
linux chips 6e7a067857 adding support for sgl native time datatypes 2017-12-12 23:43:24 +03:00
linux chips dd7ab43d09 added missing cases for DATETIME datatype 2017-12-12 23:41:32 +03:00
Alexander Zobnin d85405d5b5 ux: move add member into its own page (#10167) 2017-12-12 20:15:26 +01:00
Thibault Chataigner fd633a1d5d Add a per-notifier ShouldNotify() 
This way we are able to edit notification behavior per notifier.
This would be usefull to let some notifiers send notifications,
even when the state doesn't change, or with custom condition.

Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com>
 2017-12-12 17:35:54 +01:00
Torkel Ödegaard 67f1435dc7 minor fix for #10136 2017-12-12 17:18:25 +01:00
Torkel Ödegaard 05cc1f85c3 Merge branch 'refactor-user-group-to-team' of https://github.com/alexanderzobnin/grafana into user-group-to-team 2017-12-12 17:07:00 +01:00
Alexander Zobnin 10fbfcb1d3 Fix graph legend scroll (#10169) 
* graph panel: fix legend scroll

* graph panel: enable scroll for table legend

* graph panel: fix legend right side toggle
 2017-12-12 17:02:19 +01:00
Alexander Zobnin 8aaaee5e16 fix colorpicker colors order (width issue) (#10170) 2017-12-12 17:00:56 +01:00
Torkel Ödegaard a02086814e graphite: remove check so that query is sent even for possible non leaf nodes 2017-12-12 17:00:00 +01:00
Torkel Ödegaard e88bd67d5b fix: fixed build failure 2017-12-12 16:31:24 +01:00
Johannes Schill 8624414657 ux: Use the previously renamed classes (#9879) 2017-12-12 16:29:45 +01:00
Torkel Ödegaard 89db9cc976 fix: fixed dashboard api tests 2017-12-12 16:15:24 +01:00
Torkel Ödegaard de91d68402 fix: don't detect graphite version before it's saved 2017-12-12 15:28:41 +01:00
Torkel Ödegaard cfd755eb93 updated new dashboard folder 2017-12-12 15:19:59 +01:00
Torkel Ödegaard 271c597c9b ux: style tweaks 2017-12-12 15:13:47 +01:00
Johannes Schill 01e9053625 ux: Update ui of login buttons via third parties and add link to sign up page (#9879) 2017-12-12 15:00:04 +01:00
Patrick O'Carroll 9b9ac45295 redesigning links editor 2017-12-12 14:05:24 +01:00
Torkel Ödegaard d379b501aa ux: search look update 2017-12-12 13:55:32 +01:00
Torkel Ödegaard df25c9f0fa tech: updated version for react-grid item 2017-12-12 13:27:56 +01:00
Torkel Ödegaard 8a61e0967e Merge branch 'master' into develop 2017-12-12 13:22:13 +01:00
Torkel Ödegaard a00af85f36 build: fixed unit test failure 2017-12-12 13:21:50 +01:00
Torkel Ödegaard cafed8ce8f Merge branch 'master' into develop 2017-12-12 13:19:07 +01:00
David Kaltschmidt edb2dcf1b0 Extracted row matching function and added comments 2017-12-12 13:18:06 +01:00
bergquist ff1b71bc20 allow overriding dashboards from api 2017-12-12 13:18:00 +01:00
Patrick O'Carroll a69c260173 redesigning links editor 2017-12-12 13:06:32 +01:00