public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,083 Commits 655 Branches 650 Tags
0392fde34edc22e660cdae33474d4ac9dcafe40c
Commit Graph
8083 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard 6a42b95d39 feat(panels): panel refactorings 2016-03-23 11:31:31 +01:00
Matt Toback 30b2a7169f Form adjustments for app work 2016-03-22 18:41:04 -04:00
Torkel Ödegaard cb49e11eca feat(live): panel sdk/api refactorings 2016-03-22 21:27:53 +01:00
David Warden 5b5cf9f006 documentation for ldap nested groups 2016-03-22 13:54:36 -04:00
David Warden 2bf94d8db4 version bump go-ldap to v2.2.1 2016-03-22 13:54:36 -04:00
Torkel Ödegaard 7366cef1fe Merge branch 'master' into websocket 2016-03-22 18:33:39 +01:00
Torkel Ödegaard 1854381456 tech(): updated es6-shim, removed es5-shim, no longer needed as we upraded phantomjs to 2.x, also removed es6-promise, dont think we need it 2016-03-22 18:32:08 +01:00
Torkel Ödegaard 8dee54bf5d feat(live): progress on panel <-> data source communication patterns 2016-03-22 18:21:21 +01:00
bergquist bbc4c361bb fix(npm): updates phantomjs requirement 2016-03-22 17:23:15 +01:00
bergquist 83b7397398 Revert "feat(influxdb): add support for 0.11.0 tags" 
This reverts commit b73d196c6b.
 2016-03-22 16:07:00 +01:00
Matt Toback 04a887dafa Merge pull request #4447 from grafana/grafana-worldping-tweaks 
Updated card views to accommodate a 2 column layout at lg breakpoints
 2016-03-22 10:33:00 -04:00
Matt Toback 4c5291f941 Updated card views to accommodate a 2 column layout at lg breakpoints 2016-03-22 10:21:47 -04:00
bergquist b73d196c6b feat(influxdb): add support for 0.11.0 tags 
this change is backwards compatible.

closes #4392
 2016-03-22 14:35:46 +01:00
Torkel Ödegaard d0564933a2 Merge branch 'master' into websocket 2016-03-22 10:42:41 +01:00
Torkel Ödegaard 03f91e8d85 fix(panel resize): fixed panel resize drag handling 2016-03-22 10:42:29 +01:00
Torkel Ödegaard c711fb67c8 Merge branch 'master' into websocket 2016-03-22 10:31:57 +01:00
Torkel Ödegaard 7e6314dcac Merge branch 'master' of github.com:grafana/grafana 2016-03-22 10:16:01 +01:00
Torkel Ödegaard 10df9dc8c3 feat(plugins): finished app navigation enhancements, closes #4434 2016-03-22 10:15:47 +01:00
bergquist 4110c7ffb0 fix(switchorg): fixes broken redirect when switchin org 2016-03-22 09:25:46 +01:00
Carl Bergquist 7f79024e6a Merge pull request #4440 from utkarshcmu/redirect 
Redirect to home when switching orgs
 2016-03-22 08:28:39 +01:00
utkarshcmu f6cbbe1e64 Redirect to home when switching orgs 2016-03-21 22:56:46 -07:00
Torkel Ödegaard 64312ceded ux(): updated http settings view with new checkboxes 2016-03-21 21:36:30 +01:00
Torkel Ödegaard 98206ab49f ux(): created new gf-form-switch directive clean/refactoring 2016-03-21 21:24:06 +01:00
Torkel Ödegaard 56622ee2c6 Merge branch 'master' of github.com:grafana/grafana 2016-03-21 19:07:19 +01:00
Torkel Ödegaard 65c0937741 ux(): app navigation improvements, changes to plugin.json for apps, merged pages with includes section, #4434 2016-03-21 19:07:08 +01:00
Torkel Ödegaard 8498bfd2c2 Merge pull request #4436 from grafana/org-details-improvements 
Finishing touches
 2016-03-21 17:17:59 +01:00
Torkel Ödegaard 7403b94b9d Merge branch 'checkboxv2' of github.com:grafana/grafana into checkboxv2 2016-03-21 14:19:32 +01:00
Torkel Ödegaard d40cc32393 Merge branch 'master' of github.com:grafana/grafana into checkboxv2 2016-03-21 14:18:05 +01:00
Torkel Ödegaard fc983f9751 ux(): checkbox v2 tweaks 2016-03-21 14:08:18 +01:00
Torkel Ödegaard ae255a7adf ux(): new checkbox tweaks 2016-03-21 13:37:56 +01:00
bergquist 90c6b04361 fix(backendsrv): remove invalid check 2016-03-21 12:43:30 +01:00
bergquist 86a274a7ee feat(backendsrv): improves error response handling 
datasourceRequests that could not reach the destination threw
invalid errors due to missing property. This fixes gives the user
a better error message.

closes #4428
 2016-03-21 12:30:13 +01:00
Torkel Ödegaard 530b6a5088 ux(): another checkbox design 2016-03-21 11:27:53 +01:00
Torkel Ödegaard 5e52aaac6f ux(): checkbox style test 2016-03-21 11:07:37 +01:00
Torkel Ödegaard 3ea441d1a0 feat(live): tricky 2016-03-21 10:42:10 +01:00
bergquist 14df3c6249 feat(cli): use built in envvar support 2016-03-21 10:11:08 +01:00
bergquist 7f8643efde feat(cli): make all plugin commands subcommands 2016-03-21 10:01:07 +01:00
Torkel Ödegaard bd6a68bfe5 ux(): more changes to influxdb query editor 2016-03-20 18:01:25 +01:00
Torkel Ödegaard a5a244767a Merge branch 'master' into query-editor-style 2016-03-20 17:39:31 +01:00
Torkel Ödegaard 273311eed2 ux(graph styles tab): updated forms in graph styles tab 2016-03-20 17:33:30 +01:00
Torkel Ödegaard 55189200a4 ux(): updated query editor test 2016-03-20 16:18:31 +01:00
Torkel Ödegaard 5e431149cd feat(preferences): removed unused api prefernce methods, these need to be abstracted more from an http api perpsective, they are too low level for the http api, #4399 2016-03-20 11:54:24 +01:00
Torkel Ödegaard 7023dedc05 feat(preferences): refactoring PR #4399 2016-03-20 11:52:19 +01:00
Torkel Ödegaard 9e98c86ae1 Merge branch 'master' into preferences 2016-03-20 11:27:49 +01:00
Torkel Ödegaard 071237d322 Merge pull request #4399 from utkarshcmu/preferences 
Set home dashboard per user per org #3214
 2016-03-20 11:25:03 +01:00
Torkel Ödegaard 06468d6f43 Merge pull request #4368 from simnv/variable-escape 
Slash escape regex
 2016-03-20 11:22:33 +01:00
Torkel Ödegaard 4377e95c99 fix(graph legend): minor correction to last commit 2016-03-20 11:21:06 +01:00
Torkel Ödegaard f4feb38089 fix(graph): fixed issue with graph and legend to the right in snapshots, closes #4400 2016-03-20 11:17:53 +01:00
Torkel Ödegaard 82232e2530 changelog(): added nested ldap group to changelog, #4401 2016-03-20 10:57:53 +01:00
Torkel Ödegaard 9c2809a1a4 ux(): button style tweaks, align with grafana.net styles more 2016-03-20 10:31:50 +01:00