bergquist
e480a38dc1
pagerduty: adds test for reading auto resolve setting
2017-12-22 09:58:37 +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
61b4e5ab2d
fix: unit test fixed
2017-12-20 13:02:52 +01:00
Torkel Ödegaard
85879a7014
prettier: change to single quoting
2017-12-20 12:33:33 +01:00
Torkel Ödegaard
2a360c45a2
ux: minor name change to search sections
2017-12-20 12:26:52 +01:00
Torkel Ödegaard
06c803405a
Merge branch 'master' of github.com:grafana/grafana
2017-12-20 12:24:39 +01:00
Torkel Ödegaard
e683f6afa4
Merge remote-tracking branch 'origin/10277_logout_route_full_page_reload'
2017-12-20 12:20:06 +01:00
Marcus Efraimsson
df3655dd4a
db: fix postgres regression when comparing boolean columns/values ( #10303 )
...
Use the dialect specific BooleanStr when comparing boolean columns/values.
Fixes #10300
2017-12-20 12:15:49 +01:00
Torkel Ödegaard
4acf6b0eee
Merge remote-tracking branch 'origin/10190_fix_select_icon_and_firefox'
2017-12-20 11:22:29 +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
Carl Bergquist
07432cb4fa
Merge pull request #10297 from m0nhawk/patch-1
...
fix missing comma in documentation output example
2017-12-20 10:07:50 +01:00
Andrew Prokhorenkov
30e51ad136
fix missing comma in documentation output example
2017-12-19 22:30:35 +02:00
Anastasios Gogos
9dbaca4cc6
fix broken link ( #10291 )
...
minor typo:
'(' instead of '/'
2017-12-19 18:40:41 +01:00
Marcus Efraimsson
9184300398
Merge pull request #10278 from grafana/10197_new_folder
...
Create new folder from the folder picker component
2017-12-19 18:39:47 +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
908b6c8d0b
tech: ran prettier on all scss files
2017-12-19 16:22:41 +01:00
Torkel Ödegaard
fadfc665e4
tech: ran pretttier on all typescript files
2017-12-19 16:06:54 +01:00
Johannes Schill
143c0022b8
Merge branch 'master' into 10190_fix_select_icon_and_firefox
2017-12-19 15:54:02 +01:00
Marcus Efraimsson
b1621e1e8f
Merge pull request #10286 from grafana/10230_new_to_search_popup
...
added new to new dahsboard and folder
2017-12-19 15:51:04 +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
Johannes Schill
bc7462cd04
Merge branch 'master' into 10190_fix_select_icon_and_firefox
2017-12-19 14:55:18 +01:00
Daniel Lee
31fc19c6d7
dashboard: fixes #10262
2017-12-19 14:55:03 +01:00
Patrick O'Carroll
0d283214a0
added new to new dahsboard and folder
2017-12-19 14:52:34 +01:00
Johannes Schill
23cceaecc4
test: Update test with new component signature
2017-12-19 14:45:44 +01:00
Carl Bergquist
326ba11c42
Merge pull request #10280 from bergquist/windows_build
...
WIP: delete unused icon files
2017-12-19 14:35:22 +01:00
Carl Bergquist
d671f5b404
Merge branch 'devkid-patch-1'
...
* devkid-patch-1:
pushover: update default message
Add default message for Pushover notifications
2017-12-19 14:31:57 +01:00
Carl Bergquist
e2be6a38c4
pushover: update default message
2017-12-19 14:31:26 +01:00
Carl Bergquist
f36aa2e953
Merge branch 'patch-1' of https://github.com/devkid/grafana into devkid-patch-1
...
* 'patch-1' of https://github.com/devkid/grafana :
Add default message for Pushover notifications
2017-12-19 14:30:09 +01:00
Johannes Schill
f6163a59af
Merge branch 'master' into 10190_fix_select_icon_and_firefox
2017-12-19 14:11:37 +01:00
Carl Bergquist
8055dcae44
delete unused icon files
2017-12-19 14:02:06 +01:00
Carl Bergquist
887af65ca9
Merge pull request #10264 from SteelPhase/patch-2
...
fix: Extra forward slash added when org redirect middleware is called (#10263 )
2017-12-19 13:58:33 +01:00
Johannes Schill
add5df07bf
Merge branch 'master' into 10190_fix_select_icon_and_firefox
2017-12-19 13:52:45 +01:00
Johannes Schill
fee3e7c02a
Merge branch 'master' into 10277_logout_route_full_page_reload
2017-12-19 13:50:36 +01:00
Johannes Schill
a55b42d11f
fix: The /logout route should always full page reload ( #10277 )
2017-12-19 13:39:11 +01:00
Torkel Ödegaard
75bb511019
tech: added prettier to precommit
2017-12-19 13:27:05 +01:00
Johannes Schill
3e28ce94eb
ux: Add icon to selected option in PageHeader navigation on small screens, update select boxes for Firefox so the arrow to the right is aligned with the other select boxes ( #10190 )
2017-12-19 13:19:44 +01:00
Carl Bergquist
0d9378d18e
Merge pull request #10274 from bergquist/alerting_without_rows
...
Alerting without dashboard rows
2017-12-19 13:19:33 +01:00
Johannes Schill
e1a527a87a
ux: Fix color picker positioning when scrolled down to the bottom of a page ( #10258 ) ( #10271 )
2017-12-19 12:58:55 +01:00
Carl Bergquist
644c2f7fb0
test: remove unused code
2017-12-19 11:23:21 +01:00
Carl Bergquist
66cf224e31
alerting: make alert extractor backwards compatible
...
closes #10270
2017-12-19 11:20:05 +01:00
Carl Bergquist
1816e89730
alerting: move test json into files
2017-12-19 10:22:26 +01:00
SteelPhase
a320a83138
Use strings.TrimPrefix to make sure relative url doesn't start with forward slash
...
Closes grafana/grafana#10263
2017-12-19 03:01:33 -05:00
