Eric Lippmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							90971f2caf
							
						
					 | 
					
						
						
							
							Revert "Merge branch 'feature/organize-headings-7976'"
						
						
						
						
						
						
						
						This reverts commit ea2a17a76c4c4b1a3df13c44016a009694026e00, reversing
changes made to e72de8dfe1456cbb50852d8b7910e0013cab3aaa.
refs #7976
fixes #8647 
						
						
					 | 
					
						2015-03-12 16:08:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Meyer
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ba281e7e8
							
						
					 | 
					
						
						
							
							Config: Use native form title and description support where appropriate
						
						
						
						
						
						
						
						refs #7947
refs #7976 
						
						
					 | 
					
						2015-03-02 18:40:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Meyer
							
						 
					 | 
					
						
						
						
						
							
						
						
							956efe5ef9
							
						
					 | 
					
						
						
							
							Merge branch 'master' into feature/link-labels-8458
						
						
						
						
						
						
						
						Conflicts:
	application/views/scripts/config/application.phtml
	application/views/scripts/config/module.phtml
	application/views/scripts/config/modules.phtml
	library/Icinga/Web/Widget/Dashboard/Dashlet.php
	modules/monitoring/application/controllers/TimelineController.php 
						
						
					 | 
					
						2015-02-24 08:42:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johannes Meyer
							
						 
					 | 
					
						
						
						
						
							
						
						
							64a4dc67bc
							
						
					 | 
					
						
						
							
							Add proper titles to all config tabs
						
						
						
						
						
						
						
						refs #8458 
						
						
					 | 
					
						2015-02-23 16:50:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marius Hein
							
						 
					 | 
					
						
						
						
						
							
						
						
							7644888f25
							
						
					 | 
					
						
						
							
							Header: Add header semantic to roles configuration
						
						
						
						
						
						
						
						refs #7976 
						
						
					 | 
					
						2015-02-13 16:19:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eric Lippmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							6bae2e0a53
							
						
					 | 
					
						
						
							
							Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL
						
						
						
						
						
						
					 | 
					
						2015-02-04 10:52:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eric Lippmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b4fab0750
							
						
					 | 
					
						
						
							
							Add license header
						
						
						
						
						
						
						
						This time without syntax errors hopefully :) 
						
						
					 | 
					
						2015-02-03 16:27:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eric Lippmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							5fa2e3cfdc
							
						
					 | 
					
						
						
							
							Revert "Add license header"
						
						
						
						
						
						
						
						This reverts commit 338d067aba41dd6e9178cebec5433eecd614196e. 
						
						
					 | 
					
						2015-02-03 16:16:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eric Lippmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							338d067aba
							
						
					 | 
					
						
						
							
							Add license header
						
						
						
						
						
						
						
						fixes #7788 
						
						
					 | 
					
						2015-02-03 15:51:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eric Lippmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							7a81133ad3
							
						
					 | 
					
						
						
							
							security: Guard configuring roles
						
						
						
						
						
						
					 | 
					
						2015-02-02 14:16:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eric Lippmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							bc339e927b
							
						
					 | 
					
						
						
							
							Roles: Fix redirect URL
						
						
						
						
						
						
					 | 
					
						2014-11-25 16:11:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eric Lippmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							d226126b6c
							
						
					 | 
					
						
						
							
							Roles: Fix tab activation
						
						
						
						
						
						
					 | 
					
						2014-11-25 16:11:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eric Lippmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							0a1668acf6
							
						
					 | 
					
						
						
							
							Fix tab names in the RolesController
						
						
						
						
						
						
					 | 
					
						2014-11-25 16:11:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eric Lippmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f02ac2f01
							
						
					 | 
					
						
						
							
							Fix the RolesController's class name
						
						
						
						
						
						
					 | 
					
						2014-11-25 16:11:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eric Lippmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							974357c84f
							
						
					 | 
					
						
						
							
							Rename /permissions to /roles
						
						
						
						
						
						
					 | 
					
						2014-11-25 16:11:01 +01:00 | 
					
					
						
						
							
							
							
						
					 |