Commit Graph

13027 Commits

Author SHA1 Message Date
Johannes Schill
34f27f6b15 dashfolders: Convert mobx observable to js objects and remove the observer() since we want to use the component outside the react/mobx world #10275 2018-01-25 15:37:15 +01:00
Johannes Schill
0722ea04a6 dashfolders: Clean up more variables and move newType, aclTypes and permissionOptions to the store #10275 2018-01-25 15:37:05 +01:00
Johannes Schill
4ea9f3027a dashfolders: Remove variables not used and pass in the real dashboardId #10275 2018-01-25 15:36:56 +01:00
Johannes Schill
02a3951f95 dashfolders: Remove those 2-line-components from PageHeader to make it easier to read and make sure components listening to the mobx state are wrapped with observer() #10275 2018-01-25 15:36:45 +01:00
Johannes Schill
766ab69143 dashfolders: Add support for breadcrumbs in NavStore #10275 2018-01-25 15:36:34 +01:00
Johannes Schill
3a94918b8f dashfolders: Rename UserPicker folder => Picker. Inject the permission-store in the FolderPermissions-container instead of the Permissions component, add the PermissionsStore to the RootStore and and the error-message to the Permissions-store #10275 2018-01-25 15:36:04 +01:00
Johannes Schill
126607de83 dashfolders: Add Permissions information box #10275 2018-01-25 15:33:56 +01:00
Johannes Schill
6b421b80a6 dashfolders: Fix page max width #10275 2018-01-25 15:33:45 +01:00
Johannes Schill
c3664e1d87 dashfolders: Update jest tests with backendSrv #10275 2018-01-25 15:33:36 +01:00
Johannes Schill
5a9fe9aff9 dashfolders: Add a Team Picker component and use it on the dashboard permissions page #10275 2018-01-25 15:33:11 +01:00
Johannes Schill
6b9858c1d3 dashfolders: Working user picker on the dashboard permissions page #10275 2018-01-25 15:30:43 +01:00
Johannes Schill
2de0489868 dashfolders: Send down backendSrv to the react components #10275 2018-01-25 15:30:15 +01:00
Johannes Schill
b79a15b057 dashfolders: Re-use the API of the angular user picker instead, which is reusable #10275 2018-01-25 15:29:21 +01:00
Johannes Schill
1d8ce3673e dashfolders: Remove the PermissionsInner-strategy since we have a container for this route now #10275 2018-01-25 15:20:56 +01:00
Johannes Schill
a5d441e78e dashfolders: Permissions are injected via MST so it needs to be defined as optional #10275 2018-01-25 15:20:37 +01:00
Johannes Schill
f23fb740a9 dashfolders: Add FolderPermissions container and make sure isFolder is passed to PermissionsStore #10275 2018-01-25 15:20:00 +01:00
Johannes Schill
7e13d0f773 dashfolders: Always get dashboardid and backendsrv from props #10275 2018-01-25 15:19:41 +01:00
Johannes Schill
3490c44636 dashfolders: Rem code to avoid tests to fail #10275 2018-01-25 15:19:30 +01:00
Johannes Schill
44ea8e58e2 wip: More on the permissions. Left are team picker and user picker, tests and error messages #10275 2018-01-25 15:19:17 +01:00
Johannes Schill
460cbe98a1 fix: mobx-react-devtools is a dev dependancy #10275 2018-01-25 15:18:46 +01:00
Johannes Schill
c8193e10b9 dashfolder: wip: More wip on acl.html2permissions.tsx #10275 2018-01-25 15:18:16 +01:00
Johannes Schill
7616cfb5f0 dashfolders: wip - Move Permissions into React #10275 2018-01-25 15:14:59 +01:00
Daniel Lee
bc5fae5367 dashfolders: merge conflict 2018-01-25 14:54:50 +01:00
Daniel Lee
4cfe179f47 variables: lint fix 2018-01-25 14:49:51 +01:00
Daniel Lee
8aa55ee352 variables: fix when datasource returns error 2018-01-25 14:16:06 +01:00
bergquist
49673c509d fixes broken phantomjs rendering
when migrating from govendor to dep we broke the phantomjs rendering.

ref #10602
2018-01-25 13:27:24 +01:00
Patrick O'Carroll
eb2d4b20bc added varibale to table hover, lightend colors for table light theme, fixes #10609 (#10611) 2018-01-25 12:17:16 +01:00
Leonard Gram
1c034b7a73 fixes minor typo 2018-01-25 09:30:37 +01:00
bergquist
c3a768b3ed provsioning: dont stop grafana due to missing 2018-01-25 09:30:37 +01:00
Jonathan McCall
579d2b63f8 Disable prefix and postfix font size when gauge mode is enabled (#10573)
* Disable prefix and postfix font size when gauge mode is enabled

* Use function to hide prefix/postfix size when using gauge

* Rename disableFontSizes to canChangeFontSizes
2018-01-25 09:27:25 +01:00
bergquist
31a5134a0f docs: improve docs for image uploaders 2018-01-24 22:26:00 +01:00
Carl Bergquist
7c9913cb8a
Merge pull request #10605 from tsvehagen/haproxy-example
docs: Add haproxy example for running behind reverse-proxy
2018-01-24 22:03:53 +01:00
bergquist
1508755422 cfg: remove local as default image uploader
ref #9967
2018-01-24 21:31:07 +01:00
Tobias Svehagen
f129754a96 docs: Add haproxy example for running behind reverse-proxy 2018-01-24 20:03:46 +01:00
hannes
43e6ea95e0 Cloudwatch: add support for multi instances (#10570)
* cloudwatch: fix ebs_volume_ids by create a client-session before call ec2:DescribeInstances.

* cloudwatch: add support for multi instanceIds on call ebs_volume_ids.
2018-01-24 15:41:42 +01:00
Torkel Ödegaard
889bc29330 ux: minor change, added import dashboard link to dashboard search side view 2018-01-24 15:29:16 +01:00
Leonard Gram
2d090829d8
Merge pull request #10603 from xlson/pruned-deps
tech: adds/removes in vendor folder according to dep 0.4.0.
2018-01-24 14:04:56 +01:00
Leonard Gram
f6fac03958 tech: adds/removes in vendor folder according to dep 0.4.0. 2018-01-24 14:01:45 +01:00
Marcus Efraimsson
39dd4799f0 docker: sync local time and timezone to mysql_tests block 2018-01-24 11:43:56 +01:00
Marcus Efraimsson
d36fd66dba dashfolder: fix for sqlite test 2018-01-24 11:43:08 +01:00
Marcus Efraimsson
1a5dee3c11
Merge pull request #10600 from grafana/mysql_dep_fix
mysql: pin the mysql dependency
2018-01-24 11:27:45 +01:00
Daniel Lee
9d2a667e8b dashfolder: fix for mysql test 2018-01-24 11:19:26 +01:00
bergquist
6618bff806 mysql: pin the mysql dependency 2018-01-24 11:07:57 +01:00
bergquist
d7f6f11eb1 tech: ignore /public and /node_modules 2018-01-24 11:01:27 +01:00
bergquist
d36e424fe0 tech: ignore /data folder for dep 2018-01-24 10:50:01 +01:00
bergquist
6a6eab5ea1 plugins: map error property on query result 2018-01-24 10:37:04 +01:00
bergquist
ee973a977b stats: send amount of stars as stats 2018-01-23 22:51:05 +01:00
bergquist
ea988a37dd tech: avoid using deprecated functions 2018-01-23 22:30:45 +01:00
bergquist
5a1cf2c793 style: minor code style changes 2018-01-23 22:28:47 +01:00
Torkel Ödegaard
dd70710617 refactor: minor css class naming change of #10505 2018-01-23 16:10:04 +01:00