root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 38 Packages Projects Releases Wiki Activity
59,906 Commits 1,415 Branches 627 Tags 2.6 GiB
Commit Graph

409 Commits

Author SHA1 Message Date
Torkel Ödegaard b2add1977a ux: progress on new page header 2017-11-30 16:35:27 +01:00
Torkel Ödegaard 74ceb76ec0 ux: work on page header 2017-11-30 15:37:03 +01:00
Torkel Ödegaard 645f49eda4 ux: updating header design for pages 2017-11-30 11:31:38 +01:00
Torkel Ödegaard 97cc454ded ux: minor changes 2017-11-01 14:23:46 +01:00
Daniel Lee 752453f204 dashboards: fix link to bulk edit 2017-10-29 20:20:51 +01:00
Torkel Ödegaard cae852a1a2 updated icons 2017-10-27 08:33:04 +02:00
Daniel Lee 7f3293ce80 dashfolders: rough draft of bulk edit 2017-10-25 16:12:03 +02:00
Torkel Ödegaard a299118c92 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-10-24 20:29:53 +02:00
Torkel Ödegaard 6f71af449b ux: new fixes 2017-10-18 09:48:37 +02:00
Daniel Lee 5f6ab1e370 styleguide: fix link in index 2017-10-16 14:11:52 +02:00
Torkel Ödegaard a3bd761b0c ux: testing out new icons 2017-10-14 21:17:16 +02:00
Torkel Ödegaard 3a089dd04c newgrid: various fixes 2017-10-11 21:36:03 +02:00
Torkel Ödegaard 21a7f57248 ux: changed cta button style 2017-08-20 21:16:40 +02:00
Torkel Ödegaard 011c582ebb minor user avatar stuff 2017-08-18 14:49:04 +02:00
Torkel Ödegaard a4da0adf38 ux: switching orgs now works through modal 2017-08-16 15:37:13 +02:00
Torkel Ödegaard 95f5c84a57 ux: making org visibile in profile view 2017-08-16 15:03:49 +02:00
Torkel Ödegaard 7f0f0eb617 ux: more nav work 2017-08-16 11:28:52 +02:00
Torkel Ödegaard 5405736321 ux: nav fixes & polish 2017-08-15 23:17:34 +02:00
Torkel Ödegaard 0bc226d760 ux: more nav work 2017-08-15 20:24:16 +02:00
Torkel Ödegaard 1eab771231 ux: navigation work 2017-08-15 17:52:52 +02:00
Torkel Ödegaard 63424f9866 ux: more work on sidemenu 2017-08-15 14:49:12 +02:00
Torkel Ödegaard ff4a79df06 minor update 2017-06-23 11:01:55 -04:00
Torkel Ödegaard 5360303ad4 ux: nav changes 2017-06-22 19:05:33 -04:00
Torkel Ödegaard 12270022e3 added sidemeu stuff 2017-06-22 18:41:39 -04:00
Torkel Ödegaard a4910c7aea merging new-sidenav 2017-06-22 18:11:29 -04:00
Torkel Ödegaard 5061b3c691 ux: nav experiments 2017-06-12 21:11:22 +02:00
Torkel Ödegaard 40d39f8a3e refactor(): renaming alerting hide ui option, #7318 2017-01-25 13:32:26 +01:00
smalik 9862c9ff40 feat(alerting): Show/hide alerting UI using configuration variable 
Use configuration variable "show_alerting_ui" to show/hide alerting UI
 2017-01-20 10:43:29 -05:00
Torkel Ödegaard b8f559aecb feat(plugins): made notifiers more pluggable and easier to support many of them, new ones can now be added without modifying any existing file, #7162 2017-01-06 12:04:25 +01:00
Torkel Ödegaard fb57bf77da ux(getting started): progress on getting started panel and persited help flag states, #6466 2016-11-09 10:41:39 +01:00
bergquist 04f417a423 feat(alerting): enabled by default. configurable elert engine 
closes #6210
 2016-10-10 13:09:16 +02:00
Torkel Ödegaard 34f15d92d0 feat(testdata): worked on testdata app 2016-09-27 14:39:51 +02:00
Torkel Ödegaard 175c651e65 fix(server side rendering): Fixed issues with server side rendering for alerting & for auth proxy scenarios, fixes #6115, fixes #5906 2016-09-23 12:29:53 +02:00
Torkel Ödegaard 0b7fa3c19d feat(alerting): minor progress on alert list, #5784 2016-08-16 16:50:36 +02:00
Torkel Ödegaard f934081bcb feat(alerting): making progress on alerting list, #5784 2016-08-16 09:52:45 +02:00
Torkel Ödegaard d9096110f8 Merge branch 'master' into alerting 
Conflicts:
	pkg/api/dashboard.go
	pkg/models/dashboards.go
	pkg/services/sqlstore/dashboard.go
 2016-07-11 18:28:07 +02:00
Torkel Ödegaard 5595fc2683 refactor(): refactored date handling and locale handling in #5517 2016-07-05 17:59:43 +02:00
bergquist a0418da160 Merge branch 'alerting' into alerting_notifications 2016-06-16 16:49:16 +02:00
bergquist 8ec311ade4 Merge branch 'master' into alerting 2016-06-16 16:29:41 +02:00
bergquist 149c2ae913 feat(alerting): add submenu for alerting 2016-06-16 15:21:23 +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 70cb8400c3 feat(alerting): changed name of root Alerts nav item and page from Alerts to Alerting 2016-06-06 09:17:29 +02:00
bergquist 1686d86c3b Merge branch 'master' into alerting_definitions 2016-05-30 08:26:08 +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
Torkel Ödegaard 855e913bbd feat(dashboards): began work on dashboard list 2016-05-19 11:03:10 +02:00
bergquist 27c34745a6 feat(alerting): add link to alerts in side menu 2016-05-03 16:46:10 +02:00
Torkel Ödegaard de26a17dc7 feat(footer): began work on page footer 2016-05-03 09:00:58 +02:00
Torkel Ödegaard 04a79175bf fix(plugins): only add app nav link if it has any pages/dashboards with role matching current user, fixes #4784 2016-04-25 14:00:49 +02:00
Torkel Ödegaard ab1048b7ee feat(preferences): theme and home dashbord settings now work work on profile and org settings page 2016-04-02 13:54:06 -07:00
Torkel Ödegaard 10df9dc8c3 feat(plugins): finished app navigation enhancements, closes #4434 2016-03-22 10:15:47 +01:00
Torkel Ödegaard 65c0937741 ux(): app navigation improvements, changes to plugin.json for apps, merged pages with includes section, #4434 2016-03-21 19:07:08 +01:00
bergquist c09d506245 feat(navigation): hide new and import for viewers 
closes #4326
 2016-03-10 16:38:16 +01:00
Anthony Woods 74949d306f add supressNav property to plugin pages. 
This allows pages to be registered that dont show up in the
Navigation menu when the App is pinned.
 2016-03-01 18:07:51 +08:00
Anthony Woods 4741152f05 correct path for app page links. 2016-02-29 19:37:35 +08:00
Torkel Ödegaard c521182ceb feat(plugins): more work on plugins list/edit view 2016-02-25 15:56:28 +01:00
Torkel Ödegaard acfc119409 ux(): added New and Import under divider to dashboard subnav 2016-02-22 21:51:31 +01:00
Torkel Ödegaard c94659f552 ux(color popover): refactored color popover to use drop lib 2016-02-22 18:46:58 +01:00
Torkel Ödegaard 08f7ccff38 feat(avatar): added server side proxy and cache of gravatar requests 2016-02-21 00:06:28 +01:00
Torkel Ödegaard 4ab041f79e ux(): added sass linter, almost no rules enabled yet 2016-02-20 18:31:09 +01:00
Matt 1144988443 Merged trent's styles and added admin submenu 2016-02-19 22:00:29 -05:00
Torkel Ödegaard e32ee9f02e ux(admin): admin pages overhaul 2016-02-14 17:37:05 +01:00
Torkel Ödegaard 6cdc1e4d37 feat(ux): minor tweaks and fixes, added hover submenu dropdowns 2016-02-12 11:21:42 +01:00
Torkel Ödegaard 2ea548850e Merge branch 'master' into style-changes-bulletfactory 
Conflicts:
	pkg/api/index.go
	public/less/sidemenu.less
 2016-02-11 21:23:54 +01:00
Trent White ff913333a2 update sidebar 2016-02-11 09:53:48 -05:00
Torkel Ödegaard ae39ec8585 feat(plugins): changed so that plugins can load css async via util function exposed from app/plugins/sdk 2016-02-10 13:09:39 +01:00
Torkel Ödegaard f0ecbd3878 feat(apps): removed some on hover stuff from sidemenu to make it ready to merge to master 2016-02-09 14:20:41 +01:00
Torkel Ödegaard 9dcfe6dc39 feat(apps): more work on app pages and sidemenu subnav 2016-02-09 14:06:23 +01:00
Torkel Ödegaard 18eb9d6076 feat(apps): began work on app pages 2016-02-09 11:17:49 +01:00
Torkel Ödegaard 99a053bbdd feat(): removed unused routes and minor fixes 2016-02-08 16:57:29 +01:00
Torkel Ödegaard 273fbaac68 refactor(): minor changes 2016-02-05 10:37:14 +01:00
utkarshcmu ca55d1f315 Minor bug fixes 2016-01-19 05:05:24 -08:00
utkarshcmu bcb44b7b31 UI and backend connectivity implemented 2016-01-19 05:02:22 -08:00
utkarshcmu 1ab1154010 Optimized backend queries 2016-01-19 04:09:57 -08:00
utkarshcmu 8f067a5ed2 Added backend functionality for searching snapshots 2016-01-19 01:37:36 -08:00
Torkel Ödegaard 44f0242157 fix(build): fixed issue after merge 2016-01-12 15:45:55 +01:00
Torkel Ödegaard e5b3f27a30 Merge branch 'apps' 2016-01-12 15:41:15 +01:00
Torkel Ödegaard ffe1407217 feat(apps): minor progress 2016-01-12 10:20:04 +01:00
Torkel Ödegaard e081a5c5a0 feat(apps): worked on pinning apps 2016-01-11 18:03:08 +01:00
Torkel Ödegaard c1e94e61d0 feat(apps): lots of more work on apps, changed app_plugin to app_settings in order to to confuse the app plugin model (definition) and app org settings 2016-01-10 21:37:11 +01:00
Torkel Ödegaard f67563e9ee feat(apps): moving things around 2016-01-08 12:45:12 +01:00
Torkel Ödegaard ad94f99d57 refactor(apps): more WIP work on apps 2015-12-22 11:37:44 +01:00
utkarshcmu bcaaedf2ff Resurrected nikita-graf's work and added playlistType for future use 2015-12-22 02:07:15 -08:00
Torkel Ödegaard eacc46da6d feat(plugins): WIP on new apps concept 2015-12-21 23:09:27 +01:00
woodsaj 3d15ee6d74 allow app menu items to be selectivly pinned to the left nav menu 2015-12-18 15:10:52 +08:00
woodsaj 48cf56b69a more renaming. also moved apps and datasource menus 2015-12-18 13:46:40 +08:00
woodsaj c35b51a268 refactor. 
Rename externalPlugin to apiPlugin
Rename bundle to app
Move js, css, menuItem and staticRoot to be properties os App
Add "app" field to panel, datasource and api plugin models. If populated
then the plugin is only enabled if the specific app is enabled for the Org.
If app is "", then the plugin is enabled for all orgs and can't be disabled.
 2015-12-17 23:53:58 +08:00
Torkel Ödegaard 5eab5dc47b feat(plugins): removed external plugins and bundle code, not ready for master yet, will revert this commit in seperate branch 2015-12-15 10:28:52 +01:00
woodsaj 3c13901695 add ui elements for plugins. 
This includes support for cusom plugin config directives.
 2015-12-04 19:21:33 +08:00
woodsaj c4a0fe0234 add pluginBundle backend api methods and SQL storage 2015-12-03 23:43:55 +08:00
woodsaj bd4cb549d6 add pluginBundle support 
A plugnBundle is meta plugin that has a set of dependent plugins
to enable.  This commit includes a plugin.json for a default
"core" bundle that enables all of the shipped panels and datasources.
 2015-12-03 15:52:37 +08:00
woodsaj 13864853a8 support separate css files for light/dark themes. 2015-12-03 12:29:57 +08:00
woodsaj 1b5c40dd1f add role access limitions for menu items. 
This allows external-plugin menu items to conditionally
be added to the UI depending on the logged in users
current role.
 2015-11-27 16:27:14 +08:00
Torkel Ödegaard df0bc7bbc4 feat(external_plugin): lots of refactoring for side menu link extensions and view data, #3185 2015-11-20 09:43:10 +01:00
Torkel Ödegaard 69daede583 feat(external plugins): worked on supporting external plugins better 2015-11-19 18:44:07 +01:00
woodsaj d503c5d83d refer to plugins are ExternalPlugin instead of thirdParty 2015-11-11 14:30:07 +08:00
Anthony Woods cf89b565a6 initial import of thirdParty route support 2015-10-15 04:14:09 +08:00
Torkel Ödegaard 3d37c9c9a3 feat(tagmanager): support to add google tagmanager id, closes #2569 2015-08-21 09:30:39 +02:00
Torkel Ödegaard 5270c4bc74 refactorin api code for user routes, preparation for admin improvements, #2014 2015-05-18 17:52:23 +02:00
Torkel Ödegaard 5de9230924 Security: New config option to disable the use of gravatar for profile images, Closes #1891 2015-05-01 08:40:13 +02:00
Torkel Ödegaard e7c43bf614 expose org id to frontend, Closes #1907 2015-04-29 09:26:12 +02:00
Torkel Ödegaard e6492f7db9 Share modal: Override UI theme via URL param for Share link, rendered panel, or embedded panel, Closes #1701 2015-04-02 09:21:38 +02:00
Torkel Ödegaard 80c771c945 Added googla analytics id setting 2015-03-27 17:13:44 +01:00
Torkel Ödegaard d987532262 Added server metrics 2015-03-22 15:14:00 -04:00
Torkel Ödegaard 04ca85fe89 Moved dashboard theme option from the dashboard to a persisted user setting, #1458 2015-02-28 14:30:08 +01:00
Torkel Ödegaard 26e4809e2e Big Backend Refatoring: Renamed Account -> Org 2015-02-23 20:07:49 +01:00
Torkel Ödegaard 60ae4afe87 Refresh frontend datasourceSrv after datasource update, no longer need to reload the page to use a newly added or updated datasource, #1493 2015-02-18 14:06:44 +01:00
Torkel Ödegaard 10820f31c2 Changed go package path 2015-02-05 10:37:13 +01:00
Torkel Ödegaard bd470abcf0 fontend styles updated 2015-02-03 10:46:52 +01:00
Torkel Ödegaard 1d6413bfae More work on backend for user favorites 2015-01-29 12:10:34 +01:00