aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'github-nickvergessen/ticket/11917' into ↵Nils Adermann2014-04-242-1/+2
|\ | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/11917: [ticket/11917] Move OAuth Module to the bottom while installing [ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend Conflicts: phpBB/install/install_install.php
| * [ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backendJoas Schilling2014-04-122-1/+2
| | | | | | | | PHPBB3-11917
* | Merge pull request #2036 from prototech/ticket/12201Joas Schilling2014-04-221-6/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12201] Clean up ACP attachment management page * prototech/ticket/12201: [ticket/12201] Decreased pagination font size. [ticket/12201] Update select element to follow same design as prosilver. [ticket/12201] Increase sort font size just slightly. [ticket/12201] Add link to resync file stats after error. [ticket/12201] Fix typos in language pack. [ticket/12201] Display error and sorting options when there are no attachments [ticket/12201] Only the top pagination should be floated to the right. [ticket/12201] Rearrange pagination, sorting, and submit elements. [ticket/12201] Center the file size and mark columns. [ticket/12201] Separate pagination from table.
| * | [ticket/12201] Add link to resync file stats after error.Cesar G2014-04-151-6/+9
| | | | | | | | | | | | PHPBB3-12201
* | | Merge pull request #2248 from Elsensee/ticket/12193Joas Schilling2014-04-221-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12193] Fix broken HTML if SQL error occurs during migration * Elsensee/ticket/12193: [ticket/12193] Fix broken HTML if SQL error occurs during migration
| * | | [ticket/12193] Fix broken HTML if SQL error occurs during migrationOliver Schramm2014-04-191-0/+10
| | | | | | | | | | | | | | | | PHPBB3-12193
* | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-04-151-0/+18
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10423] Replace foreach with function in viewtopic.php [ticket/10423] Remove unnecessary include in test [ticket/10423] Match multiple wildcards [ticket/10423] Move code into a function and add tests for it [ticket/10423] Remove * from search or highlight string
| * | | Merge pull request #2195 from Elsensee/ticket/10423Joas Schilling2014-04-151-0/+18
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10423] Remove * from search or highlight string * Elsensee/ticket/10423: [ticket/10423] Replace foreach with function in viewtopic.php [ticket/10423] Remove unnecessary include in test [ticket/10423] Match multiple wildcards [ticket/10423] Move code into a function and add tests for it [ticket/10423] Remove * from search or highlight string
| | * | | [ticket/10423] Match multiple wildcardsOliver Schramm2014-04-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple wildcards are removed from the string if there is no word before or after them. If there is a word before or after them, they are just replaced with a single one. PHPBB3-10423
| | * | | [ticket/10423] Move code into a function and add tests for itOliver Schramm2014-04-131-0/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-10423
| * | | | Merge remote-tracking branch 'Marc/ticket/10851' into develop-olympusJoas Schilling2014-04-051-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/10851: [ticket/10851] Set disallowed content to empty array if checking is disabled
* | | | | | [ticket/12344] Add core.pm_submit_before to function submit_pmlucifer4o2014-04-151-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12344
* | | | | | Merge remote-tracking branch 'marc/ticket/12372' into develop-ascraeusJoas Schilling2014-04-141-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc/ticket/12372: [ticket/12372] Use $() instead of jQuery() in core.js for toggleDisplay [ticket/12372] Use admin.js $(document).ready for hiding questionnaire details [ticket/12372] Rename JS function dE() to phpbb.toggleDisplay() [ticket/12372] Move dE() function core.js [ticket/12372] Unify definition of function dE() across all files [ticket/12372] Use jQuery in javascript dE() function
| * | | | | [ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()Marc Alexander2014-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12372
* | | | | | [ticket/12211] Do not run attachment file names twice through htmlspecialcharsMarc Alexander2014-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upload filenames are already processed via htmlspecialchars in the type_cast_helper of the new request class. There is no need to run it through htmlspecialchars() again in the filespec class. PHPBB3-12211
* | | | | | Merge remote-tracking branch 'rxu/ticket/12336' into develop-ascraeusJoas Schilling2014-04-111-1/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rxu/ticket/12336: [ticket/12336] Add functions_module.php core event
| * | | | | | [ticket/12336] Add functions_module.php core eventrxu2014-04-071-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add functions_module.php core event to allow adjusting parameters for custom ACP, MCP, UCP modules (location: function list_modules()). PHPBB3-12336
* | | | | | | [ticket/12386] Rename DEBUG_EXTRA to DEBUG_CONTAINER for more descriptive nameMarc Alexander2014-04-112-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12386
* | | | | | | [ticket/12386] Add DEBUG_EXTRA again and use it for container creationMarc Alexander2014-04-112-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are currently creating a new compiled container on every page load when having DEBUG enabled. However, one might only have that enabled to be presented with errors or for getting the page load stats. This change will add the DEBUG_EXTRA constant again. It will be used for choosing whether the compiled container should be created on every page load - when defined as true - or just once after the cache is cleared. PHPBB3-12386
* | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/12380' into develop-ascraeusJoas Schilling2014-04-111-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12380: [ticket/12380] Explicity state the order of sorting for login keys [ticket/12380] Sort Remember Me keys by last login time in UCP
| * | | | | | | [ticket/12380] Explicity state the order of sorting for login keysMatt Friedman2014-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12380
| * | | | | | | [ticket/12380] Sort Remember Me keys by last login time in UCPMatt Friedman2014-04-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12380
* | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12370' into ↵Nils Adermann2014-04-101-4/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12370: [ticket/12370] Add unit tests for topic notifications [ticket/12370] Fix functional notification test and remove unneeded requests [ticket/12370] Do not delete topic notifications when the topic is visible
| * | | | | | | | [ticket/12370] Do not delete topic notifications when the topic is visibleJoas Schilling2014-04-071-4/+8
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should only delete the topic notifications, when the topic is not approved anymore. This happens, when the post was the last approved but is now unapproved because the user is on queue, or when it has been softdeleted while editing. PHPBB3-12370
* | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12113' into ↵Nils Adermann2014-04-101-10/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12113: [ticket/12113] Fix view_log() tests [ticket/12113] Correctly use plurals when deleting user warnings [ticket/12113] Allow log entries to use plurals
| * | | | | | | | [ticket/12113] Correctly use plurals when deleting user warningsJoas Schilling2014-04-011-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12113
* | | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12373' into ↵Nils Adermann2014-04-101-4/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12373: [ticket/12373] Add to and from forum_id to LOG_MOVE log entries
| * | | | | | | | | [ticket/12373] Add to and from forum_id to LOG_MOVE log entriesJoas Schilling2014-04-081-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12373
* | | | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12282' into ↵Nils Adermann2014-04-105-12/+12
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12282: [ticket/12282] Update new references [ticket/12282] Update container db mock [ticket/12282] Add new line at EOF of the interface [ticket/12282] Use interface for type hinting [ticket/12282] Use {@inheritDoc} for inherited methods [ticket/12282] Add Interface for DBAL drivers
| * | | | | | | | | | [ticket/12282] Use interface for type hintingJoas Schilling2014-04-015-12/+12
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12282
* | | | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/11352' into ↵Nils Adermann2014-04-101-0/+16
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/11352: [ticket/11352] Add functional tests for disapproving a post/topic [ticket/11352] Redirect the user back to view*.php after disapproving
| * | | | | | | | | [ticket/11352] Redirect the user back to view*.php after disapprovingJoas Schilling2014-04-071-0/+16
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user should be redirected back to: - the topic, if he came from viewtopic and the topic still exists - the forum, if he came from viewtopic, but the topic does not exist anymore PHPBB3-11352
* | | | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/11098' into develop-ascraeusJoas Schilling2014-04-101-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/11098: [ticket/11098] Fix error reporting on the autologin key pages [ticket/11098] Update subsilver2 to also include mark/unmark all buttons [ticket/11098] HTML Validity fix to Notifications in UCP [ticket/11098] Add mark/unmark all options to remember me keys
| * | | | | | | | | [ticket/11098] Fix error reporting on the autologin key pagesMatt Friedman2014-04-091-2/+2
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11098
* | | | | | | | | [ticket/12356] Assign vars preventing Plupload from loading in PM editor.Cesar G2014-04-091-1/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12356
* | | | | | | | [ticket/12358] Correctly check and change the redirect url for ajax requestsJoas Schilling2014-04-071-3/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-12358
* | | | | | | Merge remote-tracking branch 'Marc/ticket/12150' into develop-ascraeusJoas Schilling2014-04-062-0/+14
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/12150: [ticket/12150] Use correct license URL in prune shadow migrations file [ticket/12150] Remove 'after' for columns from migrations file [ticket/12150] Update schema files for prune shadow topics [ticket/12150] Use log service instead of add_log() function [ticket/12150] Use shorter column names for prune settings [ticket/12150] Add functional tests for pruning shadow topics [ticket/12150] Add missing space to query for shadow topics [ticket/12150] Add missing prune settings variables in acp_forums [ticket/12150] Add file and caller for pruning shadow topics [ticket/12150] Add prune columns to schema files and migration file [ticket/12150] Add options to acp
| * | | | | | [ticket/12150] Use shorter column names for prune settingsMarc Alexander2014-03-291-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All columns were renamed from having prune_shadow_topics as namebase to just prune_shadow. A missing column was also added to the migration file's remove_schema() method. PHPBB3-12150
| * | | | | | [ticket/12150] Add missing space to query for shadow topicsMarc Alexander2014-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12150
| * | | | | | [ticket/12150] Add missing prune settings variables in acp_forumsMarc Alexander2014-03-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12150
| * | | | | | [ticket/12150] Add file and caller for pruning shadow topicsMarc Alexander2014-03-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12150
| * | | | | | [ticket/12150] Add options to acpMarc Alexander2014-03-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12150
* | | | | | | Merge remote-tracking branch 'Marc/ticket/10851-ascraeus' into develop-ascraeusJoas Schilling2014-04-051-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/10851-ascraeus: [ticket/10851] Request index instead of logging in and out in tests [ticket/10851] Add unit and functional tests for checking attachments [ticket/10851] Set disallowed content to empty array if checking is disabled
| * \ \ \ \ \ \ Merge branch 'ticket/10851' into ticket/10851-ascraeusMarc Alexander2014-04-041-0/+4
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | [ticket/10851] Set disallowed content to empty array if checking is disabledMarc Alexander2014-04-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The disallowed content defaults to a standard set of mimetype triggers by default. If one doesn't want to check the attachments mimetype triggers then we need to set the disallowed content to an empty array. PHPBB3-10851
* | | | | | | | Merge remote-tracking branch 'Elsensee/ticket/7707' into develop-ascraeusJoas Schilling2014-04-055-22/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/7707: [ticket/7707] Fix undefined variable: perm_from [ticket/7707] Add comma to last entry of arrays [ticket/7707] Remove unnecessary variables [ticket/7707] Add get_username_string() once more [ticket/7707] Remove unnecessary variables [ticket/7707] Add get_username_string() where possible
| * | | | | | | | [ticket/7707] Fix undefined variable: perm_fromOliver Schramm2014-04-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-7707
| * | | | | | | | [ticket/7707] Add comma to last entry of arraysOliver Schramm2014-04-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-7707
| * | | | | | | | [ticket/7707] Remove unnecessary variablesOliver Schramm2014-03-262-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-7707
| * | | | | | | | [ticket/7707] Add get_username_string() where possibleOliver Schramm2014-03-165-21/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-7707
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 09:46:53 +0000