Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							a9f0aa6bcd 
							
						 
					 
					
						
						
							
							lib: Fix navigation usage in the limiter widget  
						
						... 
						
						
						
						refs #5543  
						
						
					 
					
						2015-09-27 13:22:43 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							d79a160547 
							
						 
					 
					
						
						
							
							Navigation: Disable ids on li for the moment  
						
						... 
						
						
						
						refs #5543  
						
						
					 
					
						2015-09-27 13:11:49 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							d3ac1b16ee 
							
						 
					 
					
						
						
							
							Merge branch 'master' into feature/dope-layout-5543  
						
						
						
						
					 
					
						2015-09-27 13:11:11 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							5008537683 
							
						 
					 
					
						
						
							
							lib: Fix PHPDoc of SimpleQuery::getOrder()  
						
						
						
						
					 
					
						2015-09-27 12:57:47 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							78989c0aad 
							
						 
					 
					
						
						
							
							lib: Add SimpleQuery::clearOrder()  
						
						
						
						
					 
					
						2015-09-27 12:56:48 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							ed9a6aa39d 
							
						 
					 
					
						
						
							
							lib: Fix Navigation::addItem()  
						
						... 
						
						
						
						refs #5543  
						
						
					 
					
						2015-09-27 12:26:58 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							e5f2174c1e 
							
						 
					 
					
						
						
							
							LdapUserGroupBackend: Restore method requireTable()  
						
						... 
						
						
						
						refs #9950  
						
						
					 
					
						2015-09-25 16:24:16 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							fe9ee48d65 
							
						 
					 
					
						
						
							
							LdapUserGroupBackend: Fix incorrect table name initialization  
						
						... 
						
						
						
						refs #9950  
						
						
					 
					
						2015-09-25 16:23:13 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							b19ecbfb43 
							
						 
					 
					
						
						
							
							LdapUserGroupBackend: Remove the remaining code duplicates  
						
						... 
						
						
						
						refs #9950 
refs #9772  
						
						
					 
					
						2015-09-25 16:21:33 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							ed935696ac 
							
						 
					 
					
						
						
							
							CSS: outsource .logo related rules into a new .less file `logo.less'  
						
						... 
						
						
						
						refs #10009  
						
						
					 
					
						2015-09-25 15:31:39 +02:00 
						 
				 
			
				
					
						
							
							
								Aaron Collins 
							
						 
					 
					
						
						
						
						
							
						
						
							23631c8f39 
							
						 
					 
					
						
						
							
							changed order of posix check  
						
						... 
						
						
						
						refs #9950 
Signed-off-by: Eric Lippmann <eric.lippmann@netways.de> 
						
						
					 
					
						2015-09-25 14:35:08 +02:00 
						 
				 
			
				
					
						
							
							
								Aaron Collins 
							
						 
					 
					
						
						
						
						
							
						
						
							73715c94b1 
							
						 
					 
					
						
						
							
							Fixes for ldap group auth  
						
						... 
						
						
						
						The current LdapUserGroupBackend was incomplete and suffered from a little over zealous copy pasta.  It had over written certain functions that where unnecessary such as the constructor and a table validator.  This patch aims to clean those up.  Additionally it also makes this group auth work with posixGroup that use the username as the member identifier and not just inetGroups that use the full dn
refs #9950 
Signed-off-by: Eric Lippmann <eric.lippmann@netways.de> 
						
						
					 
					
						2015-09-25 14:34:33 +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 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							7ff74ae36a 
							
						 
					 
					
						
						
							
							lib: Use navigation classes in the limiter control  
						
						... 
						
						
						
						refs #5543  
						
						
					 
					
						2015-09-25 13:36:28 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							823a2cc8ea 
							
						 
					 
					
						
						
							
							CSS: Add nav.less and limiter.less to our stylesheet  
						
						... 
						
						
						
						refs #5543  
						
						
					 
					
						2015-09-25 13:36:04 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							1122ffafad 
							
						 
					 
					
						
						
							
							lib: Add navigation classes (WIP)  
						
						... 
						
						
						
						- Lacks custom renderer functionality
- Lacks navigation item priorities
- Lacks permission handling
refs #5600  
						
						
					 
					
						2015-09-25 13:16:44 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							a9ec0eebef 
							
						 
					 
					
						
						
							
							Merge branch 'bugfix/don-t-use-parse_ini_file-in-Config-10150'  
						
						... 
						
						
						
						fixes  #10150  
					
						2015-09-25 12:19:38 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							812545c04b 
							
						 
					 
					
						
						
							
							IniStore::load(): use IniParser::parseIniFile() instead of parse_ini_file()  
						
						... 
						
						
						
						refs #10150  
						
						
					 
					
						2015-09-25 12:15:47 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							8dc9928cb3 
							
						 
					 
					
						
						
							
							IniParser::parseIniFile(): return a Config instance  
						
						... 
						
						
						
						refs #10150  
						
						
					 
					
						2015-09-25 12:04:13 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							a090907373 
							
						 
					 
					
						
						
							
							Conform to coding guidelines  
						
						
						
						
					 
					
						2015-09-25 11:37:06 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							59b9155ca7 
							
						 
					 
					
						
						
							
							CSS: Include dev.less in our style sheet  
						
						... 
						
						
						
						refs #5543  
						
						
					 
					
						2015-09-25 00:35:12 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							165dc00fad 
							
						 
					 
					
						
						
							
							Url: Do not throw ProgrammingError if there is no relative url available  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-24 14:03:15 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							e2d6089ff3 
							
						 
					 
					
						
						
							
							Make Version::get() failsafe  
						
						... 
						
						
						
						refs #9247  
						
						
					 
					
						2015-09-24 12:25:02 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							feb27b8a02 
							
						 
					 
					
						
						
							
							Rename application/VERSION to application/GITCOMMIT  
						
						... 
						
						
						
						refs #9247  
						
						
					 
					
						2015-09-24 11:35:18 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							3e99adbe63 
							
						 
					 
					
						
						
							
							Version::get(): first try to parse application/VERSION  
						
						... 
						
						
						
						refs #9247  
						
						
					 
					
						2015-09-24 11:05:21 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							cc4a47506f 
							
						 
					 
					
						
						
							
							Fetch version from constant  
						
						... 
						
						
						
						refs #9247  
						
						
					 
					
						2015-09-24 10:53:33 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							27f3dd94d2 
							
						 
					 
					
						
						
							
							CSS: Add text-small to time-since, -until and -ago  
						
						... 
						
						
						
						refs #5543  
						
						
					 
					
						2015-09-24 10:28:56 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							7c3b46fefa 
							
						 
					 
					
						
						
							
							Make regex less complicated  
						
						
						
						
					 
					
						2015-09-23 17:48:30 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							d6cf6313b9 
							
						 
					 
					
						
						
							
							Split complex if statements  
						
						
						
						
					 
					
						2015-09-23 15:53:10 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							abcdc5adb1 
							
						 
					 
					
						
						
							
							Fetch Git commit ID from .git/HEAD if available  
						
						... 
						
						
						
						refs #9247  
						
						
					 
					
						2015-09-23 15:06:02 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							5b1e4f0a1c 
							
						 
					 
					
						
						
							
							CSS: Add new main.less to our stylesheet  
						
						... 
						
						
						
						refs #5543  
						
						
					 
					
						2015-09-23 13:41:39 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							2e9ea40eb1 
							
						 
					 
					
						
						
							
							CSS: Disable main-content.less for now  
						
						... 
						
						
						
						refs #5543  
						
						
					 
					
						2015-09-23 13:37:19 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							e982735451 
							
						 
					 
					
						
						
							
							CSS: Rename main.less to base.less  
						
						... 
						
						
						
						refs #5543  
						
						
					 
					
						2015-09-23 13:36:25 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							9042d55dd4 
							
						 
					 
					
						
						
							
							FilterExpression: Add support multi value columns in method matches()  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-23 13:02:13 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							e4e560ab1a 
							
						 
					 
					
						
						
							
							FilterMatchNot: Do not re-invent the parents implementation of matches()  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-23 13:01:08 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							939188be94 
							
						 
					 
					
						
						
							
							FilterMatch: Do not re-invent the parents implementation of matches()  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-23 13:00:46 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							d1b141d142 
							
						 
					 
					
						
						
							
							CSS: Include main.less in our stylesheet  
						
						... 
						
						
						
						refs #5543  
						
						
					 
					
						2015-09-23 11:01:55 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							12227d9d08 
							
						 
					 
					
						
						
							
							CSS: Disable defaults.less for now  
						
						... 
						
						
						
						refs #5543  
						
						
					 
					
						2015-09-23 10:57:39 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							8b9cdc5c1e 
							
						 
					 
					
						
						
							
							CSS: Include normalize.css in our style sheet  
						
						... 
						
						
						
						refs #5543  
						
						
					 
					
						2015-09-23 10:43:43 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							5193fce1dd 
							
						 
					 
					
						
						
							
							Url: Fix external url detection  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-22 16:18:27 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							81e13109fc 
							
						 
					 
					
						
						
							
							Revert "Url: Add support macros"  
						
						... 
						
						
						
						This reverts commit 33231d24dab942b31c924c4c8e352dd73f80939b.
There is no need for url macros, since we're handling absolute
urls correctly now. 
						
						
					 
					
						2015-09-22 15:51:00 +02:00 
						 
				 
			
				
					
						
							
							
								Matthias Jentsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b69311165c 
							
						 
					 
					
						
						
							
							Conform to coding guidelines  
						
						
						
						
					 
					
						2015-09-22 14:53:29 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							626c3494e4 
							
						 
					 
					
						
						
							
							Config::fromIni(): use IniParser::parseIniFile() instead of parse_ini_file()  
						
						... 
						
						
						
						refs #10150  
						
						
					 
					
						2015-09-22 14:50:49 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							acb93ce1ae 
							
						 
					 
					
						
						
							
							Implement Document::toArray()  
						
						... 
						
						
						
						refs #10150  
						
						
					 
					
						2015-09-22 14:50:49 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							777c4d0baf 
							
						 
					 
					
						
						
							
							Implement Section::toArray()  
						
						... 
						
						
						
						refs #10150  
						
						
					 
					
						2015-09-22 14:50:49 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							b441156934 
							
						 
					 
					
						
						
							
							Implement IniParser::parseIniFile()  
						
						... 
						
						
						
						refs #10150  
						
						
					 
					
						2015-09-22 14:50:49 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							33231d24da 
							
						 
					 
					
						
						
							
							Url: Add support macros  
						
						... 
						
						
						
						refs #5600  
						
						
					 
					
						2015-09-22 14:15:04 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							7321d67b4f 
							
						 
					 
					
						
						
							
							Url: Consider urls with a leading slash as absolute..  
						
						... 
						
						
						
						..and make it possible to have a url without a base.
refs #5600  
						
						
					 
					
						2015-09-22 14:14:41 +02:00 
						 
				 
			
				
					
						
							
							
								Matthias Jentsch 
							
						 
					 
					
						
						
						
						
							
						
						
							42fb1a174b 
							
						 
					 
					
						
						
							
							Do not crash when ldap_dn is defined in additional variables  
						
						... 
						
						
						
						refs #9950  
						
						
					 
					
						2015-09-22 14:08:15 +02:00 
						 
				 
			
				
					
						
							
							
								Matthias Jentsch 
							
						 
					 
					
						
						
						
						
							
						
						
							46f2f71c57 
							
						 
					 
					
						
						
							
							Improve logging of membership queries  
						
						... 
						
						
						
						refs #9950  
						
						
					 
					
						2015-09-22 13:02:08 +02:00