|  | Commit message (Collapse) | Author | Age | Files | Lines | 
|---|
| ... |  | 
| |\ \  
| |/  
| |   
| |   
| |   
| | | * develop-ascraeus:
  [ticket/12826] Add optional root namespace indicator for consistency.
  [ticket/12826] Add mandatory root namespace indicator to exception catching. | 
| | |\  
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | | [ticket/12826] Add root namespace indicator to exception catching.
* bantu/ticket/12826:
  [ticket/12826] Add optional root namespace indicator for consistency.
  [ticket/12826] Add mandatory root namespace indicator to exception catching. | 
| | | | 
| | | 
| | | 
| | | | PHPBB3-12826 | 
| |\ \ \  
| |/ /  
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | | | * develop-ascraeus:
  [ticket/12838] Simplify normal special rank array creation
  [ticket/12838] Update RC2 to RC3
  [ticket/12838] Update events.md to RC3
  [ticket/12838] Allow for extra columns in cache obtain_ranks()
  [ticket/12838] Add raw row-data to acp_ranks core event
  [ticket/12838] Simplify special rank template conditional
  [ticket/12838] Add core events to acp_ranks.php
  [ticket/12838] Update events.md
  [ticket/12838] Add _before versions
  [ticket/12838] Add template events to acp_ranks.html | 
| | |\ \  
| | |/  
| |/|   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | | | [ticket/12838] Add ACP events to acp_ranks
* PayBas/ticket/12838:
  [ticket/12838] Simplify normal special rank array creation
  [ticket/12838] Update RC2 to RC3
  [ticket/12838] Update events.md to RC3
  [ticket/12838] Allow for extra columns in cache obtain_ranks()
  [ticket/12838] Add raw row-data to acp_ranks core event
  [ticket/12838] Simplify special rank template conditional
  [ticket/12838] Add core events to acp_ranks.php
  [ticket/12838] Update events.md
  [ticket/12838] Add _before versions
  [ticket/12838] Add template events to acp_ranks.html | 
| | | | 
| | | 
| | | 
| | | | PHPBB3-12838 | 
| | | | 
| | | 
| | | 
| | | | PHPBB3-12838 | 
| |\ \ \  
| |/ /  
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | | | * develop-ascraeus:
  [ticket/12557] Fix load active module description
  [ticket/12557] Fix php file description
  [ticket/12557] Fix post data description for notifications
  [ticket/12557] Fix pass by reference doc blocks
  [ticket/12557] Fix doc block in extension base class
  [ticket/12557] Fix doc block in mimetype guesser
  [ticket/12557] Fix var $preserve_cr description
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Template fixes
  [ticket/12557] Search, cron and profilefields fixes
  [ticket/12557] Notification fixes
  [ticket/12557] Fix doc block errors found by Sami pt1
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Fix doc block errors found by Sami | 
| | |/  
| |   
| |   
| | | PHPBB3-12557 | 
| |\ \  
| |/  
|/|   
| |   
| |   
| |   
| |   
| |   
| |   
| |   
| |   
| | | [ticket/12387] Cleanup *_free_result call and remove @ on that call
* Nicofuma/ticket/12387:
  [ticket/12387] Fix a call to sql_freeresult in full_text_native
  [ticket/12387] Fix \phpbb\db\driver\mysqli::sql_freeresult
  [ticket/12387] Use the hash as query_id for caching
  [ticket/12387] Remove unnecessary checks
  [ticket/12387] mssql_query return true if a select query returns 0 row
  [ticket/12387] Cleanup *_free_result call and remove @ on that call | 
| | | 
| | 
| | 
| | | PHPBB3-12387 | 
| | | 
| | 
| | 
| | | PHPBB3-12446 | 
| |/  
|   
|   
| | PHPBB3-12747 | 
| | 
| 
| 
| | PHPBB3-12721 | 
| | 
| 
| 
| | PHPBB3-12715 | 
| | 
| 
| 
| | PHPBB3-12594 | 
| | 
| 
| 
| | PHPBB3-12282 | 
| | 
| 
| 
| | PHPBB3-11230 | 
| | 
| 
| 
| | PHPBB3-12230 | 
| | 
| 
| 
| 
| 
| | http://tracker.phpbb.com/browse/PHPBB3-11230
PHPBB3-11230 | 
| | 
| 
| 
| | PHPBB3-12180 | 
| | 
| 
| 
| | PHPBB3-11980 | 
| | 
| 
| 
| | PHPBB3-11700 | 
| | 
| 
| 
| | PHPBB3-11700 | 
| |\  
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | | * github-phpbb/develop: (586 commits)
  [ticket/11735] Display disabled checkbox in subsilver for read notifications
  [ticket/11735] Display disabled checkbox when notification is already read
  [ticket/11844] update acp/authentication language var
  [ticket/11795] Remove PM popup
  [ticket/11795] Remove outdated comment from forum_fn.js
  [ticket/11795] Move find user JS to forum_fn
  [ticket/11795] Replace TWIG with phpBB syntax in ACP
  [ticket/11795] Move MSN scripts to forum_fn.js
  [ticket/11795] Use phpBB template syntax instead of TWIG
  [ticket/11795] Move PM popup JS to forum_fn.js
  [ticket/11795] Get rid of pagination JS variables
  [ticket/11795] Get rid of onload_functions
  [ticket/11795] Use data-reset-on-edit attr to reset elements
  [ticket/11795] Redo form elements auto-focus
  [ticket/11811] Remove outline on :focus
  [ticket/11836] Fix subsilver fatal error
  [ticket/11837] Replace escaped single quote with utf-8 single quote
  [ticket/11836] Fix fatal error on unsupported provider for auth link
  [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED
  [ticket/11809] Ensure code.js is first script included after jQuery
  ...
Conflicts:
	phpBB/config/services.yml
	phpBB/develop/create_schema_files.php
	phpBB/develop/mysql_upgrader.php
	phpBB/download/file.php
	phpBB/includes/bbcode.php
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/phpbb/controller/helper.php
	phpBB/phpbb/controller/resolver.php
	phpBB/phpbb/request/request_interface.php
	phpBB/phpbb/session.php
	phpBB/phpbb/style/extension_path_provider.php
	phpBB/phpbb/style/path_provider.php
	phpBB/phpbb/style/path_provider_interface.php
	phpBB/phpbb/style/resource_locator.php
	phpBB/phpbb/style/style.php
	phpBB/phpbb/template/locator.php
	phpBB/phpbb/template/template.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/node/includecss.php
	phpBB/phpbb/template/twig/node/includejs.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/di/create_container_test.php
	tests/extension/style_path_provider_test.php
	tests/notification/notification_test.php
	tests/session/continue_test.php
	tests/session/creation_test.php
	tests/template/template_events_test.php
	tests/template/template_test_case.php
	tests/template/template_test_case_with_tree.php
	tests/test_framework/phpbb_functional_test_case.php | 
| | | 
| | 
| | 
| | | PHPBB3-11688 | 
| | | 
| | 
| | 
| | | PHPBB3-11688 | 
| | | 
| | 
| | 
| | 
| | 
| | 
| | | Remove tpl_ and ctpl_ from cache->purge() because those prefixes
are no longer used.
PHPBB3-11688 | 
| | | 
| | 
| | 
| | 
| | 
| | 
| | | Purge directories
Replace opendir() with DirectoryIterator
PHPBB3-11688 | 
| | | 
| | 
| | 
| | | PHPBB3-11700 | 
| | | 
| | 
| | 
| | | PHPBB3-11700 | 
| |/  
|   
|   
| | PHPBB3-11700 | 
|  | PHPBB3-11698 |