bergquist
fa49332915
docs: typos
2018-04-17 19:09:39 +02:00
Carl Bergquist
3801df5da8
Merge pull request #11602 from mjtrangoni/add-codespell-to-circle
...
add codespell to CircleCI
2018-04-17 19:02:32 +02:00
Daniel Lee
5b968329a0
graphite: adds tests for tags and tag_values functions
2018-04-17 18:58:47 +02:00
Marcus Efraimsson
cfef609c32
changelog: notes about closing #10883
...
[skip ci]
2018-04-17 16:45:44 +02:00
Marcus Efraimsson
c120415406
Merge pull request #11398 from bergquist/readonly_dashboards
...
improved workflow for provisioned dashboards
2018-04-17 16:42:08 +02:00
Daniel Lee
d9b5ef8f7b
changelog: adds note for #11553
2018-04-17 16:35:55 +02:00
Marcus Efraimsson
d7688241c6
Merge branch 'master' into readonly_dashboards
2018-04-17 16:27:51 +02:00
bergquist
059719104f
dev: only build server with bra run
2018-04-17 15:02:22 +02:00
Daniel Lee
26bb22bffa
Merge pull request #11554 from grafana/11553_viewer_general_access
...
User with org viewer role permission fixes
2018-04-17 13:50:45 +02:00
Daniel Lee
4a842f96ac
changelog: adds note for #11173
2018-04-17 13:44:42 +02:00
Daniel Lee
b3acbb9995
Merge pull request #11526 from grafana/11173_folder_admin
...
A folder admin should be able to add permissions for folder/its dashboards
2018-04-17 13:42:38 +02:00
Marcus Efraimsson
2fc1558daf
revert changes of add panel button to require save permission
...
This resolves an issue where the add panel button was shown on the default home dashboard
2018-04-17 11:03:46 +02:00
Marcus Efraimsson
8a5cb088d3
Merge branch 'master' into readonly_dashboards
2018-04-17 10:50:04 +02:00
Marcus Efraimsson
e21d574814
changelog: fix typo
...
[skip ci]
2018-04-17 10:28:16 +02:00
Marcus Efraimsson
a3eff6cf25
changelog: notes about closing #11572
...
[skip ci]
2018-04-17 10:27:12 +02:00
Dan Cech
e07de80b75
Fix issues with metric reporting ( #11518 )
...
* report active users in graphite stats
* use bus to publish system stats
* metrics: avoid using events unless we have to
this commit also changes the default interval
for updating the stats gauges. Seems like the old values
was a product of previous metrics implementation
2018-04-17 10:20:01 +02:00
Marcus Efraimsson
ffe9b426d4
changelog: notes about closing #10747
...
[skip ci]
2018-04-17 10:00:09 +02:00
Torkel Ödegaard
85121e55c9
fix: Row state is now ignored when looking for dashboard changes ( #11608 )
...
* fix: Row state is now ignored when looking for dashboawrd changes, had to fix bug in expand logic to make fix work. Also moved the ChangeTracker to it's own file and moved tests to jest, fixes #11208
* removed commented out log calls
2018-04-17 09:41:07 +02:00
Marcus Efraimsson
9733172d3c
Merge pull request #11422 from grafana/dashboard-acl-ux2
...
improved ux for permission list
2018-04-17 09:39:39 +02:00
Marcus Efraimsson
d9799f7c13
Merge pull request #11572 from grafana/settings-icons-fix
...
ux: sizing and positioning of dashboard settings menu icons
2018-04-17 09:22:16 +02:00
Torkel Ödegaard
9ec89c1848
disable codecov comments
2018-04-17 09:20:43 +02:00
Marcus Efraimsson
92768d5a2b
Merge branch 'master' into dashboard-acl-ux2
2018-04-17 09:19:36 +02:00
Marcus Efraimsson
a01e6fc9c7
add some more sort order asserts for permissions store tests
2018-04-17 09:19:17 +02:00
Carl Bergquist
ac5836f895
Merge pull request #11623 from grafana/revert-11571-remove-codecov
...
Revert "build: remove code cov"
2018-04-17 09:13:31 +02:00
Carl Bergquist
ca6dd9f53f
Merge pull request #11622 from grafana/revert-11599-rm_codecov
...
Revert "removes codecov from frontend tests"
2018-04-17 09:13:06 +02:00
Carl Bergquist
ea56288f4a
Merge pull request #11611 from mjtrangoni/fix-unconvert-issues
...
fix unconvert issues
2018-04-17 09:06:39 +02:00
Carl Bergquist
450a3b4a00
Revert "build: remove code cov"
2018-04-17 09:00:55 +02:00
Carl Bergquist
b6b152d9ea
Revert "removes codecov from frontend tests"
2018-04-17 09:00:39 +02:00
Carl Bergquist
0976a46cb3
Merge pull request #11610 from grafana/davkal/bra-use-build-script
...
bra should use the proper build script
2018-04-17 08:51:01 +02:00
Marcus Efraimsson
3a5d1f4594
tsdb: update query and annotation editor help texts for postgres
...
In addition to closing #11578
2018-04-16 23:56:14 +02:00
Marcus Efraimsson
69d1330ae9
changelog: notes about closing #11578
...
[skip ci]
2018-04-16 23:46:26 +02:00
Marcus Efraimsson
97e43ddc5a
Merge pull request #11592 from svenklemm/postgres-timefilter-macro
...
tsdb: improve $__timeFilter macro for postgres
2018-04-16 23:38:05 +02:00
Sven Klemm
5dc36afe71
calculate datetime for timeFrom and timeTo macro in go
2018-04-16 23:02:24 +02:00
Sven Klemm
4599329683
set default for sslmode to verify-full in postgres datasource editor ( #11615 )
2018-04-16 22:23:24 +02:00
Marcus Efraimsson
58e6b11809
add some more sort order asserts for permissions store tests
2018-04-16 21:51:53 +02:00
Marcus Efraimsson
bc8353ae14
Merge branch 'master' into dashboard-acl-ux2
2018-04-16 21:19:01 +02:00
Mario Trangoni
ce941a004d
fix unconvert issues
2018-04-16 20:04:58 +02:00
Daniel Lee
e7bcd8c3c3
variable: fix binding bug after ts conversion
2018-04-16 19:59:47 +02:00
Sven Klemm
a2a7d3d436
add GetFromAsTimeUTC and GetToAsTimeUTC and use them in timeFilter macro
2018-04-16 19:38:35 +02:00
Sven Klemm
7ab0a54f4b
Merge remote-tracking branch 'upstream/master' into postgres-timefilter-macro
2018-04-16 19:23:08 +02:00
Daniel Lee
7d165068df
fix merge conflict
2018-04-16 19:19:48 +02:00
Sven Klemm
e8e554b3da
remove changes to module.ts from this branch
2018-04-16 19:14:25 +02:00
Patrick O'Carroll
7ef6106197
migrated dropdown-typeahead to ts ( #11499 )
...
* migrated dropdown-typeahead to ts
* removed console.logs
* added @ngInject
2018-04-16 17:40:29 +02:00
Daniel Lee
aa999aa6a9
changelog: adds note for #11556
2018-04-16 17:22:19 +02:00
Daniel Lee
82a1deaf5e
changelog: adds note for #11133
2018-04-16 17:20:26 +02:00
Marcus Efraimsson
e932623cc0
Merge branch 'master' into settings-icons-fix
2018-04-16 17:16:54 +02:00
Marcus Efraimsson
9573bc43ce
dashboard: better size and alignment of settings icons
2018-04-16 17:16:35 +02:00
Daniel Lee
34455c0598
Merge pull request #11583 from grafana/11556-org-switch-order
...
ordered user orgs alphabeticaly
2018-04-16 17:09:36 +02:00
Daniel Lee
bb7a6a0153
Merge pull request #11595 from kichristensen/DeleteEmptyPlaylist
...
Support deleting empty playlist
2018-04-16 17:06:59 +02:00
David
ed44face0e
Merge pull request #11605 from grafana/davkal/show-version-in-help
...
Show Grafana version and build in Help menu
2018-04-16 16:58:18 +02:00
