aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developMarc Alexander2014-06-101-5/+5
|\ | | | | | | | | * develop-ascraeus: [ticket/12688] Correctly use web root path instead of phpbb root path
| * [ticket/12688] Correctly use web root path instead of phpbb root pathJoas Schilling2014-06-101-5/+5
| | | | | | | | PHPBB3-12688
* | Merge branch 'develop-ascraeus' into developNils Adermann2014-06-101-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12508] Ignore extensions in migration_tips dev tool [ticket/12508] Fix doc block [ticket/12508] Add new line to separate the if and foreach better [ticket/12508] Add a unit test for set_extensions() [ticket/12508] Only take a list of names for set_extensions() [ticket/12508] Fix class doc block [ticket/12508] Move \phpbb\extension\finder to \phpbb\finder [ticket/12508] Fix usages of the finder [ticket/12508] Remove extension manager from finder
| * [ticket/12508] Fix usages of the finderJoas Schilling2014-06-101-2/+2
| | | | | | | | PHPBB3-12508
* | Merge pull request #2557 from Elsensee/ticket/12516Joas Schilling2014-06-102-96/+85
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12516] Always preview signature in UCP/ACP module * Elsensee/ticket/12516: [ticket/12516] Always preview signature in UCP/ACP module
| * | [ticket/12516] Always preview signature in UCP/ACP moduleOliver Schramm2014-06-072-96/+85
| | | | | | | | | | | | PHPBB3-12516
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-101-1/+106
|\ \ \ | | |/ | |/| | | | | | | * develop-ascraeus: [ticket/12606] Add ACP group core events
| * | Merge pull request #2518 from Pico88/ticket/12606Joas Schilling2014-06-101-1/+106
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12606] Add ACP group core events * Pico88/ticket/12606: [ticket/12606] Add ACP group core events
| | * | [ticket/12606] Add ACP group core eventsPico882014-06-091-1/+106
| | | | | | | | | | | | | | | | PHPBB3-12606
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-092-7/+35
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/8610] Use css selector instead of xPath [ticket/8610] Add functional test when two topics are merged [ticket/8610] Throw an error when the dest topic isn't set [ticket/8610] Fix bookmarks when merging all the posts of a topic [ticket/8610] Merging topics does not handle bookmarks correctly
| * | | Merge pull request #2434 from Nicofuma/ticket/8610Joas Schilling2014-06-092-7/+35
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/8610] Merging topics does not handle bookmarks correctly * Nicofuma/ticket/8610: [ticket/8610] Use css selector instead of xPath [ticket/8610] Add functional test when two topics are merged [ticket/8610] Throw an error when the dest topic isn't set [ticket/8610] Fix bookmarks when merging all the posts of a topic [ticket/8610] Merging topics does not handle bookmarks correctly
| | * | | [ticket/8610] Throw an error when the dest topic isn't setTristan Darricau2014-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-8610
| | * | | [ticket/8610] Fix bookmarks when merging all the posts of a topicTristan Darricau2014-05-271-4/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-8610
| | * | | [ticket/8610] Merging topics does not handle bookmarks correctlyTristan Darricau2014-05-101-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-8610 PHPBB3-8610
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-06-0911-20/+243
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: (36 commits) [ticket/10073] Fix button descriptions [ticket/10073] Do not check disable boxes by default [ticket/10073] Store values with config_text in the ACP [ticket/10073] Move config values to config_text [ticket/10073] Fix request usage [ticket/10073] Deduplicate template variable names [ticket/10073] Get service from container [ticket/10073] Fix more "Contact Us" strings [ticket/10073] Move template code into the template [ticket/10073] Make contact page available when board is disabled [ticket/10073] Change name of the ACP module [ticket/10073] Deduplicate posting buttons code in ACP [ticket/10073] Use phpbb_validate_email to verify email address [ticket/10073] Add tests for new validate_email() [ticket/10073] Split email validation from email ban and taken checks [ticket/10073] Deduplicate the if statement [ticket/10073] Fallback to board_contact when contact page is disabled [ticket/10073] Remove language string from rebase conflict [ticket/10073] Add ACP module to add bbcode text for contact admin info [ticket/10073] Add new configs to the schema ...
| * | | | Merge remote-tracking branch 'github-nickvergessen/ticket/10073' into ↵Nils Adermann2014-06-0911-20/+243
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/10073: (36 commits) [ticket/10073] Fix button descriptions [ticket/10073] Do not check disable boxes by default [ticket/10073] Store values with config_text in the ACP [ticket/10073] Move config values to config_text [ticket/10073] Fix request usage [ticket/10073] Deduplicate template variable names [ticket/10073] Get service from container [ticket/10073] Fix more "Contact Us" strings [ticket/10073] Move template code into the template [ticket/10073] Make contact page available when board is disabled [ticket/10073] Change name of the ACP module [ticket/10073] Deduplicate posting buttons code in ACP [ticket/10073] Use phpbb_validate_email to verify email address [ticket/10073] Add tests for new validate_email() [ticket/10073] Split email validation from email ban and taken checks [ticket/10073] Deduplicate the if statement [ticket/10073] Fallback to board_contact when contact page is disabled [ticket/10073] Remove language string from rebase conflict [ticket/10073] Add ACP module to add bbcode text for contact admin info [ticket/10073] Add new configs to the schema ...
| | * | | | [ticket/10073] Do not check disable boxes by defaultJoas Schilling2014-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| | * | | | [ticket/10073] Store values with config_text in the ACPJoas Schilling2014-05-291-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| | * | | | [ticket/10073] Fix request usageJoas Schilling2014-05-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| | * | | | [ticket/10073] Deduplicate template variable namesJoas Schilling2014-05-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| | * | | | [ticket/10073] Get service from containerJoas Schilling2014-05-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| | * | | | [ticket/10073] Move template code into the templateJoas Schilling2014-05-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| | * | | | [ticket/10073] Split email validation from email ban and taken checksJoas Schilling2014-05-294-13/+38
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| | * | | | [ticket/10073] Deduplicate the if statementJoas Schilling2014-05-294-36/+43
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| | * | | | [ticket/10073] Fallback to board_contact when contact page is disabledJoas Schilling2014-05-294-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| | * | | | [ticket/10073] Add ACP module to add bbcode text for contact admin infoJoas Schilling2014-05-293-0/+145
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| | * | | | [ticket/10073] Remove unneccessary todos he config switch is enoughJoas Schilling2014-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| | * | | | [ticket/10073] Use namespaces and fix all class namesJoas Schilling2014-05-295-684/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| | * | | | [ticket/10073] Replace board_contact mail with links to contact pageNils Adermann2014-05-296-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error pages still contain the email address. PHPBB3-10073
| | * | | | [ticket/10073] Add a contact administrators page and refactor email forms.Nils Adermann2014-05-296-0/+687
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | The message to be displayed on top of the email form cannot be configured yet. PHPBB3-10073
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-091-10/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12668] Add subforums_row to core.display_forums_modify_template_vars
| * | | | [ticket/12668] Add subforums_row to core.display_forums_modify_template_varsrxu2014-06-091-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add subforums template data array to 'core.display_forums_modify_template_vars' event to allow extensions to modify it if needed. PHPBB3-12668
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-091-0/+22
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12669] Add core event to the function display_forums()
| * | | | Merge pull request #2554 from rxu/ticket/12669Joas Schilling2014-06-091-0/+22
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12669] Add core event to the function display_forums() * rxu/ticket/12669: [ticket/12669] Add core event to the function display_forums()
| | * | | | [ticket/12669] Add core event to the function display_forums()rxu2014-06-081-0/+22
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core event to the function display_forums() in includes/functions_display.php to allow assigning additional template data for every forum, f.e. additional forumrow subloops. PHPBB3-12669
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-091-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12677] Replace ‘thread’ with ‘topic’ in functions_display comment
| * | | | [ticket/12677] Replace ‘thread’ with ‘topic’ in functions_display ↵Knecht Ruprecht2014-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | comment PHPBB3-12677
* | | | | Merge branch 'develop-ascraeus' into developDhruv2014-06-091-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and others * develop-ascraeus: [ticket/12660] Improve check for when phpinfo() is disabled.
| * | | | Merge branch 'develop-olympus' into develop-ascraeusDhruv2014-06-091-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Dhruv Goel (1) * develop-olympus: [ticket/12660] Improve check for when phpinfo() is disabled.
| | * | | | [ticket/12660] Improve check for when phpinfo() is disabled.Andreas Fischer2014-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12660
| | * | | | Merge remote-tracking branch 'github-marc1706/ticket/8960-olympus' into ↵Nils Adermann2014-05-021-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-marc1706/ticket/8960-olympus: [ticket/8960] Allow changing avatar path if it's not writable
| | | * | | | [ticket/8960] Allow changing avatar path if it's not writableMarc Alexander2014-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will allow users to change the avatar path even if it's not writable. However, this will get rid of the error message that the path is not writable. Due to this, a minor addition to the explain message in the ACP settings has been made. PHPBB3-8960
* | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-06-092-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12675] Fix code sniffer complaints introduced by recent commits
| * | | | | | [ticket/12675] Fix code sniffer complaints introduced by recent commitsMarc Alexander2014-06-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12675
* | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-06-081-2/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12673] IMAGETYPE_SWC might be missing when SWC is not supported.
| * | | | | | [ticket/12673] IMAGETYPE_SWC might be missing when SWC is not supported.Andreas Fischer2014-06-081-2/+8
| | |_|/ / / | |/| | | | | | | | | | | | | | | | PHPBB3-12673
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-06-042-12/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12639] Add a space in the code generated by generate_sql_keyword() [ticket/12639] Handle $conditions['keywords'] outside of the loop [ticket/12639] Don't make a copy of $marked when deleting logs in acp_logs [ticket/12639] Send a correct IN entry when deleting marked logs [ticket/12639] Use assertSame [ticket/12639] Remove old commented tests [ticket/12639] Order the results correctly in the test [ticket/12639] Fix tests on postgres [ticket/12639] Update tests to use a dataProvider [ticket/12639] Add a test case with an empty keywords list [ticket/12639] Delete entry in admin-log leads to mysql-error
| * | | | | Merge pull request #2526 from Nicofuma/ticket/12639Andreas Fischer2014-06-042-12/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12639] Delete entry in admin-log leads to mysql-error * Nicofuma/ticket/12639: [ticket/12639] Add a space in the code generated by generate_sql_keyword() [ticket/12639] Handle $conditions['keywords'] outside of the loop [ticket/12639] Don't make a copy of $marked when deleting logs in acp_logs [ticket/12639] Send a correct IN entry when deleting marked logs [ticket/12639] Use assertSame [ticket/12639] Remove old commented tests [ticket/12639] Order the results correctly in the test [ticket/12639] Fix tests on postgres [ticket/12639] Update tests to use a dataProvider [ticket/12639] Add a test case with an empty keywords list [ticket/12639] Delete entry in admin-log leads to mysql-error
| | * | | | | [ticket/12639] Don't make a copy of $marked when deleting logs in acp_logsTristan Darricau2014-06-021-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12639
| | * | | | | [ticket/12639] Send a correct IN entry when deleting marked logsTristan Darricau2014-06-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12639
generated by cgit v1.2.1 (git 2.21.0) at 2025-12-16 00:11:14 +0000