aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3582 from s9e/ticket/13805Nicofuma2015-05-141-2/+14
|\ | | | | | | [ticket/13805] Updated generate_text_for_storage() to match message_parser
| * [ticket/13805] Updated generate_text_for_storage() to match message_parserJoshyPHP2015-05-021-2/+14
| | | | | | | | PHPBB3-13805
* | Merge pull request #3581 from MateBartus/ticket/13804Nicofuma2015-05-142-2/+2
|\ \ | | | | | | | | | [ticket/13804] Make template's user dependency optional
| * | [ticket/13804] Make template's user dependency optionalMateBartus2015-05-052-2/+2
| | | | | | | | | | | | PHPBB3-13804
* | | Merge pull request #3599 from marc1706/ticket/13825Nicofuma2015-05-081-1/+1
|\ \ \ | | | | | | | | | | | | [ticket/13825] Correctly call phpbb_filesystem in create_thumbnail
| * | | [ticket/13825] Correctly call phpbb_filesystem in create_thumbnailMarc Alexander2015-05-081-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13825
* | | | Merge branch '3.1.x'Marc Alexander2015-05-081-7/+33
|\ \ \ \
| * \ \ \ 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 branch '3.1.x'Marc Alexander2015-05-081-4/+21
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | 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 branch '3.1.x'Marc Alexander2015-05-081-0/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 branch '3.1.x'Nicofuma2015-05-061-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | | Merge branch '3.1.x'Andreas Fischer2015-05-061-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13819] Add missing sql_freeresult() to files in includes/ Conflicts: phpBB/includes/acp/acp_database.php
| * | | | | [ticket/13819] Add missing sql_freeresult() to files in includes/Marc Alexander2015-05-052-0/+2
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13819
* | | | | [ticket/13638] Inject $filesystem in \phpbb\template\assetNicofuma2015-05-052-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13638
* | | | | [ticket/13762] Moving language related functionality into a separate classMateBartus2015-05-025-209/+38
| | | | | | | | | | | | | | | | | | | | PHPBB3-13762
* | | | | [ticket/13793] Remove translation on throwing exceptionsMateBartus2015-05-011-5/+9
| |_|_|/ |/| | | | | | | | | | | PHPBB3-13793
* | | | Merge branch '3.1.x'Andreas Fischer2015-04-281-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [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
| * | | 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
* | | | | Merge branch '3.1.x'Andreas Fischer2015-04-271-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
| * | | | [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 #3524 from marc1706/ticket/8672Tristan Darricau2015-04-272-16/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/8672] Add class for retrieving imagesize without download
| * | | | | [ticket/8672] User $user->lang() instead of sprintfMarc Alexander2015-04-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8672
| * | | | | [ticket/8672] Use fastImageSize in classesMarc Alexander2015-04-242-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8672
| * | | | | [ticket/8672] Add class for retrieving imagesize without downloadMarc Alexander2015-04-242-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getimagesize() always downloads the complete file before checking the actual image dimensions. This class will be able to do the same without having to download possibly large files. PHPBB3-8672
* | | | | | Merge pull request #3548 from s9e/ticket/12745Andreas Fischer2015-04-261-9/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12745] Allow Unicode characters from the SMP to be used in text * s9e/ticket/12745: [ticket/12745] Added HTML entity test [ticket/12745] Added support for Unicode characters outside BMP [ticket/12745] Updated s9e\TextFormatter
| * | | | | | [ticket/12745] Added support for Unicode characters outside BMPJoshyPHP2015-04-251-9/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-12745
* | | | | | Merge branch '3.1.x'Marc Alexander2015-04-261-0/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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 branch '3.1.x'Andreas Fischer2015-04-251-2/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | | * 3.1.x: [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
| * | | | | 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.