github.com/casbin/grafana commits | Ecosyste.ms: OpenCollective

Merge branch 'master' into websocket

7366cef1fed00c741f117e1042600640d6b30605 authored over 8 years ago by Torkel Ödegaard <[email protected]>

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

185438145607b2464e40f41f304e600f45f68bc0 authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(live): progress on panel <-> data source communication patterns

8dee54bf5dfc057f21da1c6a4a4288d9ec180f9f authored over 8 years ago by Torkel Ödegaard <[email protected]>

fix(npm): updates phantomjs requirement

bbc4c361bb0249d7d05594c0182a3219b53df4e7 authored over 8 years ago by bergquist <[email protected]>

Revert "feat(influxdb): add support for 0.11.0 tags"

This reverts commit b73d196c6b9b2012541adbeffb2c536c60deda56.

83b73973980bceaf55634745807a4b848d3a9504 authored over 8 years ago by bergquist <[email protected]>

Merge pull request #4447 from grafana/grafana-worldping-tweaks

Updated card views to accommodate a 2 column layout at lg breakpoints

04a887dafa646b5360b78c1bcda0adf89efe5c4c authored over 8 years ago by Matt Toback <[email protected]>

Updated card views to accommodate a 2 column layout at lg breakpoints

4c5291f941a0217d46e6383cc30de78a2ae6badc authored over 8 years ago by Matt Toback <[email protected]>

feat(influxdb): add support for 0.11.0 tags

this change is backwards compatible.

closes #4392

b73d196c6b9b2012541adbeffb2c536c60deda56 authored over 8 years ago by bergquist <[email protected]>

Merge branch 'master' into websocket

d0564933a2cf9f288323ede94fb48ae8e975232c authored over 8 years ago by Torkel Ödegaard <[email protected]>

fix(panel resize): fixed panel resize drag handling

03f91e8d854baa3db9b07df6343df95560a71980 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge branch 'master' into websocket

c711fb67c8892b0e0a5684526e1627946e1d8629 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge branch 'master' of github.com:grafana/grafana

7e6314dcac2c9b9644242fe4413950191df994c9 authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(plugins): finished app navigation enhancements, closes #4434

10df9dc8c3ed3c24edef075e9ee99bb2ce01f8f7 authored over 8 years ago by Torkel Ödegaard <[email protected]>

fix(switchorg): fixes broken redirect when switchin org

4110c7ffb0c5529e25010d6b6d842a7ab35cab4f authored over 8 years ago by bergquist <[email protected]>

Merge pull request #4440 from utkarshcmu/redirect

Redirect to home when switching orgs

7f79024e6a2053e124bdbc72f1bda375fbdfd13d authored over 8 years ago by Carl Bergquist <[email protected]>

Redirect to home when switching orgs

f6cbbe1e6406807dd569c6bb6b52280678fb5ff2 authored over 8 years ago by utkarshcmu <[email protected]>

ux(): updated http settings view with new checkboxes

64312ceded9342850fd3533f0743a1f818277b3b authored over 8 years ago by Torkel Ödegaard <[email protected]>

ux(): created new gf-form-switch directive clean/refactoring

98206ab49f704c66b00aeb3f7a186ec4a2677ea5 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge branch 'master' of github.com:grafana/grafana

56622ee2c6d030efb7b39433b1b1fc6f0e7250a4 authored over 8 years ago by Torkel Ödegaard <[email protected]>

ux(): app navigation improvements, changes to plugin.json for apps, merged pages with includes section, #4434

65c0937741c769c511776fcf7c3092707052ef82 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge pull request #4436 from grafana/org-details-improvements

Finishing touches

8498bfd2c29109c9bc67d3551421477f083a0985 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge branch 'checkboxv2' of github.com:grafana/grafana into checkboxv2

7403b94b9dd471c030bc52f3934fcaa30d0d2e0e authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge branch 'master' of github.com:grafana/grafana into checkboxv2

d40cc32393db40c31b81013b1a62bb6ed6739a82 authored over 8 years ago by Torkel Ödegaard <[email protected]>

ux(): checkbox v2 tweaks

fc983f97514bc451b976157c1107b375a3a36338 authored over 8 years ago by Torkel Ödegaard <[email protected]>

ux(): new checkbox tweaks

ae255a7adf04509494150fdf0050d1e08a94768f authored over 8 years ago by Torkel Ödegaard <[email protected]>

fix(backendsrv): remove invalid check

90c6b04361edf9f08adb3ed955f48dca767b94ae authored over 8 years ago by bergquist <[email protected]>

feat(backendsrv): improves error response handling

datasourceRequests that could not reach the destination threw
invalid errors due to missing prop...

86a274a7eed37acb45f43c5e695e2bd6dce1b7d8 authored over 8 years ago by bergquist <[email protected]>

ux(): another checkbox design

530b6a5088c5244827d942428b5857756084a500 authored over 8 years ago by Torkel Ödegaard <[email protected]>

ux(): checkbox style test

5e52aaac6f0581b9d1b683bc1c0d6efcab48ea13 authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(live): tricky

3ea441d1a023b4dbc86043b28a59dc64b4a13891 authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(cli): use built in envvar support

14df3c62494a3d3c9e2eb28acd6199b7c14e596f authored over 8 years ago by bergquist <[email protected]>

feat(cli): make all plugin commands subcommands

7f8643efdec070d34d4fce40ab0ac31e6e0566d4 authored over 8 years ago by bergquist <[email protected]>

ux(): more changes to influxdb query editor

bd6a68bfe5a3bc003f64063fdd2b93b97a038107 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge branch 'master' into query-editor-style

a5a244767a09862a41c850314fe115461e93b45c authored over 8 years ago by Torkel Ödegaard <[email protected]>

ux(graph styles tab): updated forms in graph styles tab

273311eed2ee431feb4f01f453507c764687e950 authored over 8 years ago by Torkel Ödegaard <[email protected]>

ux(): updated query editor test

55189200a45b707f380398f9bf49872a19a92f1b authored over 8 years ago by Torkel Ödegaard <[email protected]>

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

5e431149cd5f69c2ababcc77b64ab4615eb663b2 authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(preferences): refactoring PR #4399

7023dedc0523d1db83110663744f88e9f240279a authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge branch 'master' into preferences

9e98c86ae138705b339d66c08412434d43c87c06 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge pull request #4399 from utkarshcmu/preferences

Set home dashboard per user per org #3214

071237d32227c758f299ee86c5e415b77482ebb5 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge pull request #4368 from simnv/variable-escape

Slash escape regex

06468d6f438a3bd48fd500c46fe54696f0d6cd90 authored over 8 years ago by Torkel Ödegaard <[email protected]>

fix(graph legend): minor correction to last commit

4377e95c99e06a94f7ef43bff38914a5f5c360d5 authored over 8 years ago by Torkel Ödegaard <[email protected]>

fix(graph): fixed issue with graph and legend to the right in snapshots, closes #4400

f4feb3808976fdd17a784c80436e07b7fe509d0f authored over 8 years ago by Torkel Ödegaard <[email protected]>

changelog(): added nested ldap group to changelog, #4401

82232e2530735ad3d6f2b754999a8e52a714f602 authored over 8 years ago by Torkel Ödegaard <[email protected]>

ux(): button style tweaks, align with grafana.net styles more

9c2809a1a40d9092679398077d7316352d8b33bc authored over 8 years ago by Torkel Ödegaard <[email protected]>

Slash escaping test

dd5b4a25d1b35809882132d1a28443936c45618c authored over 8 years ago by simnv <[email protected]>

fix(ux): fixed ux issue in new cards data source list, now handles overflowing urls and titles, fixes #4403

73e5c70d80ef4bd595b633327eaedd5549fb7fc0 authored over 8 years ago by Torkel Ödegaard <[email protected]>

fix(text panel): fixed escaping issue with markdown in text panel, fixes #4409

6d36641080e54f41b9629b279c59c51825e734e7 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge pull request #4420 from grafana/grafana-worldping-tweaks

Beginngings of style adjustments to support worldPing app

662dbaf8b2d69a7abe822512e259d13c3b50dfec authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(dataproxy): set flush interval, need a setting for this

e63ff1c7626fb06d42f216ef7a9edf751bcd0dcd authored over 8 years ago by Torkel Ödegaard <[email protected]>

Beginngings of style adjustments to support worldPing app

084ad69c53a10433a056516a4e38a49b1581997a authored over 8 years ago by Matt Toback <[email protected]>

feat(live datasouces): moved from Observable to Subject

1ccde201be827438cdde36ec0735bbb5672d1a42 authored over 8 years ago by Torkel Ödegaard <[email protected]>

feat(tslint): remove two space requirements for comments

48a721e25918140f5f970bf4b0aa052b79cdfc40 authored over 8 years ago by bergquist <[email protected]>

docs(plugin): add info about enabling apps

35e53ee511b0cd329448e878680983e58d5ab585 authored over 8 years ago by bergquist <[email protected]>

fix(datasources): fixes header condition

closes #4402

4c7f638f3c15c15ce5bdcd8cdf7cb0327bf98de3 authored over 8 years ago by bergquist <[email protected]>

docs(plugins): docs for app plugins

3c39a935f8d6fe2ba0138f3f7a43c0326767870a authored over 8 years ago by bergquist <[email protected]>

docs(plugins): update links to new examples

b1881e5f54a397d2a760641112c2af2fecba0349 authored over 8 years ago by bergquist <[email protected]>

docs(plugin): update link to datasource docs

2b0499c968de9e06767fd5a958ba63657d80cced authored over 8 years ago by bergquist <[email protected]>

Merge pull request #4412 from utkarshcmu/viewer

Viewer not able to delete snapshot anymore

504d800a0d1ed0e3fbf5ff80a443c16f06759303 authored over 8 years ago by Carl Bergquist <[email protected]>

Viewer not able to delete snapshot

9d4fa87914adb429d6b3b4af8b3a68d8e4cbb9bd authored over 8 years ago by utkarshcmu <[email protected]>

Finishing touches

6016033b8b11a17f48a8beab49c3adba7d0c77d5 authored over 8 years ago by Matt Toback <[email protected]>

Update admin.md

5af54c57baf9867689146cf02723df043ec306cb authored over 8 years ago by Matt Toback <[email protected]>

Removed unwanted api, moved logic into backend

cb42cfc6af43b9ec9a0b2f0416d65fc78f8ce2ed authored over 8 years ago by utkarshcmu <[email protected]>

Merge branch 'master' into websocket

9ddf22ea931df80e7a9831473ca8038498b0dc3c authored over 8 years ago by Torkel Ödegaard <[email protected]>

ux(): added specific fallback logos for plugin depending on type, polished layout selector style

b2fe7e518f91a4246b199e7ce647f12fdedbfad9 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Home dashboard per user per org works

4fbe954a7996e65d2a96309fda846138489f1662 authored over 8 years ago by utkarshcmu <[email protected]>

Added getDashboardSlugById api

66621d762e84c20e3835ba7386d9e5aeb5ff64d3 authored over 8 years ago by utkarshcmu <[email protected]>

Minor corrections

9dd6aefcec34a2fb8770e54c170be7c6f7917a60 authored over 8 years ago by utkarshcmu <[email protected]>

Saving home dashboard id in table

749fd618a949ff5a49b1fe293710fffcf3213f03 authored over 8 years ago by utkarshcmu <[email protected]>

Made the input shadow a bit more subtle while maintaining the box shadow

6bf05a8154cc850015dc3c516f9a94c578fe05fa authored over 8 years ago by Matt Toback <[email protected]>

fix(phantomjs): upgrades to 2.1.1 for ssl support

closes #4371

a08809f8fe57095d948e16ac797c673cebd93249 authored over 8 years ago by bergquist <[email protected]>

fix(singlestat): use exact value for coloring

closes #4259

57ecb276c8b3da63ec019763c6c09a6d69edaaa1 authored over 8 years ago by bergquist <[email protected]>

feat(ds observable): minor progress on handling data source observable

79a803ea8ff40e982f99ace1f9eeeb6a45648b41 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge branch 'master' into websocket

Conflicts:
public/app/core/core.ts

0f6579801d8d5a61ba92096a8b43a49941b4990e authored over 8 years ago by Torkel Ödegaard <[email protected]>

fix(datasource): when addding data source withCredentials did not get set, fixes #4389

fcaf2bfdba58e1508827ded593404f09d8de3824 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge branch 'datasource-lists-cards'

4144f71e23213942bdc0b17163aa216bc4c4915d authored over 8 years ago by Torkel Ödegaard <[email protected]>

ux(): update data source list to card view, #4364

852ecd71f774e50053e85a92f70503b818cfb810 authored over 8 years ago by Torkel Ödegaard <[email protected]>

fix(fonts): move icon fonts back to main css

aadc6e0bbdab0d09f037d31a277121e8f975f8ce authored over 8 years ago by bergquist <[email protected]>

feat(data source observerable): started work on handling data source observerable

a738945a888fc6b8e3fc9c263aa7a4580039727a authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge branch 'cli_colors'

9d3cbfe896b85813f6cc1a291494d69da4e950d9 authored over 8 years ago by bergquist <[email protected]>

Merge branch 'master' into cli_colors

1a11f1e8c64cb361b02b0dac24d1d7c3dcb15a39 authored over 8 years ago by bergquist <[email protected]>

feat(cli): adds some colors to ls command

a12f5376b50af8f6c7d690990d3845c9564cc641 authored over 8 years ago by bergquist <[email protected]>

Merge pull request #4384 from vitorboschi/fixTypo

fix typo

fd531e84fc6175730ae67a8950fe2455d287e8cf authored over 8 years ago by Carl Bergquist <[email protected]>

fix(opentsdb): fixed templating issue for single value variables, fixes #4312

d26d7162a5dfe0dc4d6808dea031f75918a3e56e authored over 8 years ago by Torkel Ödegaard <[email protected]>

fix typo

a9cdf580a74464a0d44b09b077b4470ddccf1902 authored over 8 years ago by Vitor Boschi <[email protected]>

Merge pull request #4383 from bbinet/patch-1

[docs] typos in plugins/installation.md

990acb3fd38ce2b95e32b61e8f9859a570e8bad0 authored over 8 years ago by Carl Bergquist <[email protected]>

[docs] typos

3486bf92eb998d58d7241add4215e5e5b8f5667a authored over 8 years ago by Bruno Binet <[email protected]>

feat(dashlist): stores recently visited dashboards per orgid

ed1864e076a0d64b1ad0c09a9a87d9dcc4c056a9 authored over 8 years ago by bergquist <[email protected]>

Merge branch 'local_fonts'

0998ce81f3a8cf7687de3e48e04f064bf03b15b8 authored over 8 years ago by bergquist <[email protected]>

feat(fonts): download fonts from grafana instead of CDN

Makes its possible to run grafana without internet access.
The performance hit by not using a cd...

99e068643b7d5c0b10545827afa986ec7bb0082a authored over 8 years ago by bergquist <[email protected]>

Merge branch 'master' of github.com:grafana/grafana

0d7eb18d7b853c9658f1ec5e186df0fd1ad518d7 authored over 8 years ago by Torkel Ödegaard <[email protected]>

fix(dashlist): fixed issue with viewing last viewed dashboards, when you had more than dashboards in last viewed than panel limit they did not show up in list

81c11ebb5364bde69376fa4440532a0683c2adc3 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge pull request #4379 from mtanda/cloudwatch_tag_search_fix

(cloudwatch) remove duplicative attribute

2e73c583384ee7ead22d756e6e7866758f3111c6 authored over 8 years ago by Carl Bergquist <[email protected]>

(cloudwatch) remove duplicative attribute

381a48f21de183e8502a77bf82434534775c4491 authored over 8 years ago by Mitsuhiro Tanda <[email protected]>

feat(preferences): lots of refactoring and changes to #3214

a88176e06086e1e1e670f0f7b52ae3c0ced758f4 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge branch 'preferences' of github.com:grafana/grafana into preferences

e06756bcab1e3100a98bcf17ded2bf4206cbf7c7 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge branch 'master' into preferences

9c222a445f1f3bd3b7d7128ba3c7ee2c06e804c3 authored over 8 years ago by Torkel Ödegaard <[email protected]>

Merge pull request #4354 from utkarshcmu/preferences

Ability to save Preferences

51bde36dee57a37ac2888c36dc50113e5e1f1a64 authored over 8 years ago by Torkel Ödegaard <[email protected]>

ux(): began work on updating data source list to cards view

e4c0c39fbfe37b5ee448e045b1fcfc7709f3f9d1 authored over 8 years ago by Torkel Ödegaard <[email protected]>

ux(): fixes to cards and sorting plugin list, #4364

1abdd170d326595b4818920e4b837dfc330ad07b authored over 8 years ago by Torkel Ödegaard <[email protected]>