Torkel Ödegaard
b7ba73819c
mini fix
2018-10-04 09:14:47 +02:00
Torkel Ödegaard
dcb7f0d492
Merge branch 'master' into react-panels-ux-idea2
2018-10-04 09:08:19 +02:00
Torkel Ödegaard
a83f0e9ba2
test: updated react snapshot
2018-10-03 14:58:34 +02:00
Torkel Ödegaard
81c44eb312
Merge branch 'revert-13502-revert-13488-org-users-to-react'
2018-10-03 14:52:50 +02:00
Torkel Ödegaard
9b4dd31095
ux: minor tweak to link
2018-10-03 14:52:13 +02:00
Johannes Schill
97802f30ae
Fix issue with updating role permissions #13507
2018-10-03 13:37:00 +02:00
Peter Holmberg
ef5180bae0
fixed toggle buttons
2018-10-03 13:04:31 +02:00
Peter Holmberg
45113e6c8b
updated after pr feedback
2018-10-03 10:54:15 +02:00
Torkel Ödegaard
afdec3d1b0
Revert "Revert "Org users to react""
2018-10-03 09:43:10 +02:00
Torkel Ödegaard
fe4f2f71c3
Revert "Org users to react"
2018-10-03 09:40:37 +02:00
Torkel Ödegaard
38637f056f
Merge pull request #13488 from grafana/org-users-to-react
...
Org users to react
2018-10-03 09:30:08 +02:00
David
321c09aec4
Merge pull request #13416 from grafana/davkal/11999-explore-from-mixed-panels
...
Explore: jump to explore from panels with mixed datasources
2018-10-02 15:42:43 +02:00
Peter Holmberg
908bf8e834
deleting obsolete things
2018-10-02 13:53:11 +02:00
Peter Holmberg
cc57995070
snap
2018-10-02 13:30:09 +02:00
Peter Holmberg
6d6416c04d
fix after merge from master
2018-10-02 13:19:11 +02:00
Peter Holmberg
09b681326e
Merge branch 'master' into org-users-to-react
2018-10-02 11:18:01 +02:00
Peter Holmberg
cc1e22925f
snaps
2018-10-02 11:11:36 +02:00
Peter Holmberg
a188ceacbc
invitees
2018-10-02 11:04:55 +02:00
Torkel Ödegaard
f37a60dcd5
Merge branch 'data-sources-list-to-react'
2018-10-02 09:33:58 +02:00
Torkel Ödegaard
8fd1d8a057
changed from RFC to PureComponent
2018-10-02 09:27:02 +02:00
Peter Holmberg
3c8820ab55
invites table
2018-10-01 18:01:26 +02:00
Peter Holmberg
a43ede70bc
added default prop instead of specifying prop
2018-10-01 14:02:13 +02:00
Peter Holmberg
3211df7303
filter users in selector based on search
2018-10-01 13:45:00 +02:00
David Kaltschmidt
68dfc5699b
Moved explore helpers to utils/explore
2018-10-01 12:56:26 +02:00
David Kaltschmidt
54c9beb146
Explore: jump to explore from panels with mixed datasources
...
- extends handlers for panel menu and keypress 'x'
- in a mixed-datasource panel finds first datasource that supports
explore and collects its targets
- passes those targets to the found datasource to be serialized for
explore state
- removed `supportMetrics` and `supportsExplore`
- use datasource metadata instead (set in plugin.json)
- Use angular timeout to wrap url change for explore jump
- Extract getExploreUrl into core/utils/explore
2018-10-01 12:03:57 +02:00
Peter Holmberg
94971abd9c
functions and tests
2018-10-01 12:01:53 +02:00
David
7b543ca4b5
Merge pull request #13463 from grafana/davkal/explore-url-state
...
Explore: Store UI state in URL
2018-10-01 10:09:15 +02:00
Torkel Ödegaard
c0996e7a39
Merge pull request #13444 from grafana/13411-react-api-key
...
13411 react api key
2018-10-01 09:46:18 +02:00
Daniel Lee
9c2bca411c
Merge pull request #13289 from grafana/stackdriver-plugin
...
Stackdriver Datasource - Fixes #6733
2018-09-28 19:36:01 +02:00
David
b2758b2ad0
Merge pull request #13408 from grafana/limit-number-of-series-in-explore
...
Limit number of time series in explore
2018-09-28 17:45:33 +02:00
David Kaltschmidt
12c43d6436
Added test for url state in Explore
2018-09-28 17:39:53 +02:00
David Kaltschmidt
c3e0d4205c
Make Explore a pure component
2018-09-28 17:38:50 +02:00
Peter Holmberg
8f99276606
first crude display
2018-09-28 17:21:00 +02:00
David Kaltschmidt
200784ea4a
Explore: Store UI state in URL
...
Storing queries, split state, and time range in URL.
- harmonize query serialization when generating Explore URLs in
dashboards (use of `renderUrl`)
- move URL parse/serialization to Wrapper
- keep UI states under two keys, one for left and one for right Explore
- add option to angular router to not reload page on search change
- add lots of types
- fix time service function that gets triggered by URL change
2018-09-28 16:44:07 +02:00
Daniel Lee
9b90b835b2
Merge remote-tracking branch 'origin/master' into stackdriver-plugin
2018-09-28 16:20:40 +02:00
Peter Holmberg
da856187d8
snaps
2018-09-28 14:57:56 +02:00
Peter Holmberg
21cfc11009
implemented general actionbar
2018-09-28 14:34:58 +02:00
Peter Holmberg
3081e0f84a
Merge branch 'master' into 13411-react-api-key
2018-09-28 13:10:55 +02:00
Peter Holmberg
e50a87aec9
using constant
2018-09-28 12:58:01 +02:00
Peter Holmberg
7ae4076ddd
added no datasources added
2018-09-28 11:29:18 +02:00
Peter Holmberg
166f93cf54
components, test, removed old not used files
2018-09-28 11:05:34 +02:00
Torkel Ödegaard
5eede26a24
Merge pull request #13438 from grafana/plugin-list-to-react
...
Plugin list to react
2018-09-27 15:50:55 +02:00
Peter Holmberg
11ee65d35a
deletez
2018-09-27 14:51:00 +02:00
Torkel Ödegaard
7d44aacf4a
refactoring: slight changes to PR #13247
2018-09-27 14:50:14 +02:00
Peter Holmberg
b899a0e1c1
revert rename
2018-09-27 14:45:36 +02:00
Torkel Ödegaard
f2307f92de
Merge branch 'text_variable-3173' of https://github.com/daldoyle/grafana into daldoyle-text_variable-3173
2018-09-27 14:36:37 +02:00
Peter Holmberg
327cdf34d5
using constant
2018-09-27 14:32:54 +02:00
Peter Holmberg
fede5e6c74
rename to pluginlistitem
2018-09-27 14:23:46 +02:00
Peter Holmberg
cabc4c4bfe
fixing types
2018-09-27 14:19:36 +02:00
Peter Holmberg
1e2c06083a
rewrote to use react.sfc
2018-09-27 12:15:41 +02:00
