aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4074 from marc1706/ticket/14349Máté Bartus2015-12-091-2/+2
|\ | | | | [ticket/14349] Improve error messages and remove output of suppressed messages
| * [ticket/14349] Suppress output due to duplicate definition in installerMarc Alexander2015-12-081-2/+2
| | | | | | | | PHPBB3-14349
* | [ticket/14350] Remove duplicate semi-colon in functions_userMarc Alexander2015-12-081-1/+1
|/ | | | PHPBB3-14350
* Merge branch '3.1.x'Tristan Darricau2015-12-081-1/+21
|\ | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14213] Add pending to core.group_add_user_after [ticket/14213] Mv event group_add_user_after after cache cleaning [ticket/14213] Fix version number [ticket/14213] Adding missing reference to event dispatcher [ticket/14213] Adding event after users have been added to a group
| * Merge pull request #4071 from marc1706/ticket/14213Tristan Darricau2015-12-081-1/+21
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14213] Adding event after users have been added to a group * marc1706/ticket/14213: [ticket/14213] Add pending to core.group_add_user_after [ticket/14213] Mv event group_add_user_after after cache cleaning [ticket/14213] Fix version number [ticket/14213] Adding missing reference to event dispatcher [ticket/14213] Adding event after users have been added to a group
| | * [ticket/14213] Add pending to core.group_add_user_afterMarc Alexander2015-12-081-1/+8
| | | | | | | | | | | | PHPBB3-14213
| | * [ticket/14213] Mv event group_add_user_after after cache cleaningWardormeur2015-12-071-12/+13
| | | | | | | | | | | | | | | | | | In order to match with the rest of the event and to have appropriate info state PHPBB3-14213
| | * [ticket/14213] Fix version numberWardormeur2015-12-071-1/+1
| | | | | | | | | | | | | | | | | | for core.group_add_user_after event PHPBB3-14213
| | * [ticket/14213] Adding missing reference to event dispatcherWardormeur2015-12-071-2/+2
| | | | | | | | | | | | | | | | | | Required to dispatch event, wasn't included into global PHPBB3-14213
| | * [ticket/14213] Adding event after users have been added to a groupWardormeur2015-12-071-0/+12
| | | | | | | | | | | | | | | | | | Allow mapping with others CMS by exposing user configuration & changes PHPBB3-14213
* | | Merge branch '3.1.x'Tristan Darricau2015-12-072-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | * 3.1.x: [ticket/14261] Fix tests by removing old code. [ticket/14261] Move the update of session informations to page_footer()
| * | Merge pull request #4008 from Zoddo/ticket/14261Tristan Darricau2015-12-072-0/+4
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | [ticket/14261] Move the update of session informations to page_footer() * Zoddo/ticket/14261: [ticket/14261] Fix tests by removing old code. [ticket/14261] Move the update of session informations to page_footer()
| | * [ticket/14261] Move the update of session informations to page_footer()Zoddo2015-10-272-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the unique way to disable the update of session_page is to pass "false" to the parameter of session_begin(). This method is directly called in app.php, so pages served from the routing system can't disable the update of session informations. By moving the update to page_footer, we can allow controllers to tell to the session manager that we don't want to update the session infos. PHPBB3-14261
* | | Merge branch '3.1.x'Tristan Darricau2015-12-071-0/+16
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/14343] Add event when locking/unlocking posts/topics
| * | [ticket/14343] Add event when locking/unlocking posts/topicskasimi2015-12-061-0/+16
| | | | | | | | | | | | PHPBB3-14343
* | | [ticket/14325] Fix variable names in docblocksMate Bartus2015-11-302-3/+3
| | | | | | | | | | | | PHPBB3-14325
* | | [ticket/14325] Preserve event variable BCMate Bartus2015-11-308-434/+420
| | | | | | | | | | | | PHPBB3-14325
* | | [master] Update version to 3.2.0-a2-devTristan Darricau2015-11-231-1/+1
| | |
* | | Merge branch 'prep-release-3.2.0-a1'Tristan Darricau2015-11-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.2.0-a1: [prep-release-3.2.0-a1] Add changelog for 3.2.0-a1 [prep-release-3.2.0-a1] Add migration for 3.2.0-a1 [prep-release-3.2.0-a1] Update version to 3.2.0-a1
| * | | [prep-release-3.2.0-a1] Update version to 3.2.0-a1Tristan Darricau2015-11-091-1/+1
| | | |
* | | | Merge branch '3.1.x'Marc Alexander2015-11-121-10/+11
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #3910 from kinerity/ticket/14170Marc Alexander2015-11-121-10/+11
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14170] Fix mcp_change_poster_after event
| | * | | [ticket/14170] Revert mcp_change_poster_after @since changeKailey Truscott2015-10-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the @since change back to 3.1.6-RC1. Add @changed line 3.1.7-RC1 and description. PHPBB3-14170
| | * | | [ticket/14170] Fix mcp_change_poster_after eventKailey Truscott2015-09-161-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the mcp_change_poster_after event to before renewing $post_info. I changed the "since" version as this would be fixed in 3.1.7-RC1. PHPBB3-14170
* | | | | Merge branch '3.1.x'Marc Alexander2015-11-121-1/+1
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | [ticket/14276] Adjust function get_folder_statusRichard McGirr2015-11-071-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14276
* | | | Merge branch '3.1.x'Oliver Schramm2015-11-061-12/+53
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_captcha.php
| * | | Merge pull request #3975 from prototech/ticket/11971Oliver Schramm2015-11-061-12/+53
| |\ \ \ | | | | | | | | | | | | | | | [ticket/11971] Validate "Spambot countermeasures" settings before saving
| | * | | [ticket/11971] Validate "Spambot countermeasures" settings before saving.Cesar G2015-10-141-12/+53
| | | | | | | | | | | | | | | | | | | | PHPBB3-11971
* | | | | Merge pull request #3995 from CHItA/ticket/14044Tristan Darricau2015-11-033-541/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14044] Deduplicate the installers * CHItA/ticket/14044: [ticket/14044] Add config as global in notify user [ticket/14044] Fix language selection data loss [ticket/14044] Patch language::set_fallback_array() [ticket/14044] Fix tests [ticket/14044] Fix wrong descriptions in install [ticket/14044] Solve missing email template error [ticket/14044] global $table_prefix in constants.php [ticket/14044] Try to fix missing table prefix [ticket/14044] Use the correct language file version [ticket/14044] Automatically trigger rollback on insert in transaction [ticket/14044] Use empty instead of !count [ticket/14044] Fix Sqlite error in tests [ticket/14044] Deduplicate the installers
| * | | | | [ticket/14044] global $table_prefix in constants.phpMate Bartus2015-10-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14044
| * | | | | [ticket/14044] Deduplicate the installersMate Bartus2015-10-222-541/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14044
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-11-021-2/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * 3.1.x: [ticket/13831] Store provided reason when deleting from Mod. Queue module.
| * | | | | Merge pull request #3983 from prototech/ticket/13831Andreas Fischer2015-11-021-2/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13831] Store provided reason when deleting from Mod. Queue module. * prototech/ticket/13831: [ticket/13831] Store provided reason when deleting from Mod. Queue module.
| | * | | | [ticket/13831] Store provided reason when deleting from Mod. Queue module.Cesar G2015-10-141-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13831
* | | | | | Merge branch '3.1.x'Cesar G2015-10-221-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | * 3.1.x: [ticket/14249] Fix online list order
| * | | | [ticket/14249] Fix online list orderOliver Schramm2015-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14249
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-191-0/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/9252] Do not try to disapprove a post that was just approved
| * | | | Merge pull request #3666 from marc1706/ticket/9252Tristan Darricau2015-10-191-0/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/9252] Do not try to disapprove a post that was just approved * marc1706/ticket/9252: [ticket/9252] Do not try to disapprove a post that was just approved
| | * | | | [ticket/9252] Do not try to disapprove a post that was just approvedMarc Alexander2015-05-301-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this change, posts that are approved by someone right before another moderator is trying to disapprove a post are actually deleted instead of disapproved. PHPBB3-9252
* | | | | | Merge branch '3.1.x'Marc Alexander2015-10-171-31/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/13945] Send reactivation requests to admins using notifications system.Cesar G2015-10-151-31/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13945
* | | | | | Merge branch '3.1.x'Marc Alexander2015-10-151-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/12616] Remove report notifications when post is deleted/disapproved.Cesar G2015-10-141-0/+1
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-12616
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-141-11/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/14159] Hide version info on ACP if we don't have the permission
| * | | | Merge pull request #3900 from Zoddo/ticket/14159Tristan Darricau2015-10-141-10/+19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14159] Hide version info on ACP if we don't have the permission * Zoddo/ticket/14159: [ticket/14159] Hide version info on ACP if we don't have the permission
| | * | | | [ticket/14159] Hide version info on ACP if we don't have the permissionZoddo2015-09-121-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also hide a link to an unreachable module (Check phpBB version). We could have simply remove the link to the module, but if the user hasn't the permission to access to the phpBB version check module, I think that he shouldn't view any version information about phpBB. PHPBB3-14159
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-10-141-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
| * | | | | [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.Cesar G2015-10-141-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The u_sendpm check in ucp_pm.php is merely for the purpose of displaying the error message within the UCP template. Otherwise it could be removed as compose_pm() will check the appropriate permission pertaining to the attempted action. PHPBB3-9153
* | | | | [ticket/10572] Remove excessive new lineMarc Alexander2015-10-141-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-10572
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 07:57:30 +0000