Torkel Ödegaard
1099daec38
wip: react panels, query editor loading from react PanelEditor view
2018-06-20 12:05:03 +02:00
Torkel Ödegaard
230606146d
wip: react panel minor progrss
2018-06-19 21:25:57 +02:00
Torkel Ödegaard
65b96e1161
Merge branch 'react-panels' of github.com:grafana/grafana into react-panels
2018-06-19 20:00:46 +02:00
Torkel Ödegaard
c74a1c18fb
Merge branch 'master' of github.com:grafana/grafana into react-panels
2018-06-19 20:00:01 +02:00
Torkel Ödegaard
13bc9f6fb2
updated
2018-06-19 17:30:10 +02:00
Tobias Skarhed
3a9a36d6cf
Karma to Jest: history_srv ( #12341 )
...
* Karma to Jest: history_srv
* Fix TS errors
* Remove q, as it is not needed
2018-06-19 08:05:49 -07:00
Torkel Ödegaard
db52ea66bd
react panels minor progress
2018-06-19 16:57:55 +02:00
Marcus Efraimsson
d450ec94eb
changelog: add notes about closing #3132
...
[skip ci]
2018-06-19 15:04:49 +02:00
Marcus Efraimsson
f73c04086c
docs: update installation instructions
2018-06-19 15:00:45 +02:00
Torkel Ödegaard
aa5c9f199a
react panel minor progress
2018-06-19 14:51:57 +02:00
Daniel Lee
e6c5a5a905
ldap: add note about config in Grafana
2018-06-19 14:41:17 +02:00
Marcus Efraimsson
b1cf1acb71
Merge pull request #10970 from mmolnar/master
...
ldap: allow use of DN in group_search_filter_user_attribute and member_of
2018-06-19 14:40:05 +02:00
Daniel Lee
40d760622e
ldap: add note to dockerfile
2018-06-19 14:30:50 +02:00
Marcus Efraimsson
a60332d459
changelog: add notes about closing #12343
...
[skip ci]
2018-06-19 13:54:37 +02:00
Daniel Lee
94f39cb734
docs: Plugin review guidelines and datasource auth pages
2018-06-19 13:16:41 +02:00
Marcus Efraimsson
5377ad4e96
remove unused argument in default scenario of guardian test
2018-06-19 12:34:34 +02:00
Torkel Ödegaard
24d0b43e62
fix: fixed permission issue with api key with viewer role in dashboards with default permissions
2018-06-19 11:10:17 +02:00
Torkel Ödegaard
35403c1875
wip: react panel makeover mini progress
2018-06-19 08:42:41 +02:00
Tobias Skarhed
8666c77cc9
Karma to Jest: time_srv ( #12303 )
...
* Begin Karma to Jest: time_srv
* Remove experimental fix
* location search stubs for each test
* Fix issue where time service was not available for other tests
2018-06-18 09:47:23 -07:00
Tobias Skarhed
5bf72fc9f4
Karma to Jest: team_details_ctrl ( #12321 )
2018-06-18 07:54:56 -07:00
Torkel Ödegaard
542da8dc45
Merge branch 'master' into react-panels
2018-06-18 15:08:06 +02:00
bergquist
2b849086a1
changelog: adds note about closing #11607
...
[skip ci]
2018-06-18 13:51:20 +02:00
Carl Bergquist
764a4247f5
Merge pull request #12274 from xapon/11607-cleanup
...
#11607 Cleanup time of temporary files is now configurable
2018-06-18 13:50:05 +02:00
bergquist
dd7a185a91
test commit for checking github permissions
...
[skip ci]
2018-06-18 11:41:28 +02:00
Marcus Efraimsson
9a4ccdf388
changelog: add notes about closing #12278
...
[skip ci]
2018-06-18 11:28:33 +02:00
Marcus Efraimsson
9271e48513
Merge pull request #12317 from grafana/12278_snapshot_annotations
...
Copy correct annotation props when creating a snapshot
2018-06-18 11:24:04 +02:00
Marcus Efraimsson
b72c45f735
changelog: add notes about closing #11076
...
[skip ci]
2018-06-18 11:22:55 +02:00
Marcus Efraimsson
004142a1e4
Merge pull request #12263 from grafana/11076_current_org
...
Set current org when adding/removing user to org
2018-06-18 11:19:42 +02:00
Marcus Efraimsson
a738347957
snapshot: copy correct props when creating a snapshot
2018-06-18 11:04:16 +02:00
Carl Bergquist
d6f4313c2f
Merge pull request #12203 from bergquist/bus_multi_dispatch
...
bus: support multiple dispatch in one transaction
2018-06-18 10:54:05 +02:00
Marcus Efraimsson
6d48d0a80c
set current org when adding/removing user to org
...
To not get into a situation where a user has a current organization assign which he is
not a member of we try to always make sure that a user has a valid current organization
assigned.
2018-06-18 09:30:01 +02:00
Marcus Efraimsson
ab9f0e8edd
changelog: add notes about closing #10707
...
[skip ci]
2018-06-18 09:03:30 +02:00
Marcus Efraimsson
18167f1c18
Merge pull request #12299 from grafana/10707_whitelist
...
auth proxy: whitelist proxy ip instead of client ip
2018-06-18 09:00:41 +02:00
Tim Heckman
a2ff7629e0
Include the vendor directory when copying source in to Docker ( #12305 )
...
This change updates the `.dockerignore` file to no longer contain the `vendor/`
directory. When a Go project provides a `vendor/` directory within the
repository, the best practice is to build that project using their vendored
dependencies. By putting it in the `.dockerignore` file we prevent consumers
from easily doing that.
The `vendor/` directory is used to include all of the dependencies needed to
build a project. This makes it so that we can reproducibly build the project, at
any given commit, because the dependencies will always be present. Also, using
the vendor directory avoids us needing to continually re-download all the
dependencies, and it protects us from build failures if GitHub is down or a
dependency gets removed or renamed.
In addition to the change above, this also removes an extra `/tmp` entry from
the `.dockerignore` file.
Fixes #12304
Signed-off-by: Tim Heckman <t@heckman.io>
2018-06-17 22:38:37 -07:00
bergquist
6782be80fd
changelog: adds note about closing #12199
2018-06-16 16:59:15 +02:00
Carl Bergquist
e2adb4ced5
Merge pull request #12302 from grafana/12199_cloudwatch_panic
...
cloudwatch: handle invalid time range
2018-06-16 16:57:23 +02:00
bergquist
4c5fe68e7e
adds inTransactionCtx that calls inTransactionWithRetryCtx
2018-06-15 21:57:13 +02:00
bergquist
1181e96799
merge create user handlers
2018-06-15 21:23:57 +02:00
bergquist
da91b91b4b
transactions: start sessions and transactions at the same place
...
this make it possible for handler to use `withSession` when
transactions is not nedded and `inTransactionCtx` if its needed
without knowing who owns the session/transaction
2018-06-15 20:52:57 +02:00
Marcus Efraimsson
c02dd7462a
cloudwatch: handle invalid time range
2018-06-15 15:48:25 +02:00
Marcus Efraimsson
b418e14bd9
make sure to use real ip when validating white listed ip's
2018-06-15 15:29:43 +02:00
bergquist
4be6ef4ab3
changelog: adds note about closing #12286
2018-06-15 12:47:53 +02:00
bergquist
09e71e00a3
sql: adds tests for InTransaction
2018-06-15 12:46:20 +02:00
bergquist
03dae10e79
bus: noop should still execute fn
2018-06-15 12:46:20 +02:00
bergquist
a3ee778ddb
removes unused code
2018-06-15 12:46:20 +02:00
bergquist
9c1758b593
bus: Dispatch now passes empty ctx if handler require it
2018-06-15 12:46:20 +02:00
bergquist
9ca9a7c302
bus: dont start transaction when creating session
2018-06-15 12:46:20 +02:00
bergquist
629eab0b1e
bus: dont mix ctx/classic handlers
2018-06-15 12:46:20 +02:00
bergquist
e2275701d8
bus: DispatchCtx can now invoke any handler
2018-06-15 12:46:20 +02:00
Torkel Ödegaard
5af0b924ff
refactoring: renamed AddCtxHandler to AddHandlerCtx PR #12203
2018-06-15 12:46:20 +02:00
