Marc Alexander 
							
						 
					 
					
						
						
							
						
						ef77852aff 
					 
					
						
						
							
							Merge branch '3.1.x' into 3.2.x  
						
						
						
						
					 
					
						2016-11-12 17:10:14 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Senko 
							
						 
					 
					
						
						
							
						
						552691efbf 
					 
					
						
						
							
							[ticket/14847] Add core.acp_attachments_config_edit_add  
						
						... 
						
						
						
						PHPBB3-14847 
						
						
					 
					
						2016-11-02 09:46:36 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						2653b98e09 
					 
					
						
						
							
							Merge branch 'ticket/14577' into ticket/14577-3.2.x  
						
						... 
						
						
						
						Conflicts:
	phpBB/includes/acp/acp_modules.php 
						
						
					 
					
						2016-04-02 09:51:37 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						5b61ac06cb 
					 
					
						
						
							
							[ticket/14577] Do not calculate size of array in for loop  
						
						... 
						
						
						
						For loops that modify the size of the looped arrays were obviously not
changed.
PHPBB3-14577 
						
						
					 
					
						2016-04-02 09:46:54 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						1600d82b77 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x  
						
						... 
						
						
						
						Conflicts:
	phpBB/adm/style/acp_icons.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_acp.php
	phpBB/includes/ucp/ucp_groups.php
	phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
	phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
	phpBB/styles/subsilver2/template/mcp_topic.html
	phpBB/styles/subsilver2/template/posting_attach_body.html
	phpBB/styles/subsilver2/template/posting_body.html
	phpBB/styles/subsilver2/template/posting_poll_body.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html 
						
						
					 
					
						2016-03-27 09:59:25 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						b39b3da5af 
					 
					
						
						
							
							[ticket/14272] Allow input of floats for filesize  
						
						... 
						
						
						
						This might be needed while switching the default input from KiB to MiB or
similar changes to settings.
PHPBB3-14272 
						
						
					 
					
						2016-02-03 22:03:31 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						7a6a16e3a5 
					 
					
						
						
							
							[ticket/13454] Remove unused variables  
						
						... 
						
						
						
						This is part 5 and there is more to come.
PHPBB3-13454 
						
						
					 
					
						2016-01-06 13:52:11 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						266576c6a4 
					 
					
						
						
							
							[ticket/13454] Remove unused variables  
						
						... 
						
						
						
						Part 4
PHPBB3-13454 
						
						
					 
					
						2016-01-06 13:52:11 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						685449bfe3 
					 
					
						
						
							
							[ticket/14272] Fix invalid or missing min/max settings  
						
						... 
						
						
						
						PHPBB3-14272 
						
						
					 
					
						2015-11-06 10:31:56 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						aca6e64669 
					 
					
						
						
							
							[ticket/14272] Only use maxlength and size for allowed input elements  
						
						... 
						
						
						
						PHPBB3-14272 
						
						
					 
					
						2015-11-06 10:20:05 +01:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						e0fb680dbb 
					 
					
						
						
							
							Merge branch '3.1.x'  
						
						... 
						
						
						
						* 3.1.x:
  [ticket/10572] Unguarded includes in acp files 
						
						
					 
					
						2015-10-14 10:17:04 +02:00 
						 
				 
			
				
					
						
							
							
								Richard McGirr 
							
						 
					 
					
						
						
							
						
						d003b53922 
					 
					
						
						
							
							[ticket/10572] Unguarded includes in acp files  
						
						... 
						
						
						
						PHPBB3-10572 
						
						
					 
					
						2015-10-13 11:52:52 -04:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						49312f05f8 
					 
					
						
						
							
							[ticket/14168] Use attachment manager instead of separate classes  
						
						... 
						
						
						
						PHPBB3-14168 
						
						
					 
					
						2015-10-12 11:34:11 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						98ebbbdca2 
					 
					
						
						
							
							[ticket/14168] No longer use deprecated functions in core files  
						
						... 
						
						
						
						PHPBB3-14168 
						
						
					 
					
						2015-10-09 10:18:40 +02:00 
						 
				 
			
				
					
						
							
							
								n-aleha 
							
						 
					 
					
						
						
							
						
						c60b92bf61 
					 
					
						
						
							
							[ticket/12505] Remove outdated media handling from acp  
						
						... 
						
						
						
						Remove outdated media handling from acp
PHPBB3-12505 
						
						
					 
					
						2015-08-24 00:40:38 +03:00 
						 
				 
			
				
					
						
							
							
								MateBartus 
							
						 
					 
					
						
						
							
						
						4bdef6fd21 
					 
					
						
						
							
							[ticket/13697] Moving filesystem related functions to filesystem service  
						
						... 
						
						
						
						* Moving filesystem service to \phpbb\filesystem namespace
 * Wraping Symfony's Filesystem component
 * Moving filesystem related functions from includes/functions.php
   into \phpbb\filesystem\filesystem
   Functions moved (and deprecated):
     - phpbb_chmod
     - phpbb_is_writable
     - phpbb_is_absolute
     - phpbb_own_realpath
     - phpbb_realpath
 * Adding interface for filesystem service
PHPBB3-13697 
						
						
					 
					
						2015-04-16 13:24:10 +02:00 
						 
				 
			
				
					
						
							
							
								Nicofuma 
							
						 
					 
					
						
						
							
						
						a3f7e0f441 
					 
					
						
						
							
							Merge branch '3.1.x'  
						
						
						
						
					 
					
						2015-03-29 19:50:58 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						cd85f1b632 
					 
					
						
						
							
							Merge branch 'ticket/13568' into ticket/13568-asc  
						
						... 
						
						
						
						Conflicts:
	phpBB/adm/index.php
	phpBB/includes/acp/acp_attachments.php 
						
						
					 
					
						2015-02-06 10:19:39 +01:00 
						 
				 
			
				
					
						
							
							
								Gaëtan Muller 
							
						 
					 
					
						
						
							
						
						abcb2680ee 
					 
					
						
						
							
							[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()  
						
						... 
						
						
						
						PHPBB3-13455 
						
						
					 
					
						2015-02-03 20:50:40 +01:00 
						 
				 
			
				
					
						
							
							
								Gaëtan Muller 
							
						 
					 
					
						
						
							
						
						f6e06da4c6 
					 
					
						
						
							
							[ticket/13455] Update calls to request_var()  
						
						... 
						
						
						
						PHPBB3-13455 
						
						
					 
					
						2015-02-03 20:50:40 +01:00 
						 
				 
			
				
					
						
							
							
								Gaëtan Muller 
							
						 
					 
					
						
						
							
						
						a633f3484c 
					 
					
						
						
							
							[ticket/13496] Update calls to set_config_count()  
						
						... 
						
						
						
						PHPBB3-13496 
						
						
					 
					
						2015-02-02 21:52:59 +01:00 
						 
				 
			
				
					
						
							
							
								Gaëtan Muller 
							
						 
					 
					
						
						
							
						
						79d4ff5538 
					 
					
						
						
							
							[ticket/13494] Update calls to set_config()  
						
						... 
						
						
						
						PHPBB3-13494 
						
						
					 
					
						2015-02-02 19:28:23 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						a93df0e511 
					 
					
						
						
							
							[ticket/13568] Use more descriptive validation names and merge with path block  
						
						... 
						
						
						
						PHPBB3-13568 
						
						
					 
					
						2015-02-02 18:30:05 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						19421fcdef 
					 
					
						
						
							
							[ticket/13568] Validate imagick path as readable absolute path  
						
						... 
						
						
						
						PHPBB3-13568 
						
						
					 
					
						2015-02-02 15:59:52 +01:00 
						 
				 
			
				
					
						
							
							
								Gaëtan Muller 
							
						 
					 
					
						
						
							
						
						7fc586080b 
					 
					
						
						
							
							[ticket/13468] Update calls to add_log()  
						
						... 
						
						
						
						PHPBB3-13468 
						
						
					 
					
						2015-01-27 18:34:33 +01:00 
						 
				 
			
				
					
						
							
							
								Andreas Fischer 
							
						 
					 
					
						
						
							
						
						5069da8d52 
					 
					
						
						
							
							Merge branch 'develop-ascraeus' into develop  
						
						... 
						
						
						
						* develop-ascraeus:
  [ticket/13519] Correctly validate imagick path as path and not string 
						
						
					 
					
						2015-01-20 23:11:40 +01:00 
						 
				 
			
				
					
						
							
							
								Andreas Fischer 
							
						 
					 
					
						
						
							
						
						4d0b04a397 
					 
					
						
						
							
							Merge branch 'develop-olympus' into develop-ascraeus  
						
						... 
						
						
						
						* develop-olympus:
  [ticket/13519] Correctly validate imagick path as path and not string
Conflicts:
	phpBB/includes/acp/acp_attachments.php 
						
						
					 
					
						2015-01-20 23:11:29 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						6564446b0f 
					 
					
						
						
							
							[ticket/13519] Correctly validate imagick path as path and not string  
						
						... 
						
						
						
						PHPBB3-13519 
						
						
					 
					
						2015-01-19 20:47:47 +01:00 
						 
				 
			
				
					
						
							
							
								Gaëtan Muller 
							
						 
					 
					
						
						
							
						
						b5544b2f47 
					 
					
						
						
							
							[ticket/13450] Type-hint return value of $phpbb_container->get()  
						
						... 
						
						
						
						PHPBB3-13450 
						
						
					 
					
						2015-01-12 20:19:07 +01:00 
						 
				 
			
				
					
						
							
							
								n-aleha 
							
						 
					 
					
						
						
							
						
						6ac8d17af6 
					 
					
						
						
							
							[ticket/12557] Fix doc block errors found by Sami  
						
						... 
						
						
						
						More corrections.
PHPBB3-12557 
						
						
					 
					
						2014-08-03 07:13:20 +03:00 
						 
				 
			
				
					
						
							
							
								Andreas Fischer 
							
						 
					 
					
						
						
							
						
						ffa1f9baf5 
					 
					
						
						
							
							Merge branch 'develop-olympus' into develop-ascraeus  
						
						... 
						
						
						
						* develop-olympus:
  [ticket/12196] Revert Fix typo "referer" in acp/attachments 
						
						
					 
					
						2014-06-26 23:33:47 +02:00 
						 
				 
			
				
					
						
							
							
								Dhruv 
							
						 
					 
					
						
						
							
						
						a730c0291f 
					 
					
						
						
							
							[ticket/12196] Revert Fix typo "referer" in acp/attachments  
						
						... 
						
						
						
						This reverts commit 9bc1f7924dhttps://tracker.phpbb.com/browse/PHPBB3-12196 
PHPBB3-12196 
						
						
					 
					
						2014-06-27 00:07:15 +05:30 
						 
				 
			
				
					
						
							
							
								Dhruv 
							
						 
					 
					
						
						
							
						
						eb3e1b35d6 
					 
					
						
						
							
							Merge branch 'develop-olympus' into develop-ascraeus  
						
						... 
						
						
						
						# By Joas Schilling
# Via Dhruv (1) and Joas Schilling (1)
* develop-olympus:
  [ticket/12196] Fix typo "referer" in acp/attachments 
						
						
					 
					
						2014-06-26 23:30:06 +05:30 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						9bc1f7924d 
					 
					
						
						
							
							[ticket/12196] Fix typo "referer" in acp/attachments  
						
						... 
						
						
						
						PHPBB3-12196 
						
						
					 
					
						2014-06-25 23:17:02 +02:00 
						 
				 
			
				
					
						
							
							
								Yuriy Rusko 
							
						 
					 
					
						
						
							
						
						a759704b39 
					 
					
						
						
							
							[ticket/12594] Remove @package tags and update file headers  
						
						... 
						
						
						
						PHPBB3-12594 
						
						
					 
					
						2014-05-27 20:51:13 +02:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						71379c3a0f 
					 
					
						
						
							
							Merge remote-tracking branch 'VSEphpbb/ticket/12332' into develop-ascraeus  
						
						... 
						
						
						
						* VSEphpbb/ticket/12332:
  [ticket/12332] Add missing semicolon to inline styling
  [ticket/12332] Adjust size of mark column where too wide
  [ticket/12332] Adjust column widths for responsive changes
  [ticket/12332] Restore some changes back to original state
  [ticket/12332] Add break-word to fixed width table CSS
  [ticket/12332] Accomplish all word creaking in template and CSS
  [ticket/12332] Remove width sizing, as it is already set
  [ticket/12332] Fix displaying attachments with long file names 
						
						
					 
					
						2014-05-05 16:51:29 -07:00 
						 
				 
			
				
					
						
							
							
								Andreas Fischer 
							
						 
					 
					
						
						
							
						
						89391dec08 
					 
					
						
						
							
							[ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.  
						
						... 
						
						
						
						* There MUST NOT be trailing whitespace at the end of lines.
* There MUST NOT be whitespace before the first content of a file.
* There MUST NOT be whitespace after the last content of a file.
* Functions MUST NOT contain multiple empty lines in a row.
PHPBB3-12458 
						
						
					 
					
						2014-04-29 17:51:21 +02:00 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						92fa39b79d 
					 
					
						
						
							
							[ticket/12332] Restore some changes back to original state  
						
						... 
						
						
						
						PHPBB3-12332 
						
						
					 
					
						2014-04-26 09:18:14 -07:00 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						f5262eb928 
					 
					
						
						
							
							[ticket/12332] Accomplish all word creaking in template and CSS  
						
						... 
						
						
						
						PHPBB3-12332 
						
						
					 
					
						2014-04-26 09:15:22 -07:00 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						770ab13cb0 
					 
					
						
						
							
							[ticket/12332] Fix displaying attachments with long file names  
						
						... 
						
						
						
						PHPBB3-12332 
						
						
					 
					
						2014-04-25 11:26:49 -07:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						b73e22ae71 
					 
					
						
						
							
							[ticket/12201] Add link to resync file stats after error.  
						
						... 
						
						
						
						PHPBB3-12201 
						
						
					 
					
						2014-04-15 14:19:47 -07:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						11a9104b8a 
					 
					
						
						
							
							[ticket/12282] Use interface for type hinting  
						
						... 
						
						
						
						PHPBB3-12282 
						
						
					 
					
						2014-04-01 19:17:41 +02:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						c0c19fbb29 
					 
					
						
						
							
							Merge pull request  #2035  from prototech/ticket/12138  
						
						... 
						
						
						
						[ticket/12138] Include file time limit when generating attachment management pagination and stats. 
						
						
					 
					
						2014-02-20 21:13:06 -06:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						3bdc1e9e1c 
					 
					
						
						
							
							[ticket/12138] Replace old code and generate pagination using filetime limit.  
						
						... 
						
						
						
						PHPBB3-12138 
						
						
					 
					
						2014-02-16 10:21:10 -08:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						e4685ac80d 
					 
					
						
						
							
							[ticket/12138] Add methods for attachment manage functionality.  
						
						... 
						
						
						
						PHPBB3-12138 
						
						
					 
					
						2014-02-16 10:21:02 -08:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						1251b68668 
					 
					
						
						
							
							[ticket/12153] Remove redundant calls to pagination.on_page().  
						
						... 
						
						
						
						PHPBB3-12153 
						
						
					 
					
						2014-02-03 23:00:39 -08:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						8652589469 
					 
					
						
						
							
							[ticket/11849] Update some ACP modules with new pagination  
						
						... 
						
						
						
						PHPBB3-11849 
						
						
					 
					
						2013-12-18 18:36:47 +01:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						05dd4d55d2 
					 
					
						
						
							
							[ticket/11987] Replace {PHPBB_ROOT_PATH} with {ROOT_PATH}.  
						
						... 
						
						
						
						PHPBB3-11987 
						
						
					 
					
						2013-10-30 15:43:07 -07:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						b95fdacdd3 
					 
					
						
						
							
							[ticket/11700] Move all recent code to namespaces  
						
						... 
						
						
						
						PHPBB3-11700 
						
						
					 
					
						2013-09-16 00:25:27 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						da2752e400 
					 
					
						
						
							
							[ticket/11700] Modify all code to use the new interface names  
						
						... 
						
						
						
						PHPBB3-11700 
						
						
					 
					
						2013-07-14 13:30:52 -04:00