qhyou11
							
						 
						
							 
							
							
							
							
								
							
							
								1786198558 
								
							 
						 
						
							
							
								
								fix theme parameter not working problem while prefer theme set to light ( #13232 )  
							
							 
							
							
							
						 
						
							2018-09-12 06:52:38 +02:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								b8724ae0c4 
								
							 
						 
						
							
							
								
								refactoring: enterprise build/hooks refactorings ( #12478 )  
							
							 
							
							
							
						 
						
							2018-07-02 04:33:39 -07:00  
						
					 
				
					
						
							
							
								 
								Marcus Efraimsson
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								2288e01752 
								
							 
						 
						
							
							
								
								Merge pull request  #12169  from alexanderzobnin/feat-10796  
							
							 
							
							... 
							
							
							
							Import dashboard to folder 
							
						 
						
							2018-06-13 13:10:52 +02:00  
						
					 
				
					
						
							
							
								 
								Alexander Zobnin
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								25504e84ed 
								
							 
						 
						
							
							
								
								dashboard import to folder: minor fixes  
							
							 
							
							
							
						 
						
							2018-06-13 10:44:37 +03:00  
						
					 
				
					
						
							
							
								 
								Alexander Zobnin
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								9460063ab5 
								
							 
						 
						
							
							
								
								show import menu in sidenav, dashboard search and manage dashboards page  
							
							 
							
							... 
							
							
							
							if user has editor permissions for at least one folder 
							
						 
						
							2018-06-06 13:55:00 +03:00  
						
					 
				
					
						
							
							
								 
								Marcus Efraimsson
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								962f996799 
								
							 
						 
						
							
							
								
								always show server admin link in sidenav if grafana admin  
							
							 
							
							
							
						 
						
							2018-06-04 19:28:01 +02:00  
						
					 
				
					
						
							
							
								 
								David Kaltschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								f69654fcd5 
								
							 
						 
						
							
							
								
								Restrict Explore UI to Editor and Admin roles  
							
							 
							
							... 
							
							
							
							Access is restricted via not showing in the following places:
* hide from sidemenu
* hide from panel header menu
* disable keybinding `x`
Also adds a `roles` property to reactContainer routes that will be
checked if `roles` is set, and on failure redirects to `/`. 
							
						 
						
							2018-05-30 13:13:29 +02:00  
						
					 
				
					
						
							
							
								 
								Marcus Efraimsson
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								7548d6f6d1 
								
							 
						 
						
							
							
								
								Show create dashboard link if at least editor in one folder  
							
							 
							
							
							
						 
						
							2018-05-28 20:37:39 +02:00  
						
					 
				
					
						
							
							
								 
								Marcus Efraimsson
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								770acee56a 
								
							 
						 
						
							
							
								
								new property for current user indicating if edit permissions in folders  
							
							 
							
							
							
						 
						
							2018-04-30 15:34:31 +02:00  
						
					 
				
					
						
							
							
								 
								David
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								d8abfe6a7d 
								
							 
						 
						
							
							
								
								Merge pull request  #11742  from grafana/davkal/explore  
							
							 
							
							... 
							
							
							
							Explore UI skeleton 
							
						 
						
							2018-04-27 15:46:40 +02:00  
						
					 
				
					
						
							
							
								 
								David Kaltschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								25d3ec5bbf 
								
							 
						 
						
							
							
								
								Fixed settings default and explore path  
							
							 
							
							
							
						 
						
							2018-04-27 15:35:46 +02:00  
						
					 
				
					
						
							
							
								 
								Carl Bergquist
							
						 
						
							 
							
							
							
							
								
							
							
								28f7b6dad1 
								
							 
						 
						
							
							
								
								Enable Grafana extensions at build time.  ( #11752 )  
							
							 
							
							... 
							
							
							
							* extensions: import and build
* bus: use predefined error
* enterprise: build script for enterprise packages
* poc: auto registering services and dependency injection
(cherry picked from commit b5b1ef875f905473af41e49f8071cb9028edc845)
* poc: backend services registry progress
(cherry picked from commit 97be69725881241bfbf1e7adf0e66801d6b0af3d)
* poc: minor update
(cherry picked from commit 03d7a6888b81403f458b94305792e075568f0794)
* ioc: introduce manuel ioc
* enterprise: adds setting for enterprise
* build: test and build specific ee commit
* cleanup: test testing code
* removes example hello service 
							
						 
						
							2018-04-27 13:41:58 +02:00  
						
					 
				
					
						
							
							
								 
								David Kaltschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								1e6e89121c 
								
							 
						 
						
							
							
								
								Settings to enable Explore UI  
							
							 
							
							
							
						 
						
							2018-04-27 11:39:14 +02:00  
						
					 
				
					
						
							
							
								 
								David Kaltschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								f1220fd2a4 
								
							 
						 
						
							
							
								
								Explore WIP  
							
							 
							
							
							
						 
						
							2018-04-26 20:27:19 +02:00  
						
					 
				
					
						
							
							
								 
								David Kaltschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								5a29c17282 
								
							 
						 
						
							
							
								
								moved version in help menu to top  
							
							 
							
							
							
						 
						
							2018-04-16 16:25:28 +02:00  
						
					 
				
					
						
							
							
								 
								David Kaltschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								712212d6aa 
								
							 
						 
						
							
							
								
								Show Grafana version and build in Help menu  
							
							 
							
							... 
							
							
							
							* establishes Help as the single place to look for the Grafana version
* version is passed as menu sub-title to side menu
* added rendering of sub-title, plus styles
* sub-title was used by profile menu (its value is the login string),
but was not shown; now showing this value on condition that login name
is different from user name 
							
						 
						
							2018-04-16 13:37:05 +02:00  
						
					 
				
					
						
							
							
								 
								Julian Kornberger
							
						 
						
							 
							
							
							
							
								
							
							
								7aab6a8887 
								
							 
						 
						
							
							
								
								Make golint happier  
							
							 
							
							
							
						 
						
							2018-03-22 12:40:21 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Cech
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								c0ecdee375 
								
							 
						 
						
							
							
								
								rename Context to ReqContext  
							
							 
							
							
							
						 
						
							2018-03-07 11:54:50 -05:00  
						
					 
				
					
						
							
							
								 
								Dan Cech
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								338655dd37 
								
							 
						 
						
							
							
								
								move Context and session out of middleware  
							
							 
							
							
							
						 
						
							2018-03-06 18:16:49 -05:00  
						
					 
				
					
						
							
							
								 
								bergquist
							
						 
						
							 
							
							
							
							
								
							
							
								5934521137 
								
							 
						 
						
							
							
								
								fixes invalid link to profile pic when gravatar is disabled  
							
							 
							
							... 
							
							
							
							closes  #11097  
							
						 
						
							2018-03-06 11:46:50 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								cfa775e012 
								
							 
						 
						
							
							
								
								ds: updated ds nav  
							
							 
							
							
							
						 
						
							2018-01-18 18:17:58 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Lee
							
						 
						
							 
							
							
							
							
								
							
							
								545d7b9477 
								
							 
						 
						
							
							
								
								dashfolders: convert folder settings to React  
							
							 
							
							
							
						 
						
							2018-01-11 15:42:45 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								36fe8f5873 
								
							 
						 
						
							
							
								
								menu: fixed create default url  
							
							 
							
							
							
						 
						
							2017-12-15 15:17:05 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								2797e8e2d0 
								
							 
						 
						
							
							
								
								profile: use name or fallback for profile page  
							
							 
							
							
							
						 
						
							2017-12-15 13:06:11 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								fdf4bad1b7 
								
							 
						 
						
							
							
								
								fix: sidemenu profile main text is now username instead of name  
							
							 
							
							
							
						 
						
							2017-12-15 13:03:07 +01:00  
						
					 
				
					
						
							
							
								 
								Trent White
							
						 
						
							 
							
							
							
							
								
							
							
								e2bbb85daa 
								
							 
						 
						
							
							
								
								new icons created and added to nav  
							
							 
							
							
							
						 
						
							2017-12-13 17:48:44 -05:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								7f0440fded 
								
							 
						 
						
							
							
								
								minor tweaks  
							
							 
							
							
							
						 
						
							2017-12-13 18:00:16 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								22aa1f7e42 
								
							 
						 
						
							
							
								
								ux: change members to users  
							
							 
							
							
							
						 
						
							2017-12-13 11:21:33 +01:00  
						
					 
				
					
						
							
							
								 
								Alexander Zobnin
							
						 
						
							 
							
							
							
							
								
							
							
								d8612380e9 
								
							 
						 
						
							
							
								
								refactor: rename User Groups to Teams  
							
							 
							
							
							
						 
						
							2017-12-08 18:25:45 +03:00  
						
					 
				
					
						
							
							
								 
								Marcus Efraimsson
							
						 
						
							 
							
							
							
							
								
							
							
								b03b360414 
								
							 
						 
						
							
							
								
								dashfolders: Create nav model for folder page client side  #10083  
							
							 
							
							
							
						 
						
							2017-12-08 14:08:16 +01:00  
						
					 
				
					
						
							
							
								 
								Marcus Efraimsson
							
						 
						
							 
							
							
							
							
								
							
							
								017b337f00 
								
							 
						 
						
							
							
								
								dashfolders: create folder page  
							
							 
							
							... 
							
							
							
							Fixes  #10085  
							
						 
						
							2017-12-07 19:32:38 +01:00  
						
					 
				
					
						
							
							
								 
								Marcus Efraimsson
							
						 
						
							 
							
							
							
							
								
							
							
								2ea663df78 
								
							 
						 
						
							
							
								
								dashfolders: New Dashboard Folder page  
							
							 
							
							... 
							
							
							
							Fixes  #10083 . Permissions page is just a placeholder
for now. 
							
						 
						
							2017-12-07 17:30:54 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								90bcec8178 
								
							 
						 
						
							
							
								
								nav: updated nav item id for manage dashboards  
							
							 
							
							
							
						 
						
							2017-12-05 12:25:59 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								90da964a14 
								
							 
						 
						
							
							
								
								refactoring PR  #10068  
							
							 
							
							
							
						 
						
							2017-12-05 12:19:01 +01:00  
						
					 
				
					
						
							
							
								 
								Alexander Zobnin
							
						 
						
							 
							
							
							
							
								
							
							
								4d7ff4de15 
								
							 
						 
						
							
							
								
								move import menu item to the original place  
							
							 
							
							
							
						 
						
							2017-12-04 18:00:22 +03:00  
						
					 
				
					
						
							
							
								 
								Alexander Zobnin
							
						 
						
							 
							
							
							
							
								
							
							
								44ea0ff71d 
								
							 
						 
						
							
							
								
								Move import dashboard from modal to the page  
							
							 
							
							
							
						 
						
							2017-12-04 15:55:37 +03:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								68580f06a3 
								
							 
						 
						
							
							
								
								page header now on 99% of pages  
							
							 
							
							
							
						 
						
							2017-12-01 13:49:15 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								6bff416430 
								
							 
						 
						
							
							
								
								navigation: more progress on new page header  
							
							 
							
							
							
						 
						
							2017-12-01 12:51:46 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								75bb894485 
								
							 
						 
						
							
							
								
								ux: new page-header design, most pages beside admin done  
							
							 
							
							
							
						 
						
							2017-12-01 11:32:00 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								e53b55479a 
								
							 
						 
						
							
							
								
								ux: made plugins page work  
							
							 
							
							
							
						 
						
							2017-12-01 10:47:21 +01:00  
						
					 
				
					
						
							
							
								 
								Torkel Ödegaard
							
						 
						
							 
							
							
							
							
								
							
							
								6f5a9bf768 
								
							 
						 
						
							
							
								
								ux: new page header progress  
							
							 
							
							
							
						 
						
							2017-11-30 17:28:24 +01:00  
						
					 
				
					
						
							
							
								 
								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