aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3435 from rxu/ticket/13648Joas Schilling2015-05-282-0/+69
|\ | | | | | | [ticket/13648] Allow extensions using custom bbcode validation methods
| * [ticket/13648] Allow extensions using custom bbcode validation methodsrxu2015-05-072-0/+69
| | | | | | | | PHPBB3-13648
* | [ticket/13868] Correctly handle acp/mcp/ucp modules lang files for extensionsrxu2015-05-271-1/+1
| | | | | | | | PHPBB3-13868
* | [ticket/13838] Fix coding styleNicofuma2015-05-141-1/+2
| | | | | | | | PHPBB3-13838
* | Merge pull request #3526 from rxu/ticket/13750Marc Alexander2015-05-081-7/+33
|\ \ | | | | | | | | | [ticket/13750] Add core event to allow modifying navlinks text
| * | [ticket/13750] Add core event to allow modifying navlinks textrxu2015-05-071-7/+33
| |/ | | | | | | | | | | | | | | Add generate_forum_nav() core event in includes/functions_display.php to allow modifying navlinks text. Use case example: extension(s) implementing multilanguage boards including translated forum names and so on. PHPBB3-13750
* | Merge pull request #3459 from brunoais/ticket/13664Marc Alexander2015-05-081-4/+21
|\ \ | | | | | | | | | [ticket/13664] Add event to allow changing number of unapproved posts in mcp_front
| * | [ticket/13664] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | PHPBB3-13664
| * | [ticket/13664] Added alias to table to make modding easier.brunoais2015-03-011-3/+3
| | | | | | | | | | | | PHPBB3-13664
| * | [ticket/13664] Add event to allow changing number of unapproved posts listedbrunoais2015-03-011-0/+12
| | | | | | | | | | | | PHPBB3-13664
| * | [ticket/13664] From string query in mcp_front unapproved posts to built querybrunoais2015-03-011-4/+9
| | | | | | | | | | | | PHPBB3-13664
* | | Merge pull request #3455 from brunoais/ticket/13660Marc Alexander2015-05-081-0/+12
|\ \ \ | | | | | | | | | | | | [ticket/13660] Allow changing the query for total reports in mcp_front
| * | | [ticket/13660] BUMP version to 3.1.5-RC1brunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13660
| * | | [ticket/13660] Fix @since version.brunoais2015-03-101-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13660
| * | | [ticket/13660] Allow changing the query for total reports in mcp_frontbrunoais2015-02-281-0/+12
| |/ / | | | | | | | | | PHPBB3-13660
* | | Merge pull request #3583 from nickvergessen/ticket/13807Nicofuma2015-05-061-1/+1
|\ \ \ | | | | | | | | | | | | Ticket/13807 Allow building changesets for the event list
| * | | [ticket/13807] Fix "changed version" to match our version numberingJoas Schilling2015-05-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13807
* | | | [ticket/13819] Add missing sql_freeresult() to files in includes/Marc Alexander2015-05-052-0/+2
|/ / / | | | | | | | | | PHPBB3-13819
* | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-281-2/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.4: [ticket/security-180] Use language variable for redirect error in 3.1+ [ticket/security-180] Merge if statement with previous one in 3.1.x [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
| * | [ticket/security-180] Use language variable for redirect error in 3.1+Marc Alexander2015-04-281-1/+1
| | | | | | | | | | | | SECURITY-180
| * | Merge branch 'ticket/security-180' into ticket/security-180-ascMarc Alexander2015-04-281-1/+1
| |\ \ | | | | | | | | | | | | | | | | Conflicts: tests/security/redirect_test.php
| | * | [ticket/security-180] Always fail when redirecting to an insecure URLJoas Schilling2015-04-111-1/+1
| | | | | | | | | | | | | | | | SECURITY-180
| * | | [ticket/security-180] Merge if statement with previous one in 3.1.xMarc Alexander2015-04-281-7/+1
| | | | | | | | | | | | | | | | SECURITY-180
| * | | Merge branch 'ticket/security-180' into ticket/security-180-ascMarc Alexander2015-04-281-0/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: tests/security/redirect_test.php
| | * | [ticket/security-180] Make sure that redirect goes to full URL plus slashMarc Alexander2015-04-111-1/+1
| | | | | | | | | | | | | | | | SECURITY-180
| | * | [ticket/security-180] Check if redirect URL contains board URLMarc Alexander2015-04-101-0/+6
| | | | | | | | | | | | | | | | SECURITY-180
* | | | [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserverAlexander Köplinger2015-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code was added as a workaround for bugs in very old versions of IIS, dating back to 2002: see commit 849d76697444f4e3523845f8c96569ccde57d868. Newer IIS versions handle the 'Location' header just fine, so we can avoid the unnecessary HTML page for redirects. Given that it seems to work fine since IIS 6.0 (on WinServer 2003), I don't think it's worth adding a special check for earlier versions as they are no longer supported by MS as well. PHPBB3-12101
* | | | Merge pull request #3532 from prototech/ticket/13755Marc Alexander2015-04-261-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13755] Ignore dots in path when determining file extension.
| * | | | [ticket/13755] Ignore dots in path when determining file extension.Cesar G2015-04-101-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13755
* | | | | Merge pull request #3550 from bantu/ticket/13765-3.1.4Andreas Fischer2015-04-251-2/+8
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it. * bantu/ticket/13765-3.1.4: [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
| * | | Merge branch 'ticket/13765' into ticket/13765-3.1.4Andreas Fischer2015-04-251-2/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/13765: [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it. Conflicts: phpBB/includes/functions.php phpBB/includes/startup.php
| | * | | [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.Joas Schilling2015-04-252-2/+2
| | |/ / | | | | | | | | | | | | PHPBB3-13765
| | * | Merge pull request #3359 from marc1706/ticket/13568Nicofuma2015-03-291-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13568] Validate imagick path as readable absolute path closes #3359
| | * | | [ticket/13617] Enforce column size limit for session_forum_idNils Adermann2015-02-251-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13617
* | | | | [3.1.x] Update development version to 3.1.5-devJoas Schilling2015-04-101-1/+1
|/ / / /
* | | | Update version to 3.1.4-RC1Joas Schilling2015-04-091-1/+1
| | | |
* | | | Merge pull request #3409 from Senky/ticket/11424Joas Schilling2015-04-061-0/+25
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/11424] Quick-Mod Tools race condition results in NO_MODE
| * | | | [ticket/11424] Add space between control flow keywords and parenthesisJakub Senko2015-02-191-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11424
| * | | | [ticket/11424] Handle race condition properly for Quick-Mod ToolsJakub Senko2015-02-161-0/+25
| | | | | | | | | | | | | | | | | | | | PHPBB3-11424
* | | | | [ticket/13743] Add $phpbb_root_path and $phpEx definitions in message_parser.phprxu2015-04-051-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | message_parser.php performs include of bbcode.php at the very start using $phpbb_root_path and $phpEx vars, so there's a possibility those can be undefined at that point, especially when message_parser.php is being included in event listener or another extension file where $phpbb_root_path and $phpEx don't exist. This can be fixed by adding the appropriate vars definitions. PHPBB3-13743
* | | | | Merge pull request #3376 from marc1706/ticket/13568-ascNicofuma2015-03-292-5/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13568] Validate imagick path as readable absolute path closes #3376
| * \ \ \ \ Merge branch 'ticket/13568' into ticket/13568-ascMarc Alexander2015-02-062-5/+10
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/adm/index.php phpBB/includes/acp/acp_attachments.php
| | * | | | [ticket/13568] Use more descriptive validation names and merge with path blockMarc Alexander2015-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13568
| | * | | | [ticket/13568] Validate imagick path as readable absolute pathMarc Alexander2015-02-021-1/+1
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-13568
| | * | | Merge branch 'prep-release-3.0.13' into develop-olympusAndreas Fischer2015-01-291-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.13: [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
| | | * \ \ Merge pull request #3348 from bantu/ticket/13549Andreas Fischer2015-01-291-1/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME... * bantu/ticket/13549: [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
| | | | * | | [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.Marc Alexander2015-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ORIG_PATH_INFO on IIS also contains the script name. Only use that for killing the script after removing the script name from ORIG_PATH_INFO. PHPBB3-13549
| | * | | | | Merge branch 'prep-release-3.0.13' into develop-olympusAndreas Fischer2015-01-291-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.13: [ticket/12933] Handle case when * is last character of word
| | | * | | | [ticket/12933] Handle case when * is last character of wordDhruv2015-01-281-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | PHPBB3-12933
| | | * | | [prep-release-3.0.13] Bump version numbers for 3.0.13 releaseNils Adermann2015-01-261-1/+1
| | | | | |