aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12680] Solves last bugs. viewprofile: contact --> contact nicknameCrizzo2014-06-231-1/+1
| | | | PHPBB3-12680
* [ticket/12680] Still some problems with displaying the nickname in ucpCrizzo2014-06-151-1/+1
| | | | PHPBB3-12680
* [ticket/12680] Little changes, but some issues are still thereCrizzo2014-06-141-0/+1
| | | | PHPBB3-12680
* 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
* | [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 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
* | | [ticket/12677] Replace ‘thread’ with ‘topic’ in functions_display ↵Knecht Ruprecht2014-06-091-1/+1
| | | | | | | | | | | | | | | | | | comment PHPBB3-12677
* | | 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
* | | | | [ticket/12675] Fix code sniffer complaints introduced by recent commitsMarc Alexander2014-06-092-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12675
* | | | | [ticket/12673] IMAGETYPE_SWC might be missing when SWC is not supported.Andreas Fischer2014-06-081-2/+8
| |_|/ / |/| | | | | | | | | | | PHPBB3-12673
* | | | 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
| * | | | [ticket/12639] Delete entry in admin-log leads to mysql-errorTristan Darricau2014-05-312-4/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12639
* | | | | [ticket/12566] Also changed for ucp_pm_viewmessage.phpPayBas2014-06-021-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-12566
* | | | Merge pull request #2433 from Nicofuma/ticket/10899Joas Schilling2014-05-302-21/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10899] Using Delete All in log viewer with keyword search * Nicofuma/ticket/10899: [ticket/10899] Update doc block [ticket/10899] Use isset($field_value['IN']) [ticket/10899] Add event core.delete_log [ticket/10899] Remove trailing ; [ticket/10899] Fix typo in the class name [ticket/10899] Add unit tests [ticket/10899] Get $phpbb_log from the container [ticket/10899] Remove extra ';' [ticket/10899] Typo [ticket/10899] Refactoring in \phpbb\log\log_interface [ticket/10899] Using Delete All in log viewer with keyword search
| * | | | [ticket/10899] Get $phpbb_log from the containerTristan Darricau2014-05-271-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10899
| * | | | [ticket/10899] Refactoring in \phpbb\log\log_interfaceTristan Darricau2014-05-102-30/+28
| | | | | | | | | | | | | | | | | | | | PHPBB3-10899
| * | | | [ticket/10899] Using Delete All in log viewer with keyword searchTristan Darricau2014-05-102-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-10899 PHPBB3-10899
* | | | | Merge pull request #2357 from Nicofuma/ticket/11942Joas Schilling2014-05-302-9/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11942] Delete post/topic reason should be added to logs * Nicofuma/ticket/11942: [ticket/11942] Don't change the reason to '' when hard deleting [ticket/11942] Don't show the checkbox if the post is already soft-deleted [ticket/11942] Remove useless IF in templates [ticket/11942] Apply the modifications to subsilver [ticket/11942] Always display delete reason [ticket/11942] Edits messages [ticket/11942] Change the formulation [ticket/11942] Adding the reason to hard deleted topic/post [ticket/11942] Delete post/topic reason should be added to logs
| * | | | | [ticket/11942] Don't change the reason to '' when hard deletingTristan Darricau2014-05-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11942
| * | | | | [ticket/11942] Always display delete reasonTristan Darricau2014-05-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11942
| * | | | | [ticket/11942] Edits messagesNicofuma2014-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11942
| * | | | | [ticket/11942] Adding the reason to hard deleted topic/postNicofuma2014-05-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11942
| * | | | | [ticket/11942] Delete post/topic reason should be added to logsNicofuma2014-05-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-11942 PHPBB3-11942
* | | | | | Merge pull request #2447 from n-aleha/ticket/11467Joas Schilling2014-05-302-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11467] Add language variables for extension exception messages * n-aleha/ticket/11467: [ticket/11467] Add user object to extension manager for tests [ticket/11467] Add language variables to tests [ticket/11467] Add language variables for extension exception messages
| * | | | | | [ticket/11467] Add language variables for extension exception messagesn-aleha2014-05-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove hard-coded messages and add language variables for extension exception messages. PHPBB3-11467
* | | | | | | Merge pull request #2512 from bantu/ticket/11266Joas Schilling2014-05-301-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11266] Better message for when composer dependencies are missing... * bantu/ticket/11266: [ticket/11266] Better message for when composer dependencies are missing.
| * | | | | | | [ticket/11266] Better message for when composer dependencies are missing.Andreas Fischer2014-05-291-1/+5
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | PHPBB3-11266
* | | | | | | [prep-release-3.1.0-b4] Update phpBB Version for b5 developmentJoas Schilling2014-05-301-1/+1
| | | | | | |
* | | | | | | [prep-release-3.1.0-b4] Update version to 3.1.0-b4Joas Schilling2014-05-301-1/+1
|/ / / / / /
* | | | | | Merge pull request #2432 from Nicofuma/ticket/11226Joas Schilling2014-05-291-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11226] filespec::move_file() should error correctly * Nicofuma/ticket/11226: [ticket/11226] Explicity set file_moved to false [ticket/11226] Add tests [ticket/11226] Use $user->lang() [ticket/11226] filespec::move_file() should error correctly