Commit Graph

1012 Commits

Author SHA1 Message Date
Torkel Ödegaard
677eb6d179 fixes to unit picker 2018-12-14 16:27:48 +01:00
Torkel Ödegaard
84df0e2dde Added custom scrollbar to select component 2018-12-14 15:25:49 +01:00
Torkel Ödegaard
cb7ffb4415 select refactor fixes 2018-12-14 14:19:39 +01:00
Torkel Ödegaard
ae76ddcc3b explore using data source picker 2018-12-14 14:05:47 +01:00
Torkel Ödegaard
24825dc899 renamed folder to select 2018-12-14 12:59:45 +01:00
Torkel Ödegaard
58cc2e34d6 User picker using common select componnet 2018-12-14 12:38:36 +01:00
Torkel Ödegaard
104292df63 wip: unifying select components 2018-12-14 11:23:05 +01:00
Torkel Ödegaard
e40d21459a fixing input unit test failure 2018-12-14 11:03:42 +01:00
Torkel Ödegaard
42ee81a97c fixed issue with switching panels 2018-12-14 10:47:18 +01:00
Torkel Ödegaard
3f1adf1390 wip: styles are starting to come together 2018-12-13 14:28:44 +01:00
Torkel Ödegaard
a9e98feea0
Merge pull request #14476 from grafana/metrics-tab-changes-2
Metrics tab changes 2
2018-12-13 09:11:14 +01:00
Torkel Ödegaard
9f0d7314dd fixed unit tests 2018-12-12 13:05:24 +01:00
Torkel Ödegaard
7161b2dc9b wip 2018-12-12 09:51:17 +01:00
Torkel Ödegaard
3452ee5a9c wip: making things work again 2018-12-12 06:52:08 +01:00
Torkel Ödegaard
fa4fddf7b5 React-select refactorings 2018-12-11 22:17:32 +01:00
Erik Sundell
b18f064817 wip: add basic option header 2018-12-11 20:11:18 +01:00
Torkel Ödegaard
1d7d72b49d wip: react select css refactoring 2018-12-11 18:49:48 +01:00
Peter Holmberg
6ab93982ae styling on dropdowns 2018-12-11 15:47:30 +01:00
Peter Holmberg
c2b1f504a0 Merge remote-tracking branch 'origin/develop' into gauge-value-mappings 2018-12-11 15:19:28 +01:00
Peter Holmberg
346f5f2595 Using drop down instead 2018-12-11 15:14:53 +01:00
Johannes Schill
6bb9415b0e Filter tags select box on text input #14437 2018-12-11 15:04:40 +01:00
Peter Holmberg
ddf080dab6 Using an id to identify mappings 2018-12-11 14:17:58 +01:00
Torkel Ödegaard
5d4034be5a Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-11 10:13:57 +01:00
Torkel Ödegaard
f9110f7902 Merge branch 'master' into develop 2018-12-11 10:00:29 +01:00
Johannes Schill
6ac8f5c7a5 Unmount component when fading out to reset its state, such as search.. 2018-12-10 15:51:41 +01:00
Peter Holmberg
4a57d594e5 fixed styling 2018-12-10 14:50:32 +01:00
Torkel Ödegaard
512b617120
Merge pull request #14427 from grafana/color-picker-position-fix
Fixed issue with colorpicker position above window
2018-12-10 14:39:26 +01:00
Torkel Ödegaard
0c5fd21327 fixed issue with colorpicker position above window, fixes #14412 2018-12-10 14:07:20 +01:00
Torkel Ödegaard
e05f6c5397 fix search tag issues, fixes #14391 2018-12-10 13:23:38 +01:00
Torkel Ödegaard
7e0bc8f30d fixed max height issue not being respected by react select dropdown 2018-12-10 12:02:27 +01:00
David Kaltschmidt
487de2b832 Explore: Logging dedup tooltips
- use title attribute of toggle button group
- add descriptions for all dedup options
2018-12-09 13:06:34 +01:00
Torkel Ödegaard
30c2cc4b5c allow sidemenu sections without children still have a hover menu/header 2018-12-07 11:14:32 -08:00
Torkel Ödegaard
bfbb44af03 transparent toggle style and new button group style 2018-12-07 17:15:46 +01:00
Peter Holmberg
4f39df900c Merge remote-tracking branch 'origin/develop' into gauge-value-mappings 2018-12-07 15:10:32 +01:00
Torkel Ödegaard
eb6d0e9f51 Merge branch 'master' into develop 2018-12-07 14:59:38 +01:00
Torkel Ödegaard
9cc4e05205
Merge pull request #14366 from grafana/14341-wide-picker-no-button
Pickers with min-width instead of width
2018-12-07 09:05:22 +01:00
Peter Holmberg
6fff8e4a1c initial stuff 2018-12-06 17:09:32 +01:00
Erik Sundell
b74c099773 use render props instead of cloneElement 2018-12-06 16:38:50 +01:00
Erik Sundell
6f8293af4e sort of a hacky way to figure if the small variation should be used for the label
improve light theme look

use new toggle button group in logs

stop propagation on click event

clean up styles

improve support for small when a label is present

refactoring - move toggle button to the group file. turn it into a stateless component

improve support for light theme

rename dedupe to dedup

use radius variable
2018-12-06 16:37:23 +01:00
Erik Sundell
0d7b09b0f6 add basic button group component, using the the same label style as is
remove not used code

cleanup
2018-12-06 16:37:09 +01:00
Johannes Schill
02b14d33a6 If user login equals user email, only show the email once #14341 2018-12-06 13:46:04 +01:00
Johannes Schill
114a264da4 UserPicker and TeamPicker should use min-width instead of fixed widths to avoid overflowing form buttons. #14341 2018-12-06 13:46:04 +01:00
Torkel Ödegaard
09380399ef
Merge pull request #14331 from grafana/develop-tooltip-css
Portal component
2018-12-05 13:36:03 +01:00
Mario Trangoni
0f74843332 public/app/core/*: Fix some misspell issues 2018-12-05 13:02:58 +01:00
Torkel Ödegaard
e4e408676f Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-05 11:20:25 +01:00
Torkel Ödegaard
e01c196d88 fix to switch component 2018-12-05 11:19:38 +01:00
Johannes Schill
7d6db12f34 Rename BodyPortal to Portal and accept prop "root" which is where the portal should be placed 2018-12-05 10:50:26 +01:00
Torkel Ödegaard
aa6c52a1ba
Merge pull request #14323 from grafana/develop-tooltip-css
Small tooltip css-adjustments and add css for position "bottom-start"…
2018-12-05 10:40:10 +01:00
Johannes Schill
1bbe48e9c5 Create a portal and use it with our popper component (tooltip and popover) to avoid potential overflow-/zindex-bugs 2018-12-05 10:38:53 +01:00
Torkel Ödegaard
5f8001689b explore data source selector fix 2018-12-05 10:22:26 +01:00
Torkel Ödegaard
180ca021b5 Merge branch 'master' into develop 2018-12-05 10:17:22 +01:00
Johannes Schill
e55659192a Small tooltip css-adjustments and add css for position "bottom-start" used by the panel header corner 2018-12-04 17:00:00 +01:00
Peter Holmberg
f77c354341 Merge remote-tracking branch 'origin/develop' into gauge-value-options 2018-12-04 12:56:54 +01:00
Torkel Ödegaard
1828ace4b3 fix: align input backgrounds for code editors 2018-12-04 09:41:36 +01:00
Torkel Ödegaard
9404d36ab5
Merge pull request #14135 from grafana/panel-edit-in-react
React Panel Editor Mode (For Angular and React Panels)
2018-12-03 11:50:06 +01:00
Torkel Ödegaard
d38a0a0b64
Merge pull request #14106 from grafana/unit-picker
Unit picker
2018-12-03 10:53:48 +01:00
Torkel Ödegaard
a6c4ba4dfb
Merge pull request #14242 from grafana/various-style-fixes
Fixed styling issues with new checkbox style
2018-11-30 12:52:24 +01:00
Johannes Schill
58da6e8c26 react-panel: Add test for Input with validation on blur 2018-11-30 12:26:45 +01:00
Johannes Schill
c722ea4f76 react-panel: Input validation should be optional 2018-11-30 11:04:56 +01:00
Torkel Ödegaard
cc210b11fb Merge branch 'panel-edit-in-react' into various-style-fixes 2018-11-30 01:46:41 -08:00
Johannes Schill
a8e184c025 react-panel: Clean up input validation and increase code readability 2018-11-30 10:21:55 +01:00
Johannes Schill
69ae3d2e6a react-panel: Time range options moved to "Queries" tab 2018-11-30 10:21:54 +01:00
Johannes Schill
3908e64ef0 react-panel: Use correct type for children prop to avoid the use of fragments <></> 2018-11-30 10:21:54 +01:00
Johannes Schill
8254086ecb react-panel: Add CopyToClipboard-component and separate QueryInspector to its own component from QueriesTab 2018-11-30 10:21:53 +01:00
Johannes Schill
6242379915 react-panel: Replace JSONFormatter npm package with the current monkey patched JsonExplorer 2018-11-30 10:21:53 +01:00
Johannes Schill
5cca489acd react-panel: Clean up the JSONFormatter and make sure it updates both on mount and when props update 2018-11-30 10:21:53 +01:00
Johannes Schill
348f2e4ec4 react-panel: Get real datasource query for query inspector 2018-11-30 10:21:53 +01:00
Johannes Schill
82ce733e9e react-panel: Create component for JSON formatting and use it on query inspector 2018-11-30 10:21:53 +01:00
Torkel Ödegaard
93ac4e4717 Fixed styling issues with new checkbox style 2018-11-29 18:39:02 +01:00
Peter Holmberg
b856ae3957 revert Label change 2018-11-29 14:12:18 +01:00
Peter Holmberg
638c04e16b using percentage to not hide search when smaller screen 2018-11-28 11:41:40 +01:00
Peter Holmberg
2919fe1d6a color picker 2018-11-27 15:06:39 +01:00
Peter Holmberg
5c992ba13a created test for some functions 2018-11-23 16:12:53 +01:00
Erik Sundell
a5947e820c Merge branch 'master' into develop 2018-11-22 13:43:25 +01:00
Daniel Lee
4aeea56342
Merge pull request #14007 from grafana/stackdriver-template-query-editor
Stackdriver template query editor
2018-11-20 13:41:18 +01:00
Torkel Ödegaard
f44e634da4 switch slider changes 2018-11-20 09:39:56 +01:00
Torkel Ödegaard
571cfab923 added chekbox and other tweaks 2018-11-19 17:41:48 +01:00
Torkel Ödegaard
808a0aa6f0 Merge branch 'develop' into switch-slider-test 2018-11-19 16:48:16 +01:00
Peter Holmberg
37729bf9f1 decimals 2018-11-19 15:50:51 +01:00
Peter Holmberg
a8cf2dc501 some touch ups on unit 2018-11-19 14:03:32 +01:00
Torkel Ödegaard
8d39ca76be switch style tweaks 2018-11-16 12:45:19 -08:00
Peter Holmberg
cc7bf31c3e Merge remote-tracking branch 'origin/develop' into unit-picker 2018-11-16 16:54:02 +01:00
Peter Holmberg
02d8ffda5b default value 2018-11-16 16:35:42 +01:00
Peter Holmberg
0f4131b8d7 handle default value 2018-11-16 15:26:51 +01:00
Peter Holmberg
8ab86c2ceb expand groups when searching 2018-11-16 14:40:24 +01:00
Peter Holmberg
2b8eab8c8c maxHeight and style overrides 2018-11-16 14:11:51 +01:00
ijin08
c505fc3783 moved slider into label to make it clickable, styled slider in dark and light theme, created variables for slider 2018-11-16 13:02:29 +01:00
Torkel Ödegaard
e21a140fcc minor fixes 2018-11-16 07:41:40 +01:00
Torkel Ödegaard
c4ae05c5e5
Merge pull request #14078 from grafana/12759-description-n-links
12759 React-panel: description and links
2018-11-16 06:57:42 +01:00
Peter Holmberg
61a704a64e some progress on groups and options 2018-11-15 17:14:43 +01:00
Torkel Ödegaard
03040159ca Merge branch 'master' into develop 2018-11-15 17:00:03 +01:00
Marcus Efraimsson
52a71596eb
fix selected home dashboard should show as selected even though its not starred 2018-11-15 14:43:50 +01:00
Marcus Efraimsson
9606491f6c
reload browser after preferences been updated 2018-11-15 14:29:14 +01:00
Johannes Schill
e979ed140e panel-header: Unmount popper when not needed. 2018-11-15 14:16:26 +01:00
Johannes Schill
9e9ce80740 panel-header: Updated snapshots for popper 2018-11-15 13:49:48 +01:00
Johannes Schill
2a5f7d1e05 panel-header: Add fade in transition to tooltip 2018-11-15 13:44:15 +01:00
Torkel Ödegaard
cf0db51659 Trying to reduce the amount of duplication with preferences 2018-11-15 13:37:29 +01:00
Johannes Schill
e73466a80d panel-header: Make it possible to style the reference element and fix so panel description looks good 2018-11-15 12:47:32 +01:00
Johannes Schill
0430bb47c2 panel-header: Simplify condition 2018-11-15 09:17:39 +01:00
Torkel Ödegaard
bdf598ccb2 minor fix 2018-11-14 21:38:53 -08:00
Torkel Ödegaard
810e256787 css update to switch slider 2018-11-14 21:35:02 -08:00
Johannes Schill
0a5f920bf5 panel-header: Avoid undefined classNames and use the real panel description 2018-11-14 22:29:10 +01:00
Torkel Ödegaard
bae4c8d2e6 wip: switch slider test 2018-11-14 13:29:09 -08:00
Johannes Schill
af859b2f4d panel-header: Updates for the new react-popper api and make it possible to hover the tooltip popper without it closing 2018-11-14 22:28:00 +01:00
Peter Holmberg
063a1acf94 started on options and groups 2018-11-14 17:00:26 +01:00
Torkel Ödegaard
604add078b
Merge pull request #14066 from grafana/panel-size-refactor
Panel size refactor
2018-11-14 12:38:21 +01:00
Torkel Ödegaard
6d65432c8a Merge branch 'toggle-panel-menu-withreact' into develop 2018-11-14 12:24:30 +01:00
Torkel Ödegaard
90c41bb087 changed how size is calcualted and propagated and added proper interval calc to DataPanel 2018-11-14 12:03:25 +01:00
Peter Holmberg
e4e41474b1 first stuff 2018-11-14 11:06:02 +01:00
Peter Holmberg
a9b5cbf381 adced clickoutside wrapper 2018-11-13 17:00:28 +01:00
Erik Sundell
e698202fae stackdriver: use new naming convention for query editor all over 2018-11-13 10:57:10 +01:00
Torkel Ödegaard
7a30220d01 fixed scrollbar autohide prop 2018-11-12 17:48:10 +01:00
Torkel Ödegaard
727efa5a03 Merge branch 'pane-edit-ux-tabs' into develop 2018-11-12 16:25:13 +01:00
Torkel Ödegaard
a7daf58bb9 wip: progress on edit mode ux with tabs 2018-11-09 13:17:41 +01:00
David
203078280f
Merge pull request #13942 from grafana/davkal/explore-logging-graph
Explore: Logging graph overview and view options
2018-11-08 14:38:29 +01:00
Torkel Ödegaard
5975c4a737 ux: changed panel selection ux 2018-11-06 18:34:37 +01:00
Marcus Efraimsson
e5e886ccb7
fix selecting datasource using enter key 2018-11-06 11:49:22 +01:00
David Kaltschmidt
583334df05 Explore: Logging graph overview and view options
- Logging gets a graph for log distribution (currently per stream, but I
  think I'll change that to per log-level)
- added grid columns for timestamp and unique labels
- show common labels of streams
- View options to show/hide time columns, label columns
- created `--small` modifier for Switch CSS classes
- merging of streams is now a datasource responsibility
2018-11-02 08:25:36 +01:00
Torkel Ödegaard
ee5b37eb2c
Merge pull request #13878 from grafana/org-page-to-react
Org page to react
2018-10-31 20:39:56 +01:00
Torkel Ödegaard
05dee9e340 Merge branch 'mondras-empty-cta-apikeys' 2018-10-31 12:51:36 +01:00
Torkel Ödegaard
95a8a59845 restored transition 2018-10-31 12:50:44 +01:00
Torkel Ödegaard
dfb9419f86 Merge branch 'graph-legend-to-react' 2018-10-31 04:26:44 -07:00
Torkel Ödegaard
36cd73819a fixed memory leaks and minor refactoring 2018-10-31 03:40:03 -07:00
Peter Holmberg
12336e1548 using label component 2018-10-29 15:59:16 +01:00
Peter Holmberg
7c5e04277c Merge branch 'master' into org-page-to-react 2018-10-29 14:26:11 +01:00
Torkel Ödegaard
1a65046b64 Merge branch 'empty-cta-apikeys' of https://github.com/mondras/grafana into mondras-empty-cta-apikeys 2018-10-29 09:52:27 +01:00
Torkel Ödegaard
9f1f5805ec added switch form component 2018-10-28 12:10:49 -07:00
Carlos Mondragon
35688b223a Update snapshots. 2018-10-26 10:20:03 -07:00
Carlos Mondragon
bb227d5c3a Use jest.fn instead of string. 2018-10-26 10:12:27 -07:00
Peter Holmberg
ccbff592d2 adding default value and update actions 2018-10-26 14:51:33 +02:00
Peter Holmberg
affb04a3ce moved state to redux, renamed entities 2018-10-26 14:15:37 +02:00
Torkel Ödegaard
e7f6cdc625 Merge branch '13739/alert-to-react' 2018-10-25 17:44:23 +02:00
Torkel Ödegaard
f1660aa21a fix: updated backend srv to use appEvents and removed parts of alertsSrv 2018-10-25 17:05:17 +02:00
Peter Holmberg
a98f7e548f simple select 2018-10-25 16:56:49 +02:00
Alexander Zobnin
533f35853b
Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-10-25 11:56:02 +03:00
Peter Holmberg
f34cbae2dd cleaned up the flow 2018-10-24 14:33:53 +02:00
Peter Holmberg
ed99a543a5 moving things 2018-10-24 10:23:11 +02:00
Peter Holmberg
3e0a34ceca typing changes 2018-10-24 10:18:28 +02:00
Peter Holmberg
bb6409384e connected to store, self remove logic 2018-10-23 16:00:04 +02:00
Peter Holmberg
bbd02dd616 renaming things 2018-10-23 13:34:27 +02:00
Alexander Zobnin
5a4c362985
Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-10-22 17:18:35 +03:00
Alexander Zobnin
36354856f9
graph legend: minor refactor 2018-10-22 15:59:08 +03:00
Peter Holmberg
b7d821b524 component working 2018-10-22 14:22:40 +02:00
Alexander Zobnin
4b9462993e
graph legend: refactor, fix another review issues 2018-10-22 14:17:46 +03:00
Dave Waters
4b524fafa5 initial work to add shortcut to toggle legend - generic 2018-10-19 16:33:23 -04:00
Peter Holmberg
5f515bb3fc using react component 2018-10-19 15:33:16 +02:00
Torkel Ödegaard
4f4bba7f8c
Merge pull request #13578 from grafana/react-panels-step1
WIP: React panels step1
2018-10-19 12:59:09 +02:00
Torkel Ödegaard
dddbe62d6c Merge branch 'master' into react-panels-step1 2018-10-19 09:15:37 +02:00
Torkel Ödegaard
5bd11744dd
Merge pull request #13670 from svenklemm/metrics-segment-xss
Escape values in metric segment and sql part
2018-10-18 17:24:47 +02:00
Alexander Zobnin
fe0c5c73dd
graph legend: refactor 2018-10-18 12:30:34 +03:00
Peter Holmberg
ee0cc9bd77 Merge branch 'master' into data-source-instance-to-react 2018-10-16 12:14:11 +02:00
Johannes Schill
2a82b57d93 Remove unwanted char 2018-10-16 08:11:26 +02:00
Johannes Schill
6d3f037ef1 Fix incorrect alt text on logo 2018-10-16 07:50:44 +02:00
Sven Klemm
20c1a58488 Escape typeahead values in query_part 2018-10-15 14:05:07 +02:00
Sven Klemm
3a25a0de83 Escape values in metric segment and sql part 2018-10-15 13:53:37 +02:00
Torkel Ödegaard
543c67a297 react panels: got data 2018-10-14 16:31:20 +02:00
Torkel Ödegaard
cd4619dad1 working on react data / query exectution 2018-10-14 15:39:34 +02:00
Torkel Ödegaard
2e1d45a875 changed DataPanel from HOC to use render props 2018-10-14 12:41:09 +02:00
Torkel Ödegaard
8ba865bf57 Merge branch 'master' into react-panels-step1 2018-10-12 13:31:20 +02:00
Torkel Ödegaard
69e0311cbc Merge branch '13425-team-picker-bug' 2018-10-11 12:52:48 -07:00
Peter Holmberg
8ab2d8b0b9 fix mutability bug, removed unused constructor 2018-10-11 15:32:13 +02:00
Johannes Schill
7689e9bbf2 Handle DescriptionPicker's initial state #13425 2018-10-11 15:06:51 +02:00
Johannes Schill
dc9e822cc7 Remove CTA when CTA-action is clicked instead of a /new route #13471 2018-10-11 13:52:09 +02:00
Carlos Mondragon
0937335f14 Add onClick handler to CTA. 2018-10-11 13:50:53 +02:00
Peter Holmberg
02e7d713a1 Added Loading state on org pages 2018-10-11 11:49:34 +02:00
Johannes Schill
9a8a476776 Updated test snapshot #13425 2018-10-10 15:02:13 +02:00
Johannes Schill
501d974eaa Remove the fixed widths and make it possible to pass it in as a prop instead #13425 2018-10-10 14:15:28 +02:00
Johannes Schill
77d06a0924 User filtering now works properly at the backend #13425 2018-10-10 14:15:28 +02:00
Johannes Schill
779691a072 Removed old code #13425 2018-10-10 14:15:28 +02:00
Johannes Schill
ffae3e7a58 Rename css class "gf-form-select2" to "gf-form-select-box" #13425 2018-10-10 14:15:28 +02:00
Johannes Schill
9afcef985c Use new class names #13425 2018-10-10 14:15:28 +02:00
Johannes Schill
e20fa1ba70 Fixes for the tag filtering in the search #13425 2018-10-10 14:15:28 +02:00
Johannes Schill
4d2be024f4 Start implementing the upgraded react-select in the tag filter box #13425 2018-10-10 14:15:28 +02:00
Johannes Schill
67d77e6061 Bump react-select to 2.1.0 #13425 2018-10-10 14:15:27 +02:00
Johannes Schill
5c842f3ed3 Add frontend filtering of users in user picker #13425 2018-10-10 14:15:26 +02:00
Johannes Schill
be7ed3ebca Upgrade Datasources-picker on Explore page #13425 2018-10-10 14:15:26 +02:00
Johannes Schill
52b329562d Enable trailing on the debounce in the TeamPicker (same as in UserPicker) #13425 2018-10-10 14:15:26 +02:00
Johannes Schill
a29d80df4e Update typescript notifications #13425 2018-10-10 14:15:26 +02:00
Johannes Schill
2d65845bac Update (js-) tests and snapshots for react-select 2 #13425 2018-10-10 14:15:25 +02:00
Johannes Schill
087ff2fa74 wip: Remove code for old react-select component #13425 2018-10-10 14:15:25 +02:00
Johannes Schill
d703b8062f wip: The pickers are stateful nowadays, no need to pass in the current value #13425 2018-10-10 14:15:25 +02:00
Johannes Schill
d9434ba1b1 wip: Upgrade react-select #13425 2018-10-10 14:15:25 +02:00
Peter Holmberg
78b56dd528 reverted AddPermissions 2018-10-09 14:50:46 +02:00
Peter Holmberg
ac6bee621c modified AddPermissions component 2018-10-09 11:07:23 +02:00
Torkel Ödegaard
848f19a4a1 ux: misc react migration fixes and info box style improvement 2018-10-05 08:43:56 +02:00
Torkel Ödegaard
0aa0ae0eb1 react-2-angular: added generic angular directive loader util that can be used from react 2018-10-04 13:02:29 +02:00
Torkel Ödegaard
dcb7f0d492 Merge branch 'master' into react-panels-ux-idea2 2018-10-04 09:08:19 +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
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
Peter Holmberg
3c8820ab55 invites table 2018-10-01 18:01:26 +02:00
Peter Holmberg
13666c8462 tests 2018-10-01 14:17:28 +02:00
Peter Holmberg
a43ede70bc added default prop instead of specifying prop 2018-10-01 14:02:13 +02:00
Peter Holmberg
8f99276606 first crude display 2018-09-28 17:21:00 +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
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