public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,064 Commits 655 Branches 650 Tags
9cfe2a7f5cce4fc0b7932c177ef2ba5351bbf030
Commit Graph
16064 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard 9cfe2a7f5c fix: Dashboard permissions now shows correctly, fixes #13201 2018-09-10 11:35:59 +02:00
Torkel Ödegaard 267b96cb48 Merge branch 'master' of github.com:grafana/grafana 2018-09-10 09:54:30 +02:00
Torkel Ödegaard 298c088d57 Merge branch 'redux-poc2' 2018-09-10 09:54:14 +02:00
Torkel Ödegaard 5c58a7d7f4 redux: do not use redux logger middleware in production builds 2018-09-10 09:53:52 +02:00
Bob Shannon f257ff0216 Allow oauth email attribute name to be configurable (#13006) 
* Allow oauth email attribute name to be configurable

Signed-off-by: Bob Shannon <bshannon@palantir.com>

* Document e-mail determination steps for generic oauth

* Add reference to email_attribute_name

* Re-add e-mail determination docs to new generic-oauth page

* Inherit default e-mail attribute from defaults.ini
 2018-09-10 09:45:07 +02:00
Sven Klemm 7c78b64a36 Document required order for time series queries (#13204) 2018-09-10 09:33:06 +02:00
Torkel Ödegaard 035b0ab07a Merge branch 'master' into redux-poc2 2018-09-10 09:32:06 +02:00
Torkel Ödegaard 6bdaf57ae7 refactor: changed AlertRuleItem pause action to callback 2018-09-10 09:29:53 +02:00
Torkel Ödegaard a440d3510a renaming things in admin 2018-09-07 17:55:38 +02:00
Marcus Efraimsson 7a117a6b6c release 5.2.4 2018-09-07 16:57:00 +02:00
Marcus Efraimsson c179926a27 changelog: release 5.2.4 2018-09-07 16:56:31 +02:00
Torkel Ödegaard 4391209f7b Merge branch 'master' into redux-poc2 2018-09-07 14:49:05 +02:00
Torkel Ödegaard 35ef51dca9 refactoring: custom scrollbars PR updated, #13175 2018-09-07 14:24:33 +02:00
Torkel Ödegaard 1415bed045 Merge branch 'react-custom-scrollbars-wrapper' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-react-custom-scrollbars-wrapper 2018-09-07 12:50:34 +02:00
Marcus Efraimsson 8f054e7c08 changelog: add notes about closing #13121 
[skip ci]
 2018-09-07 11:30:18 +02:00
Marcus Efraimsson fc597260c0 Merge pull request #13167 from holiiveira/teams-image 
Alert Teams - Adding Action to view the graph by its public URL.
 2018-09-07 11:24:06 +02:00
Marcus Efraimsson a1d1c4fb9a fix code formatting 2018-09-07 11:06:19 +02:00
Alexander Zobnin 8fca79e87e scrollbar refactor: replace HOC by component with children 2018-09-06 22:53:40 +03:00
Carl Bergquist b070784b8a adds usage stats for alert notifiers (#13173) 2018-09-06 21:03:09 +02:00
Marcus Efraimsson 44cd738dd9 changelog: typo 
[skip ci]
 2018-09-06 17:03:43 +02:00
Marcus Efraimsson 479e073451 docs: what's new in v5.3 placeholder 2018-09-06 15:22:03 +02:00
Alexander Zobnin a186bc01e0 tests for withScrollBar() wrapper 2018-09-06 15:37:31 +03:00
Marcus Efraimsson bdc3acbd2c changelog: restructure and add 5.3.0-beta1 header 
[skip ci]
 2018-09-06 14:21:36 +02:00
Marcus Efraimsson 3f4099c4a6 changelog: add notes about closing #13157 
[skip ci]
 2018-09-06 14:09:27 +02:00
Alexander Zobnin cf832e7db4 wrapper for react-custom-scrollbars component 2018-09-06 15:09:18 +03:00
Marcus Efraimsson 26756f86aa Merge pull request #13148 from svenklemm/postgres-min-interval 
Add min time interval support for SQL datasources
 2018-09-06 14:05:39 +02:00
Marcus Efraimsson db639684bb docs: sql datasources min time interval 2018-09-06 13:52:16 +02:00
bergquist 4ce41c16fc changelog: note about closing #10424 2018-09-06 13:33:38 +02:00
Carl Bergquist 3c0b1ef581 Merge pull request #13170 from bergquist/alerting_default_setting 
make default values for alerting configurable
 2018-09-06 13:26:42 +02:00
Torkel Ödegaard e364119774 docs: minor fixes 2018-09-06 13:21:11 +02:00
Torkel Ödegaard 320947359c Merge branch '12886-docs-authentication-section' 2018-09-06 13:16:17 +02:00
Torkel Ödegaard d6f9ebab63 docs: Updated auth docs 2018-09-06 13:15:36 +02:00
Torkel Ödegaard a25b594506 docs: updated 2018-09-06 12:13:23 +02:00
bergquist 1e33a3780f spelling errors 2018-09-06 11:51:24 +02:00
bergquist 3ce89cad71 make default values for alerting configurable 2018-09-06 11:26:14 +02:00
Henrique Oliveira e983f8f54b Adding Action to view the graph by its public URL. 2018-09-05 17:35:22 -03:00
Marcus Efraimsson d76dad86c8 changelog: order changes by group (ocd) 
[skip ci]
 2018-09-05 18:49:08 +02:00
Marcus Efraimsson 42d26400b1 changelog: add notes about closing #13030 
[skip ci]
 2018-09-05 18:47:26 +02:00
Marcus Efraimsson 81c5112259 Merge pull request #13165 from grafana/docs-docker-paths 
docs: default paths in the docker container.
 2018-09-05 18:01:01 +02:00
Patrick O'Carroll 2b74b1c4d6 added radix rule and changed files to follow rule (#13153) 2018-09-05 16:51:31 +02:00
Leonard Gram 500a4b5f35 docs: default paths in the docker container. 2018-09-05 16:46:22 +02:00
Leonard Gram 5d87aa2fa4 Merge pull request #13031 from bergquist/golang_1.11 
upgrade to golang 1.11
 2018-09-05 15:31:43 +02:00
Patrick O'Carroll 25f13bd3ad added only-arrow-functions rule and changed files to follow new rule (#13154) 2018-09-05 15:28:30 +02:00
Leonard Gram eed141fb54 build: uses 1.1.0 of the build container. 2018-09-05 15:10:57 +02:00
Leonard Gram 275f613050 Only authenticate logins when password is set (#13147) 
* auth: never authenticate passwords shorter than 4 chars.

* auth: refactoring password length check.

* auth: does not authenticate when password is empty.

* auth: removes unneccesary change.
 2018-09-05 12:12:46 +02:00
Torkel Ödegaard 0aea60bf17 Merge branch 'master' into redux-poc2 2018-09-05 12:11:11 +02:00
Torkel Ödegaard c9ae585d2a Merge branch '12918-no-conditional-assignment' 2018-09-05 12:09:32 +02:00
Torkel Ödegaard dc236b5063 refatoring: minor changes to PR #13149 2018-09-05 12:09:16 +02:00
Sven Klemm cb526d4557 Add min time interval to mysql and mssql 2018-09-05 12:02:57 +02:00
Leonard Gram 8ea2f7f858 build: updated build-container with go1.11. 2018-09-05 11:55:28 +02:00