aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-111-3/+27
|\ | | | | | | | | * develop-ascraeus: [ticket/13005] Add event to display_forums() to modify category template data
| * Merge pull request #2901 from rxu/ticket/13005Tristan Darricau2014-09-111-3/+27
| |\ | | | | | | | | | | | | | | | | | | [ticket/13005] Add event to display_forums() to modify category template data * rxu/ticket/13005: [ticket/13005] Add event to display_forums() to modify category template data
| | * [ticket/13005] Add event to display_forums() to modify category template datarxu2014-08-221-3/+27
| | | | | | | | | | | | | | | | | | | | | While there're events to modify/add FORUM_POST/FORUM_LINK template data, such an event is missing for FORUM_CAT forum type. PHPBB3-13005
* | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-111-1/+5
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/13006] Add variables to the 'core.modify_quickmod_actions' event
| * | Merge pull request #2903 from rxu/ticket/13006Tristan Darricau2014-09-111-1/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13006] Add variables to the 'core.modify_quickmod_actions' event * rxu/ticket/13006: [ticket/13006] Add variables to the 'core.modify_quickmod_actions' event
| | * | [ticket/13006] Add variables to the 'core.modify_quickmod_actions' eventrxu2014-08-221-1/+5
| | |/ | | | | | | | | | | | | | | | | | | | | | Add $quickmod and $action variables for the 'core.modify_quickmod_actions' event trigerring to avoid of using global operator in corresponding extensions. PHPBB3-13006
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-101-2/+0
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/13042] Remove unused variables
| * | Merge pull request #2940 from Senky/ticket/13042Andreas Fischer2014-09-101-2/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13042] Unused var in login_box() * Senky/ticket/13042: [ticket/13042] Remove unused variables
| | * | [ticket/13042] Remove unused variablesJakub Senko2014-09-101-2/+0
| | | | | | | | | | | | | | | | PHPBB3-13042
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-103-1/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12976] Correctly use plurals for attachment count in UCP navigation Conflicts: phpBB/styles/subsilver2/template/ucp_attachments.html
| * | | Merge pull request #2936 from nickvergessen/ticket/12976Tristan Darricau2014-09-104-2/+7
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | [ticket/12976] Correctly use plurals for attachment count in UCP navigation * nickvergessen/ticket/12976: [ticket/12976] Correctly use plurals for attachment count in UCP navigation
| | * | [ticket/12976] Correctly use plurals for attachment count in UCP navigationJoas Schilling2014-09-094-2/+7
| | | | | | | | | | | | | | | | PHPBB3-12976
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-101-4/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/13052] Restore timespan parameter for check_form_key()
| * | | [ticket/13052] Restore timespan parameter for check_form_key()Joas Schilling2014-09-101-4/+9
| | | | | | | | | | | | | | | | PHPBB3-13052
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-091-9/+20
|\ \ \ \ | |/ / /
| * | | Merge pull request #2934 from VSEphpbb/ticket/13051Marc Alexander2014-09-091-9/+20
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13051] Fix viewonline event (recently broken) and add a new core event
| | * | | [ticket/13051] Fix core event nameMatt Friedman2014-09-091-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13051
| | * | | [ticket/13051] Rename new event core.viewonline_modify_user_rowMatt Friedman2014-09-091-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13051
| | * | | [ticket/13051] Add a new core event to handle the template arrayMatt Friedman2014-09-091-2/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-13051
| | * | | [ticket/13051] Fix viewonline event, remove template dataMatt Friedman2014-09-081-21/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-13051
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-092-22/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13052] Use request class instead of $_POST and request_var() [ticket/13052] Fix appearances with multiple parameters [ticket/13052] Remove additional parameter from check_form_key()
| * | | | Merge pull request #2935 from nickvergessen/ticket/13052Andreas Fischer2014-09-092-22/+18
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/13052 Remove additional parameter from check_form_key() * nickvergessen/ticket/13052: [ticket/13052] Use request class instead of $_POST and request_var() [ticket/13052] Fix appearances with multiple parameters [ticket/13052] Remove additional parameter from check_form_key()
| | * | | | [ticket/13052] Use request class instead of $_POST and request_var()Joas Schilling2014-09-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13052
| | * | | | [ticket/13052] Fix appearances with multiple parametersJoas Schilling2014-09-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13052
| | * | | | [ticket/13052] Remove additional parameter from check_form_key()Joas Schilling2014-09-091-17/+9
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-13052
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-082-1/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13038] Add link to number of posts of user in viewtopic
| * | | | Merge pull request #2926 from Senky/ticket/13038Andreas Fischer2014-09-082-1/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13038] Link user post tally to their posts * Senky/ticket/13038: [ticket/13038] Add link to number of posts of user in viewtopic
| | * | | | [ticket/13038] Add link to number of posts of user in viewtopicJakub Senko2014-09-082-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13038
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-082-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13050] Allow topic/forum subscription when email/jabber is off
| * | | | | Merge pull request #2931 from rxu/ticket/13050Andreas Fischer2014-09-082-2/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13050] Allow topic/forum subscription when email/jabber is off * rxu/ticket/13050: [ticket/13050] Allow topic/forum subscription when email/jabber is off
| | * | | | [ticket/13050] Allow topic/forum subscription when email/jabber is offrxu2014-09-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, there's impossible to subscribe topic/forum if emails and/or jabber is disabled. This seems to be a 3.0 leftover since 3.1 introduces new notification system which handles this case and offers email/jabber-free board notifications. PHPBB3-13050
* | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-081-17/+21
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #2915 from rxu/ticket/13026Marc Alexander2014-09-081-17/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13026] Add template vars array to core.viewonline_overwrite_location
| | * | | | | [ticket/13026] Add template vars array to core.viewonline_overwrite_locationrxu2014-09-071-17/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add template vars array to core.viewonline_overwrite_location event to allow modifying/adding template vars for every user row. PHPBB3-13026
* | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-081-2/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #2911 from rxu/ticket/13020Marc Alexander2014-09-081-2/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13020] Add variables to core.viewforum_get_topic_data event
| | * | | | | | [ticket/13020] Add forum_data variable to core.viewforum_get_topic_data eventrxu2014-09-071-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13020
* | | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-082-4/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13035] Remove empty meta tags Conflicts: phpBB/styles/subsilver2/template/overall_header.html phpBB/styles/subsilver2/template/simple_header.html
| * | | | | | | Merge pull request #2933 from bantu/ticket/13035Andreas Fischer2014-09-084-8/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13035] Remove empty meta tags * bantu/ticket/13035: [ticket/13035] Remove empty meta tags
| | * | | | | | [ticket/13035] Remove empty meta tagsdcz2014-09-084-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13035
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-071-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13048] Only update session_page if request is not ajax
| * | | | | | | Merge pull request #2930 from Senky/ticket/13048Joas Schilling2014-09-071-2/+2
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13048] AJAX requests are being stored to session_page * Senky/ticket/13048: [ticket/13048] Only update session_page if request is not ajax
| | * | | | | | [ticket/13048] Only update session_page if request is not ajaxJakub Senko2014-09-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13048
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-071-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13047] Add $post_list array to core.viewtopic_modify_page_title event
| * | | | | | | Merge pull request #2929 from rxu/ticket/13047Joas Schilling2014-09-071-1/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13047] Add $post_list array to core.viewtopic_modify_page_title event * rxu/ticket/13047: [ticket/13047] Add $post_list array to core.viewtopic_modify_page_title event
| | * | | | | | | [ticket/13047] Add $post_list array to core.viewtopic_modify_page_title eventrxu2014-09-071-1/+3
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13047
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-071-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php
| * | | | | | | Merge pull request #2928 from Nicofuma/ticket/13046Joas Schilling2014-09-071-0/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php * Nicofuma/ticket/13046: [ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php
| | * | | | | | | [ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.phpTristan Darricau2014-09-071-0/+2
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13046
* | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-072-6/+22
|\ \ \ \ \ \ \ \ | |/ / / / / / /