Marc Alexander 
							
						 
					 
					
						
						
							
						
						47b32f1da9 
					 
					
						
						
							
							Merge branch '3.1.x'  
						
						... 
						
						
						
						Conflicts:
	phpBB/phpbb/avatar/driver/upload.php
	tests/avatar/manager_test.php 
						
						
					 
					
						2015-08-08 22:23:03 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						b7e4d0b0a5 
					 
					
						
						
							
							Merge pull request  #3738  from javiexin/ticket/13981  
						
						... 
						
						
						
						[ticket/13981] Add events to capture avatar deletion or overwriting 
						
						
					 
					
						2015-08-08 22:21:11 +02:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						05d583bba7 
					 
					
						
						
							
							[ticket/14079] Correctly mark notifications as read  
						
						... 
						
						
						
						PHPBB3-14079 
						
						
					 
					
						2015-08-08 19:18:18 +02:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						7e62b3a4b0 
					 
					
						
						
							
							[ticket/14076] Fix notification settings  
						
						... 
						
						
						
						PHPBB3-14076 
						
						
					 
					
						2015-08-07 16:38:53 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						b55361e89b 
					 
					
						
						
							
							Merge remote-tracking branch 'Nicofuma/ticket/12692'  
						
						
						
						
					 
					
						2015-08-07 10:07:45 +02:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						618065ec16 
					 
					
						
						
							
							[ticket/12692] Fix tests and update style  
						
						... 
						
						
						
						PHPBB3-12692 
						
						
					 
					
						2015-08-06 13:26:14 +02:00 
						 
				 
			
				
					
						
							
							
								Marco Kubuntu 
							
						 
					 
					
						
						
							
						
						32f5dc3d8b 
					 
					
						
						
							
							[ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration  
						
						... 
						
						
						
						Changed the sql_fetchfield() call to comply to the function definition.
PHPBB3-14069 
						
						
					 
					
						2015-08-05 19:07:02 +02:00 
						 
				 
			
				
					
						
							
							
								Oliver Schramm 
							
						 
					 
					
						
						
							
						
						4b3343e756 
					 
					
						
						
							
							[ticket/12143] Add group helper class to translate groupnames  
						
						... 
						
						
						
						We can translate groupnames now even though these groups aren't special
PHPBB3-12143 
						
						
					 
					
						2015-08-05 17:50:22 +02:00 
						 
				 
			
				
					
						
							
							
								Oliver Schramm 
							
						 
					 
					
						
						
							
						
						2b30e632b6 
					 
					
						
						
							
							[ticket/12143] Add is_set method to language service  
						
						... 
						
						
						
						We need that.
PHPBB3-12143 
						
						
					 
					
						2015-08-05 17:45:14 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Fischer 
							
						 
					 
					
						
						
							
						
						452c8bef28 
					 
					
						
						
							
							Merge branch '3.1.x'  
						
						... 
						
						
						
						* 3.1.x:
  [ticket/13711] Notifications are sent to inactive users 
						
						
					 
					
						2015-08-05 13:45:02 +02:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						cbe74844b0 
					 
					
						
						
							
							Merge pull request  #3698  from s9e/ticket/13935  
						
						... 
						
						
						
						[ticket/13935] Allow more admin-configurable schemes in post links
* s9e/ticket/13935:
  [ticket/13935] Removed cache invalidation from acp_board
  [ticket/13935] Removed UI
  [ticket/13935] Allow more admin-configurable schemes in post links 
						
						
					 
					
						2015-08-05 12:59:55 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						4ae83e4266 
					 
					
						
						
							
							[ticket/14056] Fix remaining schema path  
						
						... 
						
						
						
						PHPBB3-14056 
						
						
					 
					
						2015-07-29 22:08:37 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						6eb284b23a 
					 
					
						
						
							
							[ticket/14056] Keep install schema resources in the install folder  
						
						... 
						
						
						
						PHPBB3-14056 
						
						
					 
					
						2015-07-29 20:24:52 +02:00 
						 
				 
			
				
					
						
							
							
								RMcGirr83 
							
						 
					 
					
						
						
							
						
						771090f13e 
					 
					
						
						
							
							[ticket/13711] Notifications are sent to inactive users  
						
						... 
						
						
						
						PHPBB3-13711 
						
						
					 
					
						2015-07-27 06:27:25 -04:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						a0258ae25c 
					 
					
						
						
							
							Merge pull request  #3514  from CHItA/ticket/13740  
						
						... 
						
						
						
						[ticket/13740] Refactoring installer
* CHItA/ticket/13740: (75 commits)
  [ticket/13740] Reduce number of references in nav provider
  [ticket/13740] Move handle_language_select calls to the controllers
  [ticket/13740] Fix infinite config.php check loop
  [ticket/13740] Move default data settings out of constructors
  [ticket/13740] Deduplicate container builder's checks
  [ticket/13740] Use JSON for installer config
  [ticket/13740] Fix comment
  [ticket/13740] Use language service in console application
  [ticket/13740] Fix CS in compatibilty_globals.php
  [ticket/13740] Fix message element creation in JS
  [ticket/13740] Replace more spaces with tabs
  [ticket/13740] Fix CS
  [ticket/13740] Filter basic directory change attempts in lang change
  [ticket/13740] Use tabs instead of spaces in JS file
  [ticket/13740] Add success message when install finished
  [ticket/13740] Fix $script_path in obtain_data
  [ticket/13740] Fix is_phpbb_installed() method
  [ticket/13740] Login admin when install finished
  [ticket/13740] Enhance server output buffer bypass
  [ticket/13740] Secure installer config against corrupted config data
  ... 
						
						
					 
					
						2015-07-27 11:24:43 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						11dfe503aa 
					 
					
						
						
							
							[ticket/13740] Reduce number of references in nav provider  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-26 23:00:40 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						495c0c6fb3 
					 
					
						
						
							
							[ticket/13740] Move handle_language_select calls to the controllers  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-26 22:20:32 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						f7641cd506 
					 
					
						
						
							
							[ticket/13740] Fix infinite config.php check loop  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-25 15:41:10 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						0befa9f109 
					 
					
						
						
							
							[ticket/13740] Move default data settings out of constructors  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-25 14:44:39 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						e8e9193690 
					 
					
						
						
							
							[ticket/13740] Deduplicate container builder's checks  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-25 14:43:54 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						723337d2f6 
					 
					
						
						
							
							[ticket/13740] Use JSON for installer config  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-25 14:42:37 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						04186e8498 
					 
					
						
						
							
							[ticket/13740] Fix comment  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-25 14:42:17 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						be7e1ba7a0 
					 
					
						
						
							
							[ticket/13740] Use language service in console application  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-24 18:05:10 +02:00 
						 
				 
			
				
					
						
							
							
								javiexin 
							
						 
					 
					
						
						
							
						
						c3d77edd83 
					 
					
						
						
							
							[ticket/13981] Add events to capture avatar deletion or overwriting  
						
						... 
						
						
						
						An event to capture new avatar moving in place (and maybe overwriting
existing avatar), and another to capture deletion.  Includes better error
processing.  Rename event.
PHPBB3-13981 
						
						
					 
					
						2015-07-24 10:52:00 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						22786a5b6f 
					 
					
						
						
							
							[ticket/13740] Fix CS  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-24 02:37:00 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						cb593c0e04 
					 
					
						
						
							
							[ticket/13740] Filter basic directory change attempts in lang change  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-24 00:04:40 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						3840882b93 
					 
					
						
						
							
							[ticket/13740] Add success message when install finished  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-23 23:35:20 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						115029b601 
					 
					
						
						
							
							[ticket/13740] Fix $script_path in obtain_data  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-23 23:23:06 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						e08f134112 
					 
					
						
						
							
							[ticket/13740] Fix is_phpbb_installed() method  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-23 22:55:31 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						fbd5929606 
					 
					
						
						
							
							[ticket/13740] Login admin when install finished  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-23 20:50:33 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						dd31020fb3 
					 
					
						
						
							
							[ticket/13740] Enhance server output buffer bypass  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-23 16:43:20 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						98d9d92aa7 
					 
					
						
						
							
							[ticket/13740] Secure installer config against corrupted config data  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-23 04:27:31 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						3356130ce2 
					 
					
						
						
							
							[ticket/13740] Separate new installer style templates  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-22 12:43:17 +02:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						e1cbe73538 
					 
					
						
						
							
							Merge pull request  #3781  from Elsensee/ticket/8708-2  
						
						... 
						
						
						
						[ticket/8708] Add extra permission for posting global announcements
* Elsensee/ticket/8708-2:
  [ticket/8708] Apply permission 'f_announce_global'
  [ticket/8708] Add f_announce_global permission 
						
						
					 
					
						2015-07-22 11:30:50 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						0c49b88dde 
					 
					
						
						
							
							[ticket/13740] Fix CS  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-22 04:01:52 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						97d08d6f56 
					 
					
						
						
							
							[ticket/13740] Allow language change in the installer  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-22 03:16:16 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						136ec8d7e2 
					 
					
						
						
							
							[ticket/13740] Keep keys when sorting navigation  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-21 15:53:26 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						3d4f21c1f8 
					 
					
						
						
							
							[ticket/13740] Check navigation requirements  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-21 15:13:54 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						3a3dd94145 
					 
					
						
						
							
							[ticket/13740] Remove default config CLI command  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-21 15:06:15 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						b2b9fb1df2 
					 
					
						
						
							
							[ticket/13740] Fix CS and docblocks  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-21 14:42:15 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						0488c49116 
					 
					
						
						
							
							[ticket/13740] Exit from installation if phpBB is already installed  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-20 19:26:07 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						6216007caa 
					 
					
						
						
							
							[ticket/13740] Fix docblocks and comments  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-20 18:47:10 +02:00 
						 
				 
			
				
					
						
							
							
								Mate Bartus 
							
						 
					 
					
						
						
							
						
						88bf1d7f58 
					 
					
						
						
							
							[ticket/13740] Clean up install config file when installation has finished  
						
						... 
						
						
						
						PHPBB3-13740 
						
						
					 
					
						2015-07-20 18:22:53 +02:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						b39b5d9e56 
					 
					
						
						
							
							Merge pull request  #3745  from s9e/ticket/13986  
						
						... 
						
						
						
						[ticket/13986] Add --resume option to reparser CLI
* s9e/ticket/13986:
  [ticket/13986] Replaced hardcoded value
  [ticket/13986] Fixed resume data to carry through multiple runs
  [ticket/13986] Add --resume option to reparser CLI 
						
						
					 
					
						2015-07-19 22:42:03 +02:00 
						 
				 
			
				
					
						
							
							
								Oliver Schramm 
							
						 
					 
					
						
						
							
						
						df56b2ed36 
					 
					
						
						
							
							[ticket/8708] Add f_announce_global permission  
						
						... 
						
						
						
						PHPBB3-8708 
						
						
					 
					
						2015-07-19 21:26:47 +02:00 
						 
				 
			
				
					
						
							
							
								javiexin 
							
						 
					 
					
						
						
							
						
						11256cd167 
					 
					
						
						
							
							[ticket/13981] Add events to capture avatar deletion or overwriting  
						
						... 
						
						
						
						An event to capture overwriting, and another to capture deletion.
Includes better error processing. Replaced global by dependency injection.
Fix typo.
PHPBB3-13981 
						
						
					 
					
						2015-07-17 23:03:19 +02:00 
						 
				 
			
				
					
						
							
							
								javiexin 
							
						 
					 
					
						
						
							
						
						4d3188ba57 
					 
					
						
						
							
							[ticket/13981] Add events to capture avatar deletion or overwriting  
						
						... 
						
						
						
						An event to capture overwriting, and another to capture deletion.
Includes better error processing. Replaced global by dependency injection.
PHPBB3-13981 
						
						
					 
					
						2015-07-17 19:40:33 +02:00 
						 
				 
			
				
					
						
							
							
								JoshyPHP 
							
						 
					 
					
						
						
							
						
						c8e209a2de 
					 
					
						
						
							
							[ticket/13986] Replaced hardcoded value  
						
						... 
						
						
						
						PHPBB3-13986 
						
						
					 
					
						2015-07-17 16:52:52 +02:00 
						 
				 
			
				
					
						
							
							
								JoshyPHP 
							
						 
					 
					
						
						
							
						
						9274bc4e32 
					 
					
						
						
							
							[ticket/13986] Fixed resume data to carry through multiple runs  
						
						... 
						
						
						
						Options restored from a previous execution should carry to the
next resumed execution
PHPBB3-13986 
						
						
					 
					
						2015-07-17 14:02:19 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						12f85a6a89 
					 
					
						
						
							
							Merge branch '3.1.x'  
						
						
						
						
					 
					
						2015-07-17 13:35:34 +02:00