Commit Graph

2320 Commits

Author SHA1 Message Date
Torkel Ödegaard
3e7420320c Merge branch 'master' into react-mobx 2017-12-26 13:53:39 +01:00
Marcus Efraimsson
39eb8f9eba Dashboard: View JSON improvements (#10327)
* dashboard: enable copy to clipboard for view json and panel json

* dashboard: use code editor for view json under settings
2017-12-26 13:52:19 +01:00
Torkel Ödegaard
c11cf18879 refactor: tried to simplify and also minimize scope a bit for #10323 2017-12-26 13:22:01 +01:00
Torkel Ödegaard
b4ab91d651 Merge remote-tracking branch 'origin/10248_copy_panels' 2017-12-26 12:31:46 +01:00
Torkel Ödegaard
8fb0692da6 Merge remote-tracking branch 'origin/migrate-dashboard-files-to-ts' 2017-12-26 12:26:50 +01:00
Torkel Ödegaard
24723cdb3c fix: fixed issue with optimized build, fixes #10333 2017-12-23 08:34:48 +01:00
Patrick O'Carroll
52f30f6f00 migrated file to ts (#10328) 2017-12-22 20:52:57 +01:00
Marcus Efraimsson
281e519fab fix: remove unused code 2017-12-22 10:26:01 +01:00
Marcus Efraimsson
68457f5636 dashboard: copy panel to clipboard
Adds a new menu item to panels, Copy to Clipboard, that will both
copy the panel json to the clipboard and temporarily store the panel object
in the browsers window object. The temporarily stored panel object are
available in Add Panel from any dashboard for as long you don't refresh
the browser.
Fixes #10248, #1004
2017-12-22 10:24:55 +01:00
Patrick O'Carroll
972c3bc635 code formatting fix 2017-12-21 13:44:34 +01:00
Patrick O'Carroll
9b63a81756 migrated files to ts + fixed specfile 2017-12-21 13:22:20 +01:00
Torkel Ödegaard
02ad2e5f0f tech: cleaned up unused stuff 2017-12-21 12:31:04 +01:00
Torkel Ödegaard
9f7560b6f9 ux: removed unused stuff form style guide 2017-12-21 12:20:55 +01:00
Torkel Ödegaard
4181602b78 react: progress on react containers and mobx-state-tree store 2017-12-21 11:56:45 +01:00
Torkel Ödegaard
3a1f52d8a2 prettier: ran on all files again, sorry. now settings are defined in package.json 2017-12-21 08:39:31 +01:00
Marcus Efraimsson
af34f9977e Add avatar to team and team members page (#10305)
* teams: add db migration for email column in teams table

* teams: /teams should render index page with a 200 OK

* teams: additional backend functionality for team and team members

Possibility to save/update email for teams.
Possibility to retrive avatar url when searching for teams.
Possibility to retrive avatar url when searching for team members.

* teams: display team avatar and team member avatars

Possibility to save and update email for a team

* teams: create team on separate page instead of modal dialog
2017-12-20 21:20:12 +01:00
Marcus Efraimsson
d41ce4f9ca Various dashboard folders improvements (#10309)
* dashfolders: fix url for create dashboard from manage dashboards

Don't include folderId querystring if you don't manage a folder and
creating a new dashboard from there.

* dashfolders: don't store folderId in dashboard model

Use folderId from meta instead
#10307

* dashfolders: minor ux fix

* dashfolders: minor fix for edit folder title
2017-12-20 21:17:55 +01:00
Torkel Ödegaard
354913a704 mobx: progress on poc 2017-12-20 17:24:04 +01:00
Torkel Ödegaard
85879a7014 prettier: change to single quoting 2017-12-20 12:33:33 +01:00
Marcus Efraimsson
bbdb1cddd7 dashboard: delete row improvements
Possibility to delete row and all its panels or
only the row which will leave its panels in the dashboard.
2017-12-20 11:13:24 +01:00
Marcus Efraimsson
1ddcaf5b6f minor fixes and formatting after review 2017-12-19 18:01:09 +01:00
Marcus Efraimsson
0bfedfe4d6 dashfolders: use validation service for folder creation and dashboard import. #10197 2017-12-19 18:00:59 +01:00
Marcus Efraimsson
4846125ec0 dashfolders: support creating new folder when moving dashboards. #10197 2017-12-19 18:00:47 +01:00
Marcus Efraimsson
2d0f5f06e4 dashfolders: support creating new folder when saving a dashboard. #10197 2017-12-19 18:00:38 +01:00
Marcus Efraimsson
7f9c0df464 dashfolders: support creating new folder in dashboard settings. #10197 2017-12-19 18:00:26 +01:00
Marcus Efraimsson
60d7e4308c dashfolders: support creating new folder from the folder picker. #10197 2017-12-19 18:00:06 +01:00
Torkel Ödegaard
af1f3dd77b poc: mobx poc 2017-12-19 17:26:51 +01:00
Torkel Ödegaard
fadfc665e4 tech: ran pretttier on all typescript files 2017-12-19 16:06:54 +01:00
Daniel Lee
6ad06364c7
search: closes dash search when selecting current dashboard (#10285)
Fixes #10231.
2017-12-19 15:28:58 +01:00
Johannes Schill
0bc6f4e2bd fix: Original dashboard link from snapshot should be an a-tag, not a button (#10269) (#10283) 2017-12-19 14:58:12 +01:00
Daniel Lee
31fc19c6d7 dashboard: fixes #10262 2017-12-19 14:55:03 +01:00
Torkel Ödegaard
75bb511019 tech: added prettier to precommit 2017-12-19 13:27:05 +01:00
Daniel Lee
77cc546315 dashfolder: nginject fix 2017-12-15 16:36:31 +01:00
Daniel Lee
7dac64354f teams: missing nginject attribute 2017-12-15 16:26:00 +01:00
Torkel Ödegaard
71658d1e76 grid: disable resize and drag on non editable dashboards, closes #10235 2017-12-15 16:23:26 +01:00
Torkel Ödegaard
4112abd699 logging: removed logging from panel loader 2017-12-15 15:43:32 +01:00
Torkel Ödegaard
d1e0e36996 fix: dont show settings for viewers 2017-12-15 14:51:20 +01:00
Torkel Ödegaard
a8a5f8181b fix: viewers can edit now works correctly 2017-12-15 14:19:49 +01:00
Torkel Ödegaard
ed48d27d85 fix: fixed minor ux and firefox issues, fixes #10228 2017-12-15 13:34:50 +01:00
Torkel Ödegaard
c395237710 Merge branch Grafana v5 'develop' branch 2017-12-15 12:06:09 +01:00
Torkel Ödegaard
8905c8e5fb Merge branch 'team_member_count' of https://github.com/bergquist/grafana into develop 2017-12-15 11:53:47 +01:00
Torkel Ödegaard
75bfe313d7 Merge remote-tracking branch 'origin/develop-filter-table' into develop 2017-12-15 11:44:51 +01:00
bergquist
256f7176a2
teams: add team count when searching for team
closes #10207
2017-12-15 11:08:06 +01:00
Torkel Ödegaard
9a711a4fc3 ux: minor position change for layout selector, fixes #10217 2017-12-15 09:58:39 +01:00
Torkel Ödegaard
3300af909a Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-15 09:50:18 +01:00
Torkel Ödegaard
ba3dbac50d fix: view json from share modal now works, #10217 2017-12-15 09:49:57 +01:00
Torkel Ödegaard
25d8f21b64 ux: used new add data sources icon 2017-12-15 09:19:29 +01:00
Torkel Ödegaard
581257416e Merge remote-tracking branch 'origin/develop-icons' into develop 2017-12-14 19:56:19 +01:00
Marcus Efraimsson
b1bb012343 dashfolders: fix folder selection dropdown in dashboard settings
Use folder id from meta instead of dashboard object
2017-12-14 15:58:24 +01:00
Patrick O'Carroll
780d3e2c8f fix for merge conflict 2017-12-14 15:50:47 +01:00