Daniel Lee 
							
						 
					 
					
						
						
							
						
						3913f16550 
					 
					
						
						
							
							WIP: add permission check for GetDashboard  
						
						
						
						
					 
					
						2017-06-12 16:48:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						ef0facc987 
					 
					
						
						
							
							WIP: fix test after merge conflict  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						9f79b9b8c5 
					 
					
						
						
							
							WIP: fix go fmt error  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						18269a5886 
					 
					
						
						
							
							WIP: user + user-group pickers for permissions  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						9eccb4e79f 
					 
					
						
						
							
							WIP: API - add dash permission  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						bc6aa74439 
					 
					
						
						
							
							WIP: user-picker directive  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						2097ed0bb8 
					 
					
						
						
							
							WIP: Permission Type as string in permission query  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						96afb91ac4 
					 
					
						
						
							
							WIP: fixes after navbar changes  
						
						... 
						
						
						
						Fixes for merge conflicts and navbar metadata
added for user group pages. 
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						5c89c4b2bd 
					 
					
						
						
							
							WIP: dashlist in template for new folder  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						533f2d3d72 
					 
					
						
						
							
							WIP: refactor folder-picker for dashlist  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						c602afb9c6 
					 
					
						
						
							
							WIP: dashboard search by folder + toggle for list or tree mode  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						7381d2565d 
					 
					
						
						
							
							WIP: adds folder-picker to save as dialog  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						d081f85289 
					 
					
						
						
							
							WIP: use metric-segment for folder picker  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						6c736e002a 
					 
					
						
						
							
							WIP: add dummy root folder to folder picker  
						
						... 
						
						
						
						Can move a dash from a folder back to root level as well 
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						1e865211c9 
					 
					
						
						
							
							WIP: Create new dashboard button in dash search  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						06a15eec5c 
					 
					
						
						
							
							WIP: permissions moved to settings tab. Adds folder dropdown to general settings tab  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						82afe8228f 
					 
					
						
						
							
							WIP: add parentid to getdashboard query result  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						68b9342de3 
					 
					
						
						
							
							WIP: dashboard search by type (folder or dash)  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						b4576edc90 
					 
					
						
						
							
							WIP: fix after upstream sqlstore refactoring  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						764d25f007 
					 
					
						
						
							
							WIP: rollback  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						fa18b0053d 
					 
					
						
						
							
							WIP: delete permission in API  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						fff7b706d6 
					 
					
						
						
							
							WIP: user group additions  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						53d11d50fc 
					 
					
						
						
							
							WIP: remove browse mode for dashboard search  
						
						... 
						
						
						
						Dashboard folders included in all searches. If a dashboard matches
a search and has a parent folder then the parent folder is appended
to the search result. A hierarchy is then returned in the result
with child dashboards under their parent folders. 
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						f1e1da39e3 
					 
					
						
						
							
							WIP: get Dashboard Permissions  
						
						... 
						
						
						
						The guardian class checks if the user is allowed to get the
permissions for a dashboard. 
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						074ef7ce4e 
					 
					
						
						
							
							WIP: add open/closed folders icons for dash search  
						
						... 
						
						
						
						If browsing, then show open folder icon. If searching, show
the closed folder icon 
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						13314f23ba 
					 
					
						
						
							
							WIP: Can remove dashboard permission - sql  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						890ebcbb7b 
					 
					
						
						
							
							WIP: limit GetAllowedDashboards sql query with a where in  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						97c13b77bf 
					 
					
						
						
							
							WIP: Add or update Dashboard ACL  
						
						... 
						
						
						
						SQL Integration Tests for the guardian class too. 
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						3785894b40 
					 
					
						
						
							
							WIP: guardian service for search  
						
						... 
						
						
						
						Removes restricted dashboards from search result. 
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						2e010b920b 
					 
					
						
						
							
							dashboard: sort search with dash folder first  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						9cbaf0722b 
					 
					
						
						
							
							WIP: add some TS types  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						cbbe90ee79 
					 
					
						
						
							
							WIP: edit user group page  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						552935031b 
					 
					
						
						
							
							WIP: API methods for add/remove members to user group  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						0a1df0905e 
					 
					
						
						
							
							WIP: add update user group command  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						00ac446b2b 
					 
					
						
						
							
							WIP: add new group, needs to be redone  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						233cd7af4a 
					 
					
						
						
							
							WIP: add user group search  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						af67aea2a9 
					 
					
						
						
							
							WIP: add usergroup commands and queries  
						
						
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						1248728d7f 
					 
					
						
						
							
							WIP: rough prototype of dashboard folders  
						
						... 
						
						
						
						Breaks some stuff like selected dash in the search result.
In dashboard search, if the user is not searching then the result is
returned as a tree structure. No ACL's or user group ux yet. 
						
						
					 
					
						2017-06-12 15:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Martin Molnar 
							
						 
					 
					
						
						
							
						
						d10d897d65 
					 
					
						
						
							
							fix: component name of plugin page contains 'undefined' ( #8590 )  
						
						
						
						
					 
					
						2017-06-12 15:11:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						6992b484bc 
					 
					
						
						
							
							docs: improvements to building the docs readme  
						
						... 
						
						
						
						Explains that you need to clone the grafana repo if you have not done that already. 
						
						
					 
					
						2017-06-09 14:27:27 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						cdd5ba6198 
					 
					
						
						
							
							fix: influxdb test data source error handling now works better,  fixes   #8577  
						
						
						
						
					 
					
						2017-06-08 21:41:58 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						6c04057285 
					 
					
						
						
							
							Merge branch 'master' of github.com:grafana/grafana  
						
						
						
						
					 
					
						2017-06-08 14:39:39 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						217c746445 
					 
					
						
						
							
							ux: close edit views when opening panel in edit mode  
						
						
						
						
					 
					
						2017-06-08 14:23:51 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						95c8a76aa6 
					 
					
						
						
							
							ux: minor search style improvements  
						
						
						
						
					 
					
						2017-06-08 13:56:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						a8e9700334 
					 
					
						
						
							
							docs: add whitelist option for auth.proxy  
						
						
						
						
					 
					
						2017-06-08 13:38:18 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						50b09f4f10 
					 
					
						
						
							
							Merge branch 'master' of github.com:grafana/grafana  
						
						
						
						
					 
					
						2017-06-08 11:54:11 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						2c75593c1a 
					 
					
						
						
							
							refactoring: elasticsearch raw doc size limit option PR,  #8527  
						
						
						
						
					 
					
						2017-06-08 11:53:12 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						3c41d0477a 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/mk-dhia/grafana  into mk-dhia-master  
						
						
						
						
					 
					
						2017-06-08 11:22:48 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						f7c48c5a5f 
					 
					
						
						
							
							singlestat: fix ignoring zero value for table data  
						
						... 
						
						
						
						When table data returns a column with the value 0, it should not ignore
it. This change checks for undefined instead of if the value is truthy.
Fixes  #8531  
						
						
					 
					
						2017-06-08 11:06:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Lee 
							
						 
					 
					
						
						
							
						
						c5d5d7ac5a 
					 
					
						
						
							
							docs: instruction on creating dummy awsconfig  
						
						... 
						
						
						
						To be able to build the docs an awsconfig file must exist for the Dockerfile to copy. This adds an instruction to create an empty, dummy file so that the build will work. 
						
						
					 
					
						2017-06-08 10:32:57 +02:00