Marc Alexander 
							
						 
					 
					
						
						
							
						
						c6c294e8c7 
					 
					
						
						
							
							Merge branch '3.3.x'  
						
						
						
						
					 
					
						2022-05-01 20:20:46 +02:00 
						 
				 
			
				
					
						
							
							
								LukeWCS 
							
						 
					 
					
						
						
							
						
						9e22bc8691 
					 
					
						
						
							
							[ticket/16990] Removed XHTML tag format  
						
						... 
						
						
						
						PHPBB3-16990 
						
						
					 
					
						2022-04-27 23:18:52 +02:00 
						 
				 
			
				
					
						
							
							
								LukeWCS 
							
						 
					 
					
						
						
							
						
						751b0e2ede 
					 
					
						
						
							
							[ticket/16990] Fix for the style template code in the post editor  
						
						... 
						
						
						
						The code present in the prosilver style template causes the wrong
checkbox to be displayed in the post editor if the combination
`f_delete`:true and `f_softdelete`:false is active in the user
context. With this combination, this effectively prevents a forum
post from being deleted via the editor options.
Corrected the relevant section and switched to Twig syntax
PHPBB3-16990 
						
						
					 
					
						2022-04-26 22:13:50 +02:00 
						 
				 
			
				
					
						
							
							
								nomind60s 
							
						 
					 
					
						
						
							
						
						a5899494b9 
					 
					
						
						
							
							[ticket/19969] Hide flash status when post settings disallow [FLASH] BBCode  
						
						... 
						
						
						
						Add check for S_BBCODE_FLASH around FLASH_STATUS
PHPBB3-16969 
						
						
					 
					
						2022-03-06 17:08:31 -07:00 
						 
				 
			
				
					
						
							
							
								Jakub Senko 
							
						 
					 
					
						
						
							
						
						28f98402f3 
					 
					
						
						
							
							[ticket/16574] Remove flash BBcode  
						
						... 
						
						
						
						PHPBB3-16574 
						
						
					 
					
						2021-08-19 23:01:42 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						5ab5b949d2 
					 
					
						
						
							
							Merge branch '3.3.x'  
						
						
						
						
					 
					
						2020-03-16 17:24:33 +01:00 
						 
				 
			
				
					
						
							
							
								3D-I 
							
						 
					 
					
						
						
							
						
						f6b121758b 
					 
					
						
						
							
							[ticket/16400] Add posting_editor_* events  
						
						... 
						
						
						
						PHPBB3-16400 
						
						
					 
					
						2020-03-12 23:27:23 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						c14efc0ded 
					 
					
						
						
							
							Merge branch '3.3.x'  
						
						
						
						
					 
					
						2020-03-03 22:02:36 +01:00 
						 
				 
			
				
					
						
							
							
								mrgoldy 
							
						 
					 
					
						
						
							
						
						31cbb60a38 
					 
					
						
						
							
							[ticket/16358] Hide attachment tab with no filters and display ACP notice  
						
						... 
						
						
						
						PHPBB3-16358 
						
						
					 
					
						2020-02-05 13:03:01 +01:00 
						 
				 
			
				
					
						
							
							
								hanakin 
							
						 
					 
					
						
						
							
						
						c0b22b380f 
					 
					
						
						
							
							[ticket/14204] Add new classes  
						
						... 
						
						
						
						PHPBB3-14204 
						
						
					 
					
						2017-02-17 14:23:14 -05:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						316b69805b 
					 
					
						
						
							
							Merge branch '3.1.x' into 3.2.x  
						
						... 
						
						
						
						Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html 
						
						
					 
					
						2016-09-11 11:08:24 +02:00 
						 
				 
			
				
					
						
							
							
								David King 
							
						 
					 
					
						
						
							
						
						1455be2260 
					 
					
						
						
							
							[ticket/14695] Put posting_editor_subject_append/prepend events on newlines  
						
						... 
						
						
						
						As per request in the PR.
PHPBB3-14695 
						
						
					 
					
						2016-08-09 21:14:03 -04:00 
						 
				 
			
				
					
						
							
							
								David King 
							
						 
					 
					
						
						
							
						
						e4336de68d 
					 
					
						
						
							
							[ticket/14695] Add posting_editor_subject_prepend/append template events  
						
						... 
						
						
						
						PHPBB3-14695 
						
						
					 
					
						2016-06-25 21:16:54 +01: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 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						93a25893d5 
					 
					
						
						
							
							[ticket/14447] Remove trailing white spaces in Prosilver  
						
						... 
						
						
						
						PHPBB3-14447 
						
						
					 
					
						2016-02-02 08:42:53 -08: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 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						d1b7101fed 
					 
					
						
						
							
							Merge pull request  #3896  from Zoddo/ticket/14157  
						
						... 
						
						
						
						[ticket/14157] Allow to set the alt/title attribute on post icons 
						
						
					 
					
						2015-10-10 16:43:15 +02:00 
						 
				 
			
				
					
						
							
							
								Zoddo 
							
						 
					 
					
						
						
							
						
						3937f1f4ae 
					 
					
						
						
							
							[ticket/14157] Allow to set the alt/title attribute on post icons  
						
						... 
						
						
						
						PHPBB3-14157 
						
						
					 
					
						2015-10-10 15:29:31 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Miday 
							
						 
					 
					
						
						
							
						
						70f1b08c69 
					 
					
						
						
							
							[ticket/14139] Add class of IDs to html tags  
						
						
						
						
					 
					
						2015-09-14 16:25:36 +02:00 
						 
				 
			
				
					
						
							
							
								Zoddo 
							
						 
					 
					
						
						
							
						
						a606b1c480 
					 
					
						
						
							
							[ticket/7362] Add alt attribute on topic icons  
						
						... 
						
						
						
						PHPBB3-7362 
						
						
					 
					
						2015-08-30 14:37:28 +02:00 
						 
				 
			
				
					
						
							
							
								Zoddo 
							
						 
					 
					
						
						
							
						
						166e0b5961 
					 
					
						
						
							
							[ticket/13997] Add posting_editor_submit_buttons template event  
						
						... 
						
						
						
						PHPBB3-13997 
						
						
					 
					
						2015-08-09 11:36:49 +02:00 
						 
				 
			
				
					
						
							
							
								alf007 
							
						 
					 
					
						
						
							
						
						8b21e7c0d9 
					 
					
						
						
							
							[ticket/13843] Add templates events to insert custom panel in posting  
						
						... 
						
						
						
						Events added in events.md
Add in template posting_editor.html for link to custom panel
Add in template posting_layout.html for include of custom panel template body
PHPBB3-13843 
						
						
					 
					
						2015-07-22 09:43:59 +02:00 
						 
				 
			
				
					
						
							
							
								RMcGirr83 
							
						 
					 
					
						
						
							
						
						d4ca81f23f 
					 
					
						
						
							
							[ticket/13710] Allow template events near smilies display  
						
						... 
						
						
						
						PHPBB3-13710 
						
						
					 
					
						2015-03-19 07:25:45 -04:00 
						 
				 
			
				
					
						
							
							
								Jakub Senko 
							
						 
					 
					
						
						
							
						
						10e72a36a3 
					 
					
						
						
							
							[ticket/13346] Remove unnecessary divs  
						
						... 
						
						
						
						PHPBB3-13346 
						
						
					 
					
						2015-01-10 21:05:30 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Senko 
							
						 
					 
					
						
						
							
						
						d24fa2e777 
					 
					
						
						
							
							[ticket/13346] Fix indentation, spacing and missing divs  
						
						... 
						
						
						
						PHPBB3-13346 
						
						
					 
					
						2014-11-24 20:41:01 +01:00 
						 
				 
			
				
					
						
							
							
								hanakin 
							
						 
					 
					
						
						
							
						
						913b363126 
					 
					
						
						
							
							[ticket/12862] Resize popups consistently  
						
						... 
						
						
						
						PHPBB3-12862 
						
						
					 
					
						2014-07-30 17:48:23 +02:00 
						 
				 
			
				
					
						
							
							
								PayBas 
							
						 
					 
					
						
						
							
						
						8547fd4c2e 
					 
					
						
						
							
							[ticket/12648] Fix poll tab and revert unrelated color change  
						
						... 
						
						
						
						PHPBB3-12648 
						
						
					 
					
						2014-06-24 00:02:25 +02:00 
						 
				 
			
				
					
						
							
							
								PayBas 
							
						 
					 
					
						
						
							
						
						1189fc9e51 
					 
					
						
						
							
							[ticket/12648] Fix poll tab display error  
						
						... 
						
						
						
						PHPBB3-12648 
						
						
					 
					
						2014-06-24 00:02:25 +02:00 
						 
				 
			
				
					
						
							
							
								PayBas 
							
						 
					 
					
						
						
							
						
						1cf6a0e124 
					 
					
						
						
							
							[ticket/12648] Added ARIA functionality  
						
						... 
						
						
						
						PHPBB3-12648 
						
						
					 
					
						2014-06-24 00:02:24 +02:00 
						 
				 
			
				
					
						
							
							
								PayBas 
							
						 
					 
					
						
						
							
						
						eda3c36b1c 
					 
					
						
						
							
							[ticket/12648] Improve UCP/MCP/Posting tabs  
						
						... 
						
						
						
						PHPBB3-12648 
						
						
					 
					
						2014-06-24 00:02:22 +02:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						95b9c93892 
					 
					
						
						
							
							[ticket/12640] Preserve the active tab when previewing in posting page.  
						
						... 
						
						
						
						PHPBB3-12640 
						
						
					 
					
						2014-05-31 10:12:24 -07:00 
						 
				 
			
				
					
						
							
							
								Crizzo 
							
						 
					 
					
						
						
							
						
						47ad92ae31 
					 
					
						
						
							
							[ticket/8785] Fixed problem with add empty.png and travis will now pass  
						
						... 
						
						
						
						PHPBB3-8785 
						
						
					 
					
						2014-03-09 22:14:40 +01:00 
						 
				 
			
				
					
						
							
							
								Crizzo 
							
						 
					 
					
						
						
							
						
						b4a65da2ed 
					 
					
						
						
							
							[ticket/8785] pm_layout.html back to more standard code  
						
						... 
						
						
						
						PHPBB3-8785 
						
						
					 
					
						2014-03-09 19:37:45 +01:00 
						 
				 
			
				
					
						
							
							
								Crizzo 
							
						 
					 
					
						
						
							
						
						f2321af9ed 
					 
					
						
						
							
							[ticket/8785] Adds blank lines at file end  
						
						... 
						
						
						
						PHPBB3-8785 
						
						
					 
					
						2014-03-09 14:21:17 +01:00 
						 
				 
			
				
					
						
							
							
								Crizzo 
							
						 
					 
					
						
						
							
						
						9ef79776a9 
					 
					
						
						
							
							[ticket/8785] Adds a new optical improvement, new file and fixes html bugs  
						
						... 
						
						
						
						PHPBB3-8785 
						
						
					 
					
						2014-03-09 13:20:49 +01:00 
						 
				 
			
				
					
						
							
							
								Crizzo 
							
						 
					 
					
						
						
							
						
						60ca7f91e2 
					 
					
						
						
							
							[ticket/8785] Adds two <hr /> to seperate recipients and BCC  
						
						... 
						
						
						
						PHPBB3-8785 
						
						
					 
					
						2014-03-04 10:26:22 +01:00 
						 
				 
			
				
					
						
							
							
								Crizzo 
							
						 
					 
					
						
						
							
						
						d40fb32dcd 
					 
					
						
						
							
							[ticket/8785] Rebuilding posting_editor pm head + new language vars  
						
						... 
						
						
						
						PHPBB3-8785 
						
						
					 
					
						2014-03-03 21:11:06 +01:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						688ca7fade 
					 
					
						
						
							
							[ticket/11915] Add the new uploader.  
						
						... 
						
						
						
						PHPBB3-11915 
						
						
					 
					
						2014-01-17 19:20:36 -08:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						4361c1c9ac 
					 
					
						
						
							
							[ticket/11915] Move the uploaded attachment list under the attachments tab.  
						
						... 
						
						
						
						PHPBB3-11915 
						
						
					 
					
						2014-01-17 19:20:35 -08:00 
						 
				 
			
				
					
						
							
							
								David King 
							
						 
					 
					
						
						
							
						
						835900123e 
					 
					
						
						
							
							[ticket/11972] Add posting_editor_message_after template event  
						
						... 
						
						
						
						PHPBB3-11972 
						
						
					 
					
						2013-11-02 15:27:53 -07:00 
						 
				 
			
				
					
						
							
							
								David King 
							
						 
					 
					
						
						
							
						
						b8eeca7048 
					 
					
						
						
							
							[ticket/11972] Add posting_editor_message_before template event  
						
						... 
						
						
						
						PHPBB3-11972 
						
						
					 
					
						2013-11-02 15:27:53 -07:00 
						 
				 
			
				
					
						
							
							
								David King 
							
						 
					 
					
						
						
							
						
						3be5fe5354 
					 
					
						
						
							
							[ticket/11972] Add posting_editor_subject_before template event  
						
						... 
						
						
						
						PHPBB3-11972 
						
						
					 
					
						2013-11-02 15:27:53 -07:00 
						 
				 
			
				
					
						
							
							
								David King 
							
						 
					 
					
						
						
							
						
						069f806169 
					 
					
						
						
							
							[ticket/11972] Add posting_editor_subject_after template event  
						
						... 
						
						
						
						PHPBB3-11972 
						
						
					 
					
						2013-11-02 15:27:52 -07:00 
						 
				 
			
				
					
						
							
							
								Vjacheslav Trushkin 
							
						 
					 
					
						
						
							
						
						fbd57b9369 
					 
					
						
						
							
							[ticket/11552] Responsive PM editor  
						
						... 
						
						
						
						Responsive PM editor, fix quickmod tools
PHPBB3-11552 
						
						
					 
					
						2013-10-19 16:20:34 +03:00 
						 
				 
			
				
					
						
							
							
								Vjacheslav Trushkin 
							
						 
					 
					
						
						
							
						
						ea874c2ffb 
					 
					
						
						
							
							[ticket/11552] Responsive forms  
						
						... 
						
						
						
						PHPBB3-11552 
						
						
					 
					
						2013-10-18 23:47:03 +03:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						9d86385a36 
					 
					
						
						
							
							Merge pull request  #1436  from cyberalien/ticket/11563  
						
						... 
						
						
						
						Fix subPanels() in forum_fn.js 
						
						
					 
					
						2013-07-13 10:49:04 -07:00 
						 
				 
			
				
					
						
							
							
								Vjacheslav Trushkin 
							
						 
					 
					
						
						
							
						
						a9259b12aa 
					 
					
						
						
							
							[ticket/11563] Dynamically generate panels list  
						
						... 
						
						
						
						PHPBB3-11563 
						
						
					 
					
						2013-07-11 10:58:18 -04:00 
						 
				 
			
				
					
						
							
							
								Vjacheslav Trushkin 
							
						 
					 
					
						
						
							
						
						7a34c7eabe 
					 
					
						
						
							
							[ticket/11563] Fix subPanels()  
						
						... 
						
						
						
						Fix subPanels() code
Modernize subPanels() with jQuery
Use HTML5 data attributes instead of including JS
PHPBB3-11563 
						
						
					 
					
						2013-07-11 10:38:54 -04:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						bdb7ec0ceb 
					 
					
						
						
							
							Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission  
						
						... 
						
						
						
						* phpbb/develop: (704 commits)
  [ticket/11630] Improvements to the PHP lint pre-commit hook
  [feature/auth-refactor] Move auth providers to separate directory
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/11585] Make $auth_admin class property
  [feature/auth-refactor] A possible fix for the functional test failures
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  ...
Conflicts:
	phpBB/docs/sphinx.sample.conf
	phpBB/feed.php
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html 
						
						
					 
					
						2013-07-11 11:41:48 +02:00 
						 
				 
			
				
					
						
							
							
								Senky 
							
						 
					 
					
						
						
							
						
						beafabbcb3 
					 
					
						
						
							
							[ticket/11010] adding type="number" and type="date" to prosilver  
						
						... 
						
						
						
						PHPBB3-11010 
						
						
					 
					
						2013-05-20 18:39:59 +02:00