IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-15 01:53:33 -06:00
Code Issues Packages Projects Releases Wiki Activity
14,503 Commits 5,450 Branches 554 Tags 1.9 GiB
f84534adea
Commit Graph

14503 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard
f84534adea Revert "Add baron scrollbar to a node managed by gafana (#11850)" 
This reverts commit 34133671b9.
 2018-05-08 09:45:08 +02:00
Torkel Ödegaard
4b61c7cd55 Merge branch 'influx-db-select-query-variable' 2018-05-08 09:29:53 +02:00
Carl Bergquist
8d13276844
Merge pull request #11852 from grafana/davkal/super-simple-docker 
Support for local Docker builds
 2018-05-08 09:17:01 +02:00
Torkel Ödegaard
b894a5ff16 Merge branch 'am/fix-query-variable-influxdb' of https://github.com/forzafootball/grafana into influx-db-select-query-variable 2018-05-08 09:01:58 +02:00
Patrick O'Carroll
8f0c8005af fixed svg background (#11848) 2018-05-08 06:40:34 +02:00
Ryan McKinley
34133671b9 Add baron scrollbar to a node managed by gafana (#11850) 
* Add baron scroller to grafana panel, not plugin panel

* remove comment about root <div> element, since it will not be true
 2018-05-08 06:39:12 +02:00
David
ed067e8d35 Fix CSS asset loading for yarn start (HMR) (#11855) 
* enable url() processing in CSS to ensure assets load in HMR mode
* only needed when running `yarn start` which needs this for the hot
reloader
 2018-05-07 17:02:55 +02:00
Torkel Ödegaard
4c6e4e2aa6 fix: fixed gometalinter issues with Discord PR 2018-05-07 17:01:31 +02:00
Carl Bergquist
23738ad4ac
Merge pull request #11801 from grafana/provision-service-refactor 
Server shutdown flow rewrite & provision service refactor
 2018-05-07 16:32:26 +02:00
David
1236b7b918
Merge pull request #11770 from grafana/davkal/explore-panel-link 
Explore: Add entry to panel menu to jump to Explore
 2018-05-07 16:31:19 +02:00
Torkel Ödegaard
b170bde74f
Update CHANGELOG.md 2018-05-07 15:44:34 +02:00
Torkel Ödegaard
c46a3c8646 Merge branch 'jereksel-feature/discord' 2018-05-07 15:41:10 +02:00
Torkel Ödegaard
e5e8b9800c merge: fixed conflicts in discord PR 2018-05-07 15:40:43 +02:00
Marcus Efraimsson
23c88a3b3f
docs: update installation instructions targeting v5.1.1 stable 2018-05-07 14:57:18 +02:00
Dan Cech
29c9d3f74c fix root_url in docs & comments (#11819) 
* fix root_url in docs & comments

* include ports in docker-compose config
 2018-05-07 14:18:21 +02:00
Marcus Efraimsson
b804f6d999
changelog: 5.1.1 update 
add notes about closing #11743 and add release data for 5.1.1
[skip ci]
 2018-05-07 14:09:04 +02:00
Torkel Ödegaard
249c1e8d3d fix: loading of css url (images/fonts) 2018-05-07 14:02:38 +02:00
David Kaltschmidt
c3cc60b080 Support for local Docker builds 
* add a git-ignored `local/` folder for Makefile/Dockerfile
* import `local/Makefile` to root Makefile
* add `.dockerignore`
 2018-05-07 12:32:18 +02:00
Torkel Ödegaard
afec9ec5be
Update ROADMAP.md 2018-05-07 11:16:59 +02:00
Dan Cech
543c7fe587 support additional fields in authproxy (#11661) 2018-05-07 10:39:16 +02:00
Dan Cech
b4ad044044 better handling for special chars in db config (#11662) 2018-05-07 10:33:33 +02:00
Florian Plattner
5d54bc00e1 Fix/improved csv output (#11740) 
* fix: initial cleanup and implementation

* feat: finish special character escaping

* feat: updates fileExport to generate RFC-4180 compliant CSV

* chore: replace html decoder with the lodash version and final cleanup

* fix: restore character html decoding
 2018-05-07 10:22:54 +02:00
Torkel Ödegaard
871b85f199
Update ROADMAP.md 2018-05-07 10:16:39 +02:00
Torkel Ödegaard
ec7703bad7
Update ROADMAP.md 2018-05-07 10:14:04 +02:00
Torkel Ödegaard
217d43e512
Update ROADMAP.md 2018-05-07 10:13:39 +02:00
Carl Bergquist
06623506d3
Merge pull request #11805 from simPod/missing-lock 
Add missing items to Gopkg.lock
 2018-05-07 10:08:05 +02:00
Torkel Ödegaard
fb7db147ed Merge remote-tracking branch 'origin/11809-permission-dropdown' 2018-05-07 09:49:38 +02:00
Šimon Podlipský
1fbac909cb Remove preceding / from public JS path (#11804) 2018-05-07 08:11:48 +02:00
Ryan McKinley
2ee59ccad8 Add panel scrolling docs (#11826) 2018-05-07 08:03:30 +02:00
Marcus Efraimsson
e078e2733f
Merge pull request #11803 from svenklemm/whatsnew51-table 
Fix variable interpolation examples in whats new in 5.1 docs
 2018-05-06 08:45:02 +02:00
Sven Klemm
ed4dc241cc escape pipe symbol same way as in templating docs 2018-05-05 10:47:44 +02:00
Marcus Efraimsson
8523b1e410
changelog: add notes about closing #11616 
[skip ci]
 2018-05-04 15:03:30 +02:00
Marcus Efraimsson
d0753949bc
Merge pull request #11794 from grafana/11616-timepicker-buttons 
fix dark/light theme date selector styling in timepicker control
 2018-05-04 14:55:56 +02:00
Patrick O'Carroll
515eab2405 added left:unset to counter left:0 in recent react-select release 2018-05-04 11:46:17 +02:00
Patrick O'Carroll
c897485958 fixed text color in light theme 2018-05-04 10:30:42 +02:00
Marcus Efraimsson
4d2e6b4a34
changelog: add notes about closing #11800 
[skip ci]
 2018-05-03 19:13:57 +02:00
Marcus Efraimsson
6eba9c2438
Merge pull request #11802 from svenklemm/variable-interpolation 
dont shadow format passed in as function parameter in replace function in templatesrv
 2018-05-03 19:09:40 +02:00
Sven Klemm
a806f542c6 test if default variable interpolation is effective when no specific 
format is specified
 2018-05-03 18:42:58 +02:00
Marcus Efraimsson
8a9da4ba66
changelog: notes about closing #11690 
[skip ci]
 2018-05-03 18:42:14 +02:00
Marcus Efraimsson
da8f6c150b
Merge pull request #11751 from mtanda/11690 
fix to match table column name and order
 2018-05-03 18:33:46 +02:00
Daniel Lee
d518ed5330 changelog: add notes for ##11754, #11758, #11710 2018-05-03 15:46:21 +02:00
Daniel Lee
2c10f29b0f
Merge pull request #11784 from grafana/11754_auth_migration 
increase length of auth_id column in user_auth table
 2018-05-03 15:30:38 +02:00
Daniel Lee
7db9cc3bf0
Merge pull request #11796 from alexanderzobnin/fix-11710 
scroll: fix scrolling on mobile Chrome
 2018-05-03 15:18:29 +02:00
Alexander Zobnin
83d599670d scroll: remove firefox scrollbars 2018-05-03 11:54:02 +03:00
Simon Podlipsky
fc0a4b34a1
Add missing items to Gopkg.lock 2018-05-03 01:25:52 +02:00
Sven Klemm
f52920aa01 pipe escape try #3 2018-05-03 00:23:35 +02:00
Sven Klemm
7f8dacd087 use ascii code for pipe symbol to not mess up markdown table 2018-05-03 00:19:47 +02:00
Sven Klemm
fc7d876158 try to fix table 2018-05-03 00:17:18 +02:00
Sven Klemm
764fa15e24 dont shadow format passed in as function parameter 2018-05-02 23:03:37 +02:00
Torkel Ödegaard
c40a50829d fix: removed manully added http server from inject graph as it is now a self registered service 2018-05-02 21:30:15 +02:00