aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* 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/12186] Move PM reports below post reports while installingn-aleha2014-04-231-1/+1
| | | | | | | | | | | | In mcp, move PM reports below post reports while installing. PHPBB3-12186
* | Merge pull request #2310 from n-aleha/ticket/12397Andreas Fischer2014-04-151-2/+2
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12397] Fix sql_unique_index_exists doc block * n-aleha/ticket/12397: [ticket/12397] Fix sql_unique_index_exists doc block
| * | [ticket/12397] Fix sql_unique_index_exists doc blockn-aleha2014-04-161-2/+2
| |/ | | | | | | | | | | | | db_tools::sql_unique_index_exists() searches for unique indexes but not primary key indexes. PHPBB3-12397
* | 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/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
* | | [ticket/12353] Fix displayed attachments in ACPOliver Schramm2014-04-041-1/+1
|/ / | | | | | | PHPBB3-12353
* | Merge remote-tracking branch 'noxwizard/ticket/naderman/9725' into ↵Joas Schilling2014-03-292-49/+113
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * noxwizard/ticket/naderman/9725: [ticket/9725] Code sniffer fixes [ticket/9725] Do not use deprecated views to remove default constraints [ticket/9725] Move primary key creation to the correct location [ticket/9725] Remove trailing spaces from MSSQL schema [ticket/9725] Create MSSQL primary keys if none exist [ticket/9725] Remove explicit filegroup designations [ticket/9725] Fetch Azure db stats from proper table [ticket/9725] Add dummy indexes for Azure [ticket/9725] Create an Azure SQL compatible Schema
| * [ticket/9725] Code sniffer fixesPatrick Webster2014-03-281-4/+4
| | | | | | | | PHPBB3-9725
| * [ticket/9725] Do not use deprecated views to remove default constraintsPatrick Webster2014-03-281-32/+84
| | | | | | | | PHPBB3-9725
| * [ticket/9725] Move primary key creation to the correct locationPatrick Webster2014-03-281-9/+9
| | | | | | | | PHPBB3-9725
| * [ticket/9725] Create MSSQL primary keys if none existPatrick Webster2014-03-281-0/+9
| | | | | | | | PHPBB3-9725
| * [ticket/9725] Remove explicit filegroup designationsPatrick Webster2014-03-281-17/+4
| | | | | | | | PHPBB3-9725
| * [ticket/9725] Fetch Azure db stats from proper tablePatrick Webster2014-03-281-0/+16
| | | | | | | | PHPBB3-9725
* | [ticket/12035] Correcting the conditiongeetakshi2014-03-201-1/+1
| | | | | | | | PHPBB3-12035
* | [ticket/12035] Adding necessary conditionsgeetakshi2014-03-201-1/+1
| | | | | | | | PHPBB3-12035
* | [ticket/12035] Adding link to user posts to ACP pagegeetakshi2014-03-171-0/+1
| | | | | | | | | | | | Adding link of posts behind displayed number of posts of the user PHPBB3-12035
* | Merge remote-tracking branch 'marcosbc/ticket/12247' into develop-olympusJoas Schilling2014-03-141-2/+4
|\ \ | | | | | | | | | | | | | | | * marcosbc/ticket/12247: [ticket/12247] Makes static usernames work [ticket/12247] Add ['username'] to mcp_queue.php's user_notification()
| * | [ticket/12247] Makes static usernames workMarcos Bjorkelund2014-03-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Relative to the last ticket, this allows static usernames to work correctly (those inserted in the post-column post_username) when sending the e-mail, instead of showing just "Anonymous". PHPBB3-12247
| * | [ticket/12247] Add ['username'] to mcp_queue.php's user_notification()Marcos Bjorkelund2014-03-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It includes the poster's username in the email notifications of posts that get approved by moderators. This is done by adding the username to every user_notification() function located in /phpBB/includes/mcp/mcp_queue.php. PHPBB3-12247
* | | Merge remote-tracking branch 'exreaction/ticket/12202' into develop-olympusJoas Schilling2014-03-141-2/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | * exreaction/ticket/12202: [ticket/12202] Use an array in the data provider instead of exploding manually [ticket/12202] Can't call htmlspecialchars before checking for quotes [ticket/12202] Fix tests [ticket/12202] Test for parse_cfg_file [ticket/12202] Use copyright symbol in style.cfg files [ticket/12202] Apply htmlspecialchars to style.cfg data
| * | [ticket/12202] Can't call htmlspecialchars before checking for quotesNathaniel Guse2014-03-091-1/+5
| | | | | | | | | | | | PHPBB3-12202
| * | [ticket/12202] Apply htmlspecialchars to style.cfg dataNathan Guse2014-03-091-3/+3
| | | | | | | | | | | | PHPBB3-12202
* | | Merge remote-tracking branch 'bantu/ticket/12176' into develop-olympusJoas Schilling2014-03-131-2/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/12176: [ticket/12176] Reword comment about config entries. [ticket/12176] Add newest_user_colour to config array to ensure it exists [ticket/12176] Display correct message when trying to delete founder. [ticket/12176] Add functional test for founder deletion message.
| * | | [ticket/12176] Display correct message when trying to delete founder.Andreas Fischer2014-02-151-2/+7
| | | | | | | | | | | | | | | | PHPBB3-12176
* | | | [ticket/10549] using correct variable in includes/functions_module.php tooCrizzo2014-03-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10549
* | | | Merge remote-tracking branch 'dhruvgoel92/ticket/11288' into develop-olympusJoas Schilling2014-03-111-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11288: [ticket/11288] Handle +,- without preceeding whitespace characters
| * | | | [ticket/11288] Handle +,- without preceeding whitespace charactersDhruv2013-10-051-0/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11288
* | | | | [ticket/10549] Adds language variablesCrizzo2014-03-101-3/+3
| |_|/ / |/| | | | | | | | | | | PHPBB3-10549
* | | | [ticket/10945] Fix return values for split_keywords functionDhruv2014-03-081-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The function now returns false if all the words are common words and true otherwise. PHPBB3-10945
* | | | [ticket/10945] Display search query when search fails in native searchDhruv2014-03-081-18/+11
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | If search fails and common words are present, split_keywords returns false and search.php file prints appropriate message of common words. If search fails and there are no common words, split_keywords returns true and keyword_search returns false so that the search query is displayed in search box. PHPBB3-10945
* | | [ticket/12205] Do not display 0 for empty integers when show_novalue is offJoas Schilling2014-02-251-1/+1
| | | | | | | | | | | | PHPBB3-12205
* | | [ticket/12210] dbtools::sql_create_table incorrectly throws errorNathaniel Guse2014-02-171-1/+1
| |/ |/| | | | | | | | | related to auto-increment length on non auto-increment fields PHPBB3-12210
* | [ticket/12048] Fix the regexp for language keys in custom bbcodes.Cesar G2013-12-021-2/+2
| | | | | | | | PHPBB3-12048
* | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-281-0/+7
|\ \ | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Update changelog for 3.0.12 release. [ticket/11873] Add unit test for large password input. [ticket/11873] Do not hash very large passwords in order to safe resources.
| * | [ticket/11873] Do not hash very large passwords in order to safe resources.Joas Schilling2013-09-281-0/+7
| | | | | | | | | | | | PHPBB3-11873
| * | [prep-release-3.0.12] Bumping version number for 3.0.12 final.Andreas Fischer2013-09-271-1/+1
| | |
| * | [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.Andreas Fischer2013-09-021-1/+1
| | |
* | | [ticket/11864] Do not call exit after display_progress_bar in acp_forumsMarc Alexander2013-09-251-1/+0
| |/ |/| | | | | | | | | | | | | | | | | The progress bar is called with the method display_progress_bar() in the acp_forums files. This method then call adm_page_footer() which also calls exit_handler(). Therefore, the exit; in acp_forums after $this->display_progress_bar() is obsolete and shouldn't exist in the first place. PHPBB3-11864
* | [ticket/11829] Use report_closed to determine status in MCP report_detailsrechosen2013-09-042-0/+2
| | | | | | | | | | | | | | | | | | | | Instead of using post_reported of the post or message_reported of the pm, use report_closed of the report itself to reliably determine whether this particular report is closed or not in the report_details view of the MCP. This fixes a bug where the report_details view would not show that the report shown was closed and display a "Close report" button that had no effect. PHPBB3-11829
* | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-021-1/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11769] Allow '0' as username in notification mails [ticket/11769] Fix language issues in the doc blocks [ticket/11769] Correctly supply the post author's username in posting.php Conflicts: phpBB/language/en/email/forum_notify.txt phpBB/language/en/email/newtopic_notify.txt phpBB/language/en/email/topic_notify.txt
| * [ticket/11769] Allow '0' as usernameJoas Schilling2013-09-021-1/+1
| | | | | | | | PHPBB3-11769
| * [ticket/11769] Fix language issues in the doc blocksJoas Schilling2013-08-231-3/+3
| | | | | | | | PHPBB3-11769
| * [ticket/11769] Correctly supply the post author's username in posting.phpJoas Schilling2013-08-231-1/+4
| | | | | | | | | | | | | | | | Only supply the username, when it is a guest posting or we edit and it was supplied, otherwise post_data might hold data of the post we quote, in which case username is the original poster, not the current one. PHPBB3-11769
* | [ticket/11799] Send anti abuse headers in "new password" emails.Andreas Fischer2013-08-231-0/+2
| | | | | | | | PHPBB3-11799
* | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-151-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11775] Split test into multiple steps [ticket/11775] Add functional test for moving the last post [ticket/11775] Backport moving of the posting functions to 3.0 [ticket/11775] Fix error when moving the last post to another topic