aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3732 from kinerity/ticket/13974Marc Alexander2015-07-171-0/+11
|\ | | | | | | [ticket/13974] Add core.mcp_change_poster_after event
| * [ticket/13974] Change userdata type from string to arrayKailey Truscott2015-06-281-1/+1
| | | | | | | | | | | | Change the docblock for userdata from string to array. PHPBB3-13974
| * [ticket/13974] Add core.mcp_change_poster_after eventKailey Truscott2015-06-281-0/+11
| | | | | | | | | | | | | | Create a new event to perform additional tasks after chainging a post's poster. PHPBB3-13974
* | [ticket/14004] Add user_info to core eventRichard McGirr2015-07-121-0/+3
| | | | | | | | PHPBB3-14004
* | [ticket/13995] Invalid avatar HTML missing space between elementsMatt Friedman2015-07-071-1/+1
| | | | | | | | PHPBB3-13995
* | Merge pull request #3654 from s9e/ticket/13880Tristan Darricau2015-06-291-22/+50
|\ \ | |/ |/| | | [ticket/13880] Automatically remove quotes that are nested too deep
| * [ticket/13880] Replaced the quote regexp to allow bracketsJoshyPHP2015-06-271-1/+1
| | | | | | | | | | | | This matches the regexp used in bbcode::bbcode_cache_init() PHPBB3-13880
| * [ticket/13880] Automatically remove quotes that are nested too deepJoshyPHP2015-06-271-22/+50
| | | | | | | | PHPBB3-13880
* | Merge pull request #3725 from RMcGirr83/ticket/13962Joas Schilling2015-06-271-1/+1
|\ \ | |/ |/| | | [ticket/13962] MCP Queue dropdown for forum selection
| * [ticket/13962] MCP Queue dropdown for forum selectionRMcGirr832015-06-231-1/+1
| | | | | | | | PHPBB3-13962
* | [ticket/13966] Adds the missing phpbb_dispatcher to includes/mcp/mcp_postCrizzo2015-06-251-1/+1
| | | | | | | | PHPBB3-13966
* | Merge pull request #3538 from RMcGirr83/ticket/13759Marc Alexander2015-06-241-1/+8
|\ \ | | | | | | | | | [ticket/13759] Take post_time into account
| * | [ticket/13759] Take post_time into accountRMcGirr832015-04-211-1/+8
| | | | | | | | | | | | PHPBB3-13759
* | | Merge pull request #3528 from RMcGirr83/ticket/13598Marc Alexander2015-06-241-0/+1
|\ \ \ | |_|/ |/| | | | | [ticket/13598] Allow topic lock on topic creation
| * | [ticket/13598] Allow topic lock on topic creationRichard McGirr2015-04-091-0/+1
| | | | | | | | | | | | PHPBB3-13598
* | | [ticket/13948] Correctly forwarding to the RIR for whois featurerxu2015-06-211-1/+1
| | | | | | | | | | | | | | | | | | Allow any space count in the ReferralServer string for whois services response. PHPBB3-13948
* | | [ticket/13882] Add lazy load avatars to phpbb wrappersMatt Friedman2015-06-161-4/+6
| | | | | | | | | | | | PHPBB3-13882
* | | Merge pull request #3653 from callumacrae/ticket/13882Marc Alexander2015-06-162-4/+27
|\ \ \ | | | | | | | | | | | | [ticket/13882] Lazy load the notification avatars.
| * | | [ticket/13882] no more egyptian brackets /o/Callum Macrae2015-05-301-2/+5
| | | | | | | | | | | | | | | | PHPBB3-13882
| * | | [ticket/13882] Lazy load the notification avatars.Callum Macrae2015-05-282-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves them further down the waterfall, making the page load quicker. PHPBB3-13882
* | | | Merge pull request #3703 from javiexin/ticket/10711Andreas Fischer2015-06-131-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10711] Duplicate key error on forum_tracks_table * javiexin/ticket/10711: [ticket/10711] Duplicate key error on forum_tracks_table
| * | | | [ticket/10711] Duplicate key error on forum_tracks_tablejaviexin2015-06-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In certain situations, an SQL error DUPLICATE ERROR for KEY 'PRIMARY' in the forums_track table is produced when marking forums read (viewforum.php?f=xx&mark=forums). The problem happens when there are duplicates in the forum_id array. The solution is to remove those duplicates. PHPBB3-10711
* | | | | [3.1.x] Update dev version to 3.1.6-RC1Joas Schilling2015-06-111-1/+1
| | | | |
* | | | | Merge branch 'prep-release-3.1.5' into 3.1.xJoas Schilling2015-06-112-6/+6
|\ \ \ \ \
| * | | | | [ticket/13823] Move the part of the query, so the update will get it correctlyJoas Schilling2015-06-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13823
| * | | | | [prep-release-3.1.5] Update version to 3.1.5-RC1Joas Schilling2015-06-091-1/+1
| | | | | |
* | | | | | Merge pull request #3685 from Nicofuma/ticket/13923Andreas Fischer2015-06-091-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13923] Update startup.php * Nicofuma/ticket/13923: [ticket/13923] CS [ticket/13923] Update startup.php
| * | | | | | [ticket/13923] CSTristan Darricau2015-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13923
| * | | | | | [ticket/13923] Update startup.phpAJ Quick2015-06-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While suppressing the output from the 'set_magic_quotes_runtime(0)' is sufficient with normal phpBB installs, using this file in association with the oauth plugin will cause an error on some versions of PHP. This fixes a potential bug where set_magic_quotes_runtime is depreciated in newer versions of PHP. PHPBB3-13923
* | | | | | | Merge pull request #3694 from marc1706/ticket/13930Andreas Fischer2015-06-095-14/+14
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13930] Check for correct spacing between keyword & parenthesis * marc1706/ticket/13930: [ticket/13930] Add missing spaces to code [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset [ticket/13930] Remove not needed return statements [ticket/13930] Add missing spaces to code [ticket/13930] Check for correct spacing between keyword & parenthesis
| * | | | | | [ticket/13930] Add missing spaces to codeMarc Alexander2015-06-085-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13930
* | | | | | | Merge pull request #3479 from brunoais/ticket/13685Marc Alexander2015-06-096-8/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13685] Allow modifying the query for mysql native fulltext search
| * | | | | | | [ticket/13685] This should take care of the restbrunoais2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13685
| * | | | | | | [ticket/13685] Add phpbb_dispatcher to fulltext search constructorsbrunoais2015-06-076-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13685
* | | | | | | | Merge branch 'ticket/13833-30x' into ticket/13833Oliver Schramm2015-06-081-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/posting.php PHPBB3-13833
| * | | | | | | [ticket/13833] Prevent flooding if type=submit doesn't existOliver Schramm2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13833
| * | | | | | | Merge branch 'prep-release-3.0.14' into 3.0.xAndreas Fischer2015-04-281-1/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [ticket/security-180] Add tests for redirecting to main URL [ticket/security-180] Always fail when redirecting to an insecure URL [ticket/security-180] Make sure that redirect goes to full URL plus slash [ticket/security-180] Check if redirect URL contains board URL
| | * \ \ \ \ \ \ Merge remote-tracking branch 'phpbb-security/ticket/security-180' into ↵Andreas Fischer2015-04-281-1/+7
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.14 * phpbb-security/ticket/security-180: [ticket/security-180] Add tests for redirecting to main URL [ticket/security-180] Always fail when redirecting to an insecure URL [ticket/security-180] Make sure that redirect goes to full URL plus slash [ticket/security-180] Check if redirect URL contains board URL
| * | | | | | | | | [3.0.x] Increment version number to 3.0.15-dev.Andreas Fischer2015-04-281-1/+1
| |/ / / / / / / /
| * | | | | | | | [3.0.x] Bump version numbers for 3.0.14-RC1 release.Andreas Fischer2015-04-271-1/+1
| | | | | | | | |
* | | | | | | | | [ticket/13823] Remove the unnecessary bracketsJoas Schilling2015-06-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the line with non-whitespace changes, so the packaging script should correctly detect them as changed and put the file into the update. PHPBB3-13823
* | | | | | | | | Merge pull request #22 from phpbb/ticket/sec-184Marc Alexander2015-06-073-4/+28
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/sec-184] Do not output passwords to HTML
| * | | | | | | | | [ticket/sec-184] Do not output LDAP password to HTMLJoas Schilling2015-06-041-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-184
| * | | | | | | | | [ticket/sec-184] Do not output Jabber password to HTMLJoas Schilling2015-06-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-184
| * | | | | | | | | [ticket/sec-184] Do not output config passwords to the HTML pageJoas Schilling2015-06-042-2/+14
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-184
* | | | | | | | | Merge pull request #23 from phpbb/ticket/13913Tristan Darricau2015-06-061-5/+14
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | [ticket/13913] Correctly check the forum_password and read permissions
| * | | | | | | | [ticket/13913] Correctly check the forum_password and read permissionsJoas Schilling2015-06-041-5/+14
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to check them on the forum the post is in, rather than the forum row we are displaying. PHPBB3-13913
* | | | | | | | Merge pull request #3671 from marc1706/ticket/9563Tristan Darricau2015-06-061-1/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/9563] Do not show empty categories on index
| * | | | | | | | [ticket/9563] Do not show empty categories on indexMarc Alexander2015-05-311-1/+13
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9563
* | | | | | | | [ticket/13841] Fix tests on 3.1 and master branchCHItA2015-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13841