Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							3d2521abf0 
							
						 
					 
					
						
						
							
							Merge branch 'master' into feature/dope-layout-5543  
						
						
						
						
					 
					
						2015-10-01 17:42:24 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							b80cfe7cdc 
							
						 
					 
					
						
						
							
							NavigationController: Pass through the default url without creating the form  
						
						
						
						
					 
					
						2015-10-01 13:55:12 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							aa3bff532e 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Make sure to return the correct configuration  
						
						
						
						
					 
					
						2015-10-01 10:57:10 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							6affad6895 
							
						 
					 
					
						
						
							
							Fix logout loop (testing),  #2  
						
						... 
						
						
						
						Quick and dirty fix. 
						
						
					 
					
						2015-10-01 10:50:33 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							917d5fccce 
							
						 
					 
					
						
						
							
							CSS: Use control-button for the ldap discovery btn  
						
						... 
						
						
						
						refs #5543  
						
						
					 
					
						2015-10-01 02:53:27 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							90b64d4cc3 
							
						 
					 
					
						
						
							
							Don't translate empty strings in the login form  
						
						... 
						
						
						
						refs #5543  
						
						
					 
					
						2015-10-01 02:53:04 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							f960874dd4 
							
						 
					 
					
						
						
							
							Remove title from general config  
						
						... 
						
						
						
						refs #5543  
						
						
					 
					
						2015-10-01 00:02:02 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							231c63b703 
							
						 
					 
					
						
						
							
							Merge branch 'master' into feature/dope-layout-5543  
						
						
						
						
					 
					
						2015-09-30 18:52:52 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							16cdd76c9e 
							
						 
					 
					
						
						
							
							NavigationItemForm: Strip the current base url from an item's url  
						
						
						
						
					 
					
						2015-09-30 15:37:15 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							2ace54edc0 
							
						 
					 
					
						
						
							
							CSS: Use form-controls for buttons in the user backend config form  
						
						... 
						
						
						
						refs #5543  
						
						
					 
					
						2015-09-30 12:46:03 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							2520d6a57a 
							
						 
					 
					
						
						
							
							Show discover button on LDAP resource forms on a new line for the moment  
						
						... 
						
						
						
						refs #5543  
						
						
					 
					
						2015-09-30 12:44:57 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							8b0c820f89 
							
						 
					 
					
						
						
							
							Merge branch 'master' into bugfix/separate-configuration-files-for-navigation-items-10246  
						
						
						
						
					 
					
						2015-09-30 12:38:31 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							915b559129 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Do not disable the hidden type field  
						
						... 
						
						
						
						refs #10246  
						
						
					 
					
						2015-09-30 12:33:13 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							32a92bbdf3 
							
						 
					 
					
						
						
							
							CSS: Use form-controls for buttons in the resource config form  
						
						... 
						
						
						
						refs #5543  
						
						
					 
					
						2015-09-30 12:20:34 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							037fee298b 
							
						 
					 
					
						
						
							
							User: Drop method loadNavigationConfig()  
						
						... 
						
						
						
						refs #10246  
						
						
					 
					
						2015-09-30 11:38:14 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							befbc6cd6a 
							
						 
					 
					
						
						
							
							Config: Add static method navigation()  
						
						... 
						
						
						
						refs #10246  
						
						
					 
					
						2015-09-30 11:30:38 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							64783fd10e 
							
						 
					 
					
						
						
							
							Allow to set the character set for database resources  
						
						
						
						
					 
					
						2015-09-29 19:37:36 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							7901601f81 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Fix method getItemConfig()  
						
						... 
						
						
						
						refs #10246  
						
						
					 
					
						2015-09-29 17:22:59 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							5d4f7cf2c0 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Do not show a type selection for a single choice  
						
						... 
						
						
						
						refs #10246  
						
						
					 
					
						2015-09-29 17:07:56 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							6fdfef4f4a 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Require argument $type in method getShareConfig()  
						
						... 
						
						
						
						refs #10246  
						
						
					 
					
						2015-09-29 17:07:04 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							f60a8ef60d 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Require argument $type in method getUserConfig()  
						
						... 
						
						
						
						refs #10246  
						
						
					 
					
						2015-09-29 17:06:22 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							1d382ed149 
							
						 
					 
					
						
						
							
							lib: Optimize imports in the DbResourceForm  
						
						
						
						
					 
					
						2015-09-28 16:30:48 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							2d38eb1650 
							
						 
					 
					
						
						
							
							Document that it's possible to use unix domain sockets for MySQL and PostgreSQL connections  
						
						... 
						
						
						
						fixes  #9787  
					
						2015-09-28 16:29:01 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							d3ac1b16ee 
							
						 
					 
					
						
						
							
							Merge branch 'master' into feature/dope-layout-5543  
						
						
						
						
					 
					
						2015-09-27 13:11:11 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							a55cced039 
							
						 
					 
					
						
						
							
							Merge branch 'master' into feature/custom-menu-items-5600  
						
						... 
						
						
						
						Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/downtimes.phtml 
						
						
					 
					
						2015-09-25 14:12:43 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							086579b254 
							
						 
					 
					
						
						
							
							NavigationController: Rerender the layout when removing menu entries  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-25 10:51:44 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							2952eaefcd 
							
						 
					 
					
						
						
							
							NavigationController: Rerender the layout when unsharing menu entries  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-25 10:51:16 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							e8f93e8ea1 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Translate non-translated error messages  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-24 15:50:40 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							3f22469c18 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Fix name validation when adding or editing items  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-24 15:50:19 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							cd1510d846 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Set a "name" as default key column for nav configs  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-24 15:49:04 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							338c0680e0 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Consider a user's config and the share config as one  
						
						... 
						
						
						
						Actually, we need a more sophisticated solution for this, but I guess this is a
proper quickfix to avoid any conflicts when switching between shared and
non-shared.
refs #5600  
						
						
					 
					
						2015-09-24 12:58:11 +02:00 
						 
				 
			
				
					
						
							
							
								Bernd Erk 
							
						 
					 
					
						
						
						
						
							
						
						
							2242f6192c 
							
						 
					 
					
						
						
							
							Redesign draft and implementation  
						
						
						
						
					 
					
						2015-09-22 17:33:02 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							fcdf41a9b8 
							
						 
					 
					
						
						
							
							DashletForm: Provide a helpful hint how to input external urls  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-22 16:24:09 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							f47c0475c9 
							
						 
					 
					
						
						
							
							NavigationItemForm: Provide a helpful hint how to input external urls  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-22 16:18:55 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							8239ec8fb5 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Show only an owner's parents to admins  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-21 15:29:14 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							3f70351239 
							
						 
					 
					
						
						
							
							MenuItemForm: Only allow to select _blank and _main as url target  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-21 15:26:56 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							76cf01869e 
							
						 
					 
					
						
						
							
							NavigationItem: Add property $target  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-21 10:18:46 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							af3f80f873 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Fix documentation of method delete()  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-21 09:00:22 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							5f998eb56d 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Really remove the "old" section when renaming  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-18 16:25:06 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							75d003a775 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Automatically share a parent's entire children,  #2  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-18 16:17:54 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							dd0e924e8d 
							
						 
					 
					
						
						
							
							Do not validate section names in forms  
						
						... 
						
						
						
						fixes  #10151  
					
						2015-09-18 16:11:51 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							9574f80160 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Automatically share a parent's entire children  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-18 16:08:58 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							c077dbd15a 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Update a parent's name on all childrens as well  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-18 16:00:33 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							ed875b5297 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Do not allow to delete parents  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-18 15:58:20 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							518cdad1a8 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Automatically unshare childrens in method unshare()  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-18 15:57:45 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							f4978fcb5a 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Automatically unshare a child if its parent isn't shared  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-18 15:56:00 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							f1c6b34d7a 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Automatically share childs if there parent is shared  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-18 15:53:39 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							19ebdcfb37 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Fix method getFlattenedChildren()  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-18 12:20:44 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							335ed8c74f 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Provide all available parents for non-shared items  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-18 11:01:02 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							9477c53b43 
							
						 
					 
					
						
						
							
							NavigationConfigForm: Do not allow to choose a parent once a item is shared  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-18 10:52:03 +02:00