Torkel Ödegaard
9088023116
fix(error handling): improved dashboard init error handling and notifications
2016-07-06 07:23:09 +02:00
Torkel Ödegaard
b4493155fc
fix(error handling): improved dashboard init error handling and notifications
2016-07-06 07:18:58 +02:00
Torkel Ödegaard
c1b7bd0f1b
Merge branch 'notify_migration_error' of https://github.com/mtanda/grafana
2016-07-06 06:34:17 +02:00
Torkel Ödegaard
5595fc2683
refactor(): refactored date handling and locale handling in #5517
2016-07-05 17:59:43 +02:00
Torkel Ödegaard
c029e47a12
Merge branch 'moment-locale' of https://github.com/gofore/grafana into gofore-moment-locale
2016-07-05 16:22:33 +02:00
Joona Romppanen
438a73c58a
Added moment.js locales. Set locale from window.navigator at app init(). Use firstDayOfWeek on time picker
2016-07-05 17:08:44 +03:00
Mitsuhiro Tanda
630d0d0793
(snapshot) add open original dashboard button
2016-07-02 02:26:27 +09:00
Mitsuhiro Tanda
cc519adcfc
(snapshot) restrict saving original url for local snapshot
2016-07-02 02:16:23 +09:00
Mitsuhiro Tanda
7aaa15ad95
(snapshot) save original url
2016-07-02 02:16:23 +09:00
Torkel Ödegaard
346ca3fc89
Merge branch 'master' into alerting
2016-06-25 09:56:57 -04:00
Mitsuhiro Tanda
6ef27a87e4
fix catch clause
2016-06-24 13:44:10 +09:00
Mitsuhiro Tanda
44b2a292eb
notify dashboard migration fail
2016-06-23 16:56:18 +09:00
Torkel Ödegaard
f23d72001d
fix(dashboard): fixed issue triggering refresh after leaving fullscreen/edit mode with time range change
2016-06-21 17:21:45 +02:00
bergquist
dd8c3d0355
Merge branch 'master' into alerting
2016-06-20 10:44:48 +02:00
Torkel Ödegaard
9bcd5de8ff
fix(share): fixed PNG render link generated from share modal when opened from edit mode, fixes #5295
2016-06-17 14:03:59 +02:00
Torkel Ödegaard
305a6ae110
feat(dashboards): dashboard sharing fixes
2016-06-17 11:36:35 +02:00
bergquist
8ec311ade4
Merge branch 'master' into alerting
2016-06-16 16:29:41 +02:00
Torkel Ödegaard
1ae24b366f
feat(profiler): fixed issues with frontend perf profiler
2016-06-16 08:28:50 +02:00
Torkel Ödegaard
ec0b09450c
Merge branch 'export-dashboard'
...
Conflicts:
conf/defaults.ini
pkg/setting/setting.go
public/app/core/components/grafana_app.ts
public/app/core/core.ts
public/app/features/dashboard/dashboardCtrl.js
2016-06-16 08:06:43 +02:00
Torkel Ödegaard
1500c0e954
feat(alerting): alert threshold handles progress
2016-06-11 22:33:02 +02:00
Torkel Ödegaard
26d93d7130
Merge branch 'master' into alerting_definitions
2016-06-08 09:36:50 +02:00
Torkel Ödegaard
c739428c30
feat(profiling): refactorign profiling code, #5286
2016-06-08 06:51:10 +02:00
Torkel Ödegaard
2a7d2ffccb
Merge branch 'profiling_in_dev' of https://github.com/mtanda/grafana into mtanda-profiling_in_dev
2016-06-08 05:47:30 +02:00
Torkel Ödegaard
36b0802789
fix(png): fixed issue with png rendering, fixes #5274
2016-06-08 05:29:38 +02:00
Mitsuhiro Tanda
83c76981b2
fix profiling code
2016-06-06 17:42:11 +09:00
bergquist
d0ac258474
Merge branch 'master' into alerting_definitions
2016-06-03 12:22:46 +02:00
Peggy Li
d36c1769e0
Fix wording of the dashboard tags popover text
2016-05-31 17:29:31 +00:00
bergquist
1686d86c3b
Merge branch 'master' into alerting_definitions
2016-05-30 08:26:08 +02:00
Torkel Ödegaard
c8965d0f9a
feat(export): export will add templatize constant variables
2016-05-28 20:27:44 +02:00
Torkel Ödegaard
0d4c76a029
feat(import): save gnetId for dashbards imported from grafana.net
2016-05-27 16:42:32 +02:00
Torkel Ödegaard
c3708b3096
feat(import): import directly from grafana.net id/url now works
2016-05-27 16:11:05 +02:00
Torkel Ödegaard
540def2c39
feat(import): working on unit tests for import ctrl
2016-05-27 13:52:19 +02:00
Torkel Ödegaard
f6633c8189
feat(export): minor dupe fix
2016-05-27 08:34:12 +02:00
Torkel Ödegaard
e83d13848e
Merge branch 'master' into export-dashboard
...
Conflicts:
public/app/features/dashboard/submenu/submenu.ts
2016-05-26 14:22:22 +02:00
Torkel Ödegaard
90c9c70416
fix(): another fix for panel image rendering
2016-05-26 08:49:55 +02:00
Torkel Ödegaard
1060eeb197
feat(dashboard): include org id query parameter in dashboard url, #1613
2016-05-25 17:06:41 +02:00
Torkel Ödegaard
201d30a944
fix(export): style fixes and markup fixes for share modal
2016-05-25 13:01:40 +02:00
Torkel Ödegaard
fc2a069180
feat(export): fixed refactoring issue with dynamic dashbord srv
2016-05-25 12:45:52 +02:00
Torkel Ödegaard
392407136d
Merge branch 'export-dashboard' of github.com:grafana/grafana into export-dashboard
2016-05-25 12:33:30 +02:00
Torkel Ödegaard
ba6573af61
Merge branch 'master' into export-dashboard
...
Conflicts:
public/app/features/dashboard/submenu/submenu.ts
2016-05-25 12:32:56 +02:00
Matt Toback
8d988f9582
Export dashboard bulletfactory ( #5160 )
...
* create descriptions and styles for share dropdown
* Updating actual modal layout for Sharing
* Updated the modals to follow the new styles, fixed the wrapping issue on the main menu. Standardized buttons.
2016-05-25 12:30:27 +02:00
Torkel Ödegaard
f5c5d1b1da
Merge branch 'master' of github.com:grafana/grafana
2016-05-25 11:04:27 +02:00
Torkel Ödegaard
2cd6c2e7e0
Merge branch 'v3.0.x'
2016-05-25 11:04:12 +02:00
Torkel Ödegaard
71d62012e1
fix(panel): fixed issue with fullscreen panel view and switching to another dashboard, fixes #5163
2016-05-25 09:46:15 +02:00
Torkel Ödegaard
41deea90ee
feat(dashboard): template variable changes updates url, closes #5002
2016-05-24 16:34:17 +02:00
Torkel Ödegaard
a81806d3d0
feat(dashboard): sync time range with url, closes #458
2016-05-24 16:32:28 +02:00
Torkel Ödegaard
9eb7b192b8
Merge branch 'master' of github.com:grafana/grafana
2016-05-20 15:16:05 +02:00
Torkel Ödegaard
06d63dda6e
Merge branch 'v3.0.x'
2016-05-20 15:15:30 +02:00
Torkel Ödegaard
e6f251011f
fix(panel span): fixed issue setting panel span while in fullscren and also an issue when changing repeat variable while in fullscreen view, fixes #4957
2016-05-20 15:15:02 +02:00
Torkel Ödegaard
6a813aa33d
fix(export): better error handling
2016-05-20 14:45:22 +02:00