Daniel Lee 
							
						 
					 
					
						
						
							
						
						18269a5886 
					 
					
						
						
							
							WIP: user + user-group pickers for permissions  
						
						
						
						
					 
					
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						764d25f007 
					 
					
						
						
							
							WIP: rollback  
						
						
						
						
					 
					
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						01ff3bbe0a 
					 
					
						
						
							
							ux: mini css position fix  
						
						
						
						
					 
					
						2017-06-07 22:03:10 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						61bdc91272 
					 
					
						
						
							
							ux: css fix to search position when sidemenu is pinned  
						
						
						
						
					 
					
						2017-06-07 21:54:55 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						e7e675e471 
					 
					
						
						
							
							Merge branch 'walmartlabs-master' (Dashboard History Feature,  #8472 )  
						
						
						
						
					 
					
						2017-06-07 14:30:03 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						3ba8aeb9a7 
					 
					
						
						
							
							dashboard_history: fix for scenario where reverted dashbord has different title and url must change not just route reload  
						
						
						
						
					 
					
						2017-06-07 14:02:45 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						64d620c987 
					 
					
						
						
							
							dasboard_history: minor style fix change  
						
						
						
						
					 
					
						2017-06-07 13:50:59 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						56b3c4a3a0 
					 
					
						
						
							
							dasboard_history: fixed disabled attribute so it works both by disabling and fixing style, no need for disabled class and disabled attribute  
						
						
						
						
					 
					
						2017-06-07 13:46:36 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						577dfee086 
					 
					
						
						
							
							dasboard_history: fixed json diff so only dashbord is compared and not the whole dashboard revision object (message and restoreFrom etc was showing up in json diff)  
						
						
						
						
					 
					
						2017-06-07 13:36:03 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						8f6c9c5946 
					 
					
						
						
							
							dasboard_history: some polish around styles & diff colors, and minor fixes  
						
						
						
						
					 
					
						2017-06-07 12:39:06 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						ef1dfed0d8 
					 
					
						
						
							
							dasboard_history: big refactoring of how the compare api looked, now a POST with a model for new & base version, refactored a simplified UI code as well, this was done to lay foundation to make it possible to do diff against current in browser unsaved version  
						
						
						
						
					 
					
						2017-06-07 11:50:09 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						948e5ae74d 
					 
					
						
						
							
							dashboard_history: further css & markup fixes, removing style overrides & resuing existing styles and markup components  
						
						
						
						
					 
					
						2017-06-06 23:04:14 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						c4e872b9da 
					 
					
						
						
							
							dashboard_history: minor changes and fixes  
						
						
						
						
					 
					
						2017-06-06 16:27:28 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						7b5f7ed553 
					 
					
						
						
							
							dashboard_history: SQL did not work when using MySQL, fixes to dashboard version numbering, so inserts start at 1, added migration to fix old dashboards with version 0  
						
						
						
						
					 
					
						2017-06-06 15:40:10 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						9b629cd5a6 
					 
					
						
						
							
							dashboard_history: fixed history srv unit tests  
						
						
						
						
					 
					
						2017-06-06 14:28:21 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						546d489dd3 
					 
					
						
						
							
							dashboard_history: restored unsaved changes modal to simple cancel, discard, save  
						
						
						
						
					 
					
						2017-06-06 14:27:30 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						88da3a99e1 
					 
					
						
						
							
							refactoring: trying to remove all the css overrides in history tab and make the styles more more inline with best practice css, and if needed use modifier overrides instead  
						
						
						
						
					 
					
						2017-06-06 11:03:56 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						689e366f59 
					 
					
						
						
							
							refactoring: updated api url routes so they do not conflict with slug route  
						
						
						
						
					 
					
						2017-06-06 09:51:14 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						e43d09e15b 
					 
					
						
						
							
							fix: fixed failing frontend test  
						
						
						
						
					 
					
						2017-06-05 23:31:45 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						9c1401849e 
					 
					
						
						
							
							fix: always show dashboard history for now, need a way to make dropdown more dynamic  
						
						
						
						
					 
					
						2017-06-05 23:14:07 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						2a52e25d5b 
					 
					
						
						
							
							refactoring: removed double error alert, backendSrv is already showing an error alert  
						
						
						
						
					 
					
						2017-06-05 23:06:31 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						cabbfe9adc 
					 
					
						
						
							
							refactoring: moved dashboard history item formating (message) and fixed dashboard history migration issue, and removed from frontend tests that where no longer needed  
						
						
						
						
					 
					
						2017-06-05 22:59:04 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						f18ebea03e 
					 
					
						
						
							
							fix: dashboard save modals had double submit on enter after my refactoring this morning  
						
						
						
						
					 
					
						2017-06-05 18:01:16 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						c87418d060 
					 
					
						
						
							
							refactoring: Dashboard history restore operation is now reusing existing  
						
						... 
						
						
						
						operations instead of duplicating a bunch of get & save logic. 
						
						
					 
					
						2017-06-05 17:45:27 +02:00 
						 
				 
			
				
					
						
							
							
								Torkel Ödegaard 
							
						 
					 
					
						
						
							
						
						e18007153d 
					 
					
						
						
							
							refactoring: Renamed dashboard version queries that wrongly had Command suffix, added missing OrgId to dashboard history commands and queries  
						
						
						
						
					 
					
						2017-06-05 16:34:32 +02:00