aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'ticket/bantu/9176' into develop-olympusNils Adermann2010-05-141-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | * ticket/bantu/9176: [ticket/9176] Take current board timezone settings into account when setting board date format.
| * | | | | | [ticket/9176] Take current board timezone settings into account when setting ↵Andreas Fischer2010-05-131-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | board date format. PHPBB3-9176
* | | | | | Merge branch 'ticket/p/6726' into develop-olympusNils Adermann2010-05-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/p/6726: [ticket/6726] Added localhost/127.0.0.1 note to database server hostname explanation in install language.
| * | | | | | [ticket/6726] Added localhost/127.0.0.1 note to database server hostname ↵Oleg Pudeyev2010-05-141-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | explanation in install language. When using PostgreSQL adapter and connecting to local database server, use localhost to connect via UNIX domain socket and 127.0.0.1 to connect via TCP. PHPBB3-6726
* | | | | | Merge branch 'feature/bantu/remote_upload-filesize' into develop-olympusNils Adermann2010-05-141-1/+24
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | * feature/bantu/remote_upload-filesize: [feature/remote_upload-filesize] Also check HTTP content-length before actually starting the file transfer. [feature/remote_upload-filesize] When transferring files from a remote webserver, abort the transfer as soon as the allowed filesize has been exceeded.
| * | | | | [feature/remote_upload-filesize] Also check HTTP content-length before ↵Andreas Fischer2010-05-141-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | actually starting the file transfer. PHPBB3-9517
| * | | | | [feature/remote_upload-filesize] When transferring files from a remote ↵Andreas Fischer2010-05-141-1/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | webserver, abort the transfer as soon as the allowed filesize has been exceeded. PHPBB3-9517
* | | | | Merge branch 'feature/webpi' into develop-olympusNils Adermann2010-05-031-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * feature/webpi: [feature/webpi] Validate inline with MSSQL password policy.
| * | | | | [feature/webpi] Validate inline with MSSQL password policy.Chris Smith2010-04-151-2/+2
| | | | | |
* | | | | | Merge branch 'ticket/cs278/9582' into develop-olympusNils Adermann2010-05-035-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/cs278/9582: [ticket/9582] MSSQL native backups can now be restored. [ticket/9582] Advanced search cannot be accessed using MSSQL native. [ticket/9582] Removing a report reason leaves reports with an unknown reason under MSSQL native. [ticket/9582] Unable to edit CPFs from UCP under MSSQL native driver. [ticket/9582] Custom profile fields cannot be created under MSSQL native.
| * | | | | | [ticket/9582] MSSQL native backups can now be restored.Chris Smith2010-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9583 PHPBB3-9582
| * | | | | | [ticket/9582] Advanced search cannot be accessed using MSSQL native.Rob House2010-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9562 PHPBB3-9582
| * | | | | | [ticket/9582] Removing a report reason leaves reports with an unknown reason ↵Rob House2010-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | under MSSQL native. PHPBB3-9564 PHPBB3-9582
| * | | | | | [ticket/9582] Unable to edit CPFs from UCP under MSSQL native driver.Rob House2010-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9566 PHPBB3-9582
| * | | | | | [ticket/9582] Custom profile fields cannot be created under MSSQL native.Rob House2010-05-031-0/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-9565 PHPBB3-9582
* | | | | | Merge branch 'ticket/cs278/9520' into develop-olympusNils Adermann2010-05-031-0/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/cs278/9520: [ticket/9520] Additionally filter requests for {common,config}.php [ticket/9520] New web.config file as suggested by Microsoft using request filter [ticket/9520] Removed per directory web.config files. [ticket/9520] Add suggested web.config for root files as suggested by Microsoft. [ticket/9520] Add some default web.config files for IIS.
| * | | | | | [ticket/9520] Additionally filter requests for {common,config}.phpChris Smith2010-05-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9520
| * | | | | | [ticket/9520] New web.config file as suggested by Microsoft using request filterChris Smith2010-05-031-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9520
| * | | | | | [ticket/9520] Removed per directory web.config files.Chris Smith2010-05-034-52/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These use the IIS rewriter to reject requests, Microsoft have suggested we just use a single web.config with the builtin request filter. PHPBB3-9520
| * | | | | | [ticket/9520] Add suggested web.config for root files as suggested by Microsoft.Chris Smith2010-05-031-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9520
| * | | | | | [ticket/9520] Add some default web.config files for IIS.Chris Smith2010-05-034-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These deny access to the various directories written to by phpBB. PHPBB3-9520
* | | | | | | [develop-olympus] Basic gitignore file for cache files and backups.Nils Adermann2010-05-021-0/+2
| | | | | | |
* | | | | | | Merge branch 'ticket/bantu/9170' into develop-olympusNils Adermann2010-05-021-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | * ticket/bantu/9170: [ticket/9170] Unable to get image size in img bbcode when URL has multiple parameters.
| * | | | | | [ticket/9170] Unable to get image size in img bbcode when URL has multiple ↵Andreas Fischer2010-05-021-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parameters. Since we htmlspecialchars() all input we have to htmlspecialchars_decode() before passing the URL along to getimagesize(). PHPBB3-9170
* | | | | | Merge branch 'feature/cs278/git-tools' into develop-olympusNils Adermann2010-04-281-3/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * feature/cs278/git-tools: [git-tools] Use @ instead of : in sed command in pre-commit hook for wider compatibility. [git-tools] Adjusted pre-commit hook to run under freebsd /bin/sh. [git-tools] Changed pre-commit hook to use sh instead of bash
| * | | | | Merge branch 'p/git-tools' into git-toolsChris Smith2010-04-131-3/+6
| |\ \ \ \ \ |/ / / / / /
| * | | | | [git-tools] Use @ instead of : in sed command in pre-commit hook for wider ↵Oleg Pudeyev2010-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | compatibility.
| * | | | | [git-tools] Adjusted pre-commit hook to run under freebsd /bin/sh.Oleg Pudeyev2010-04-131-2/+5
| | | | | |
| * | | | | [git-tools] Changed pre-commit hook to use sh instead of bashOleg Pudeyev2010-04-131-1/+1
|/ / / / /
* | | | | Merge branch 'feature/cs278/webpi' into develop-olympusNils Adermann2010-04-095-0/+301
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * feature/cs278/webpi: [feature/webpi] Web PI supports UNIX line endings so we'll remove them [feature/webpi] Hopefully finally fix this [feature/webpi] Fix messed up line endings [feature/webpi] Add WebPI support to the build script. [feature/webpi] Package files for Microsoft Web Platform Installer [feature/dbal-tests] Remove hardcoded 'mysql' from PDO DSN in DBAL test. [feature/dbal-tests] Fix mysql (not mysqli) dbal test.
| * | | [feature/webpi] Web PI supports UNIX line endings so we'll remove themChris Smith2010-04-084-293/+293
| | | |
| * | | [feature/webpi] Hopefully finally fix thisChris Smith2010-04-081-1/+15
| | | |
| * | | [feature/webpi] Fix messed up line endingsChris Smith2010-04-081-0/+0
| | | |
| * | | [feature/webpi] Add WebPI support to the build script.Chris Smith2010-04-081-0/+8
| | | |
| * | | [feature/webpi] Package files for Microsoft Web Platform InstallerChris Smith2010-04-084-0/+278
| | | |
| * | | [feature/dbal-tests] Remove hardcoded 'mysql' from PDO DSN in DBAL test.Andreas Fischer2010-04-081-1/+1
| | | |
| * | | [feature/dbal-tests] Fix mysql (not mysqli) dbal test.Andreas Fischer2010-04-081-2/+4
| | | | | | | | | | | | | | | | Correctly determine MySQL version from the database.
* | | | Merge branch 'bug/cs278/59465' into develop-olympusNils Adermann2010-04-043-10/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * bug/cs278/59465: [bug/59465] Remove start=0 from topic pagination links. [bug/59465] Removes start=0 from URLs used by viewtopic and viewforum.
| * | | | [bug/59465] Remove start=0 from topic pagination links.Chris Smith2010-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | Patch once again by nn-.
| * | | | [bug/59465] Removes start=0 from URLs used by viewtopic and viewforum.Chris Smith2010-03-182-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having start=0 makes search engines index the page twice once with and once without the start=0 parameter. This results in duplicate results in the search results. Patch contributed by nn-.
* | | | | Merge branch 'bug/nickvergessen/9047' into develop-olympusNils Adermann2010-04-042-8/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug/nickvergessen/9047: [bug/9047] Use correct forum_id to generate the active topics list. (Bug #9047) Conflicts: phpBB/docs/CHANGELOG.html
| * | | | | [bug/9047] Use correct forum_id to generate the active topics list. (Bug #9047)Joas Schilling2010-04-042-8/+11
| | |_|/ / | |/| | |
* | | | | Merge branch 'feature/nickvergessen/unapproved-posts-in-feed' into ↵Nils Adermann2010-04-042-9/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * feature/nickvergessen/unapproved-posts-in-feed: [feature/unapproved-posts-in-feed] Little changelog correction [feature/unapproved-posts-in-feed] Increase performance of is_moderator_approve_forum() as per bantu [feature/unapproved-posts-in-feed] View note for moderators on unapproved posts/topics with unapproved posts in ATOM Feed Conflicts: phpBB/docs/CHANGELOG.html
| * | | | | [feature/unapproved-posts-in-feed] Little changelog correctionJoas Schilling2010-04-041-1/+1
| | | | | |
| * | | | | [feature/unapproved-posts-in-feed] Increase performance of ↵Joas Schilling2010-04-041-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | is_moderator_approve_forum() as per bantu
| * | | | | [feature/unapproved-posts-in-feed] View note for moderators on unapproved ↵Joas Schilling2010-04-042-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | posts/topics with unapproved posts in ATOM Feed
* | | | | | Merge branch 'bug/nickvergessen/9512' into develop-olympusNils Adermann2010-04-042-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug/nickvergessen/9512: [bug/9512] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512) Conflicts: phpBB/docs/CHANGELOG.html
| * | | | | | [bug/9512] Fix dead link in MCP on reports for global announcements in ↵Joas Schilling2010-04-042-1/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | prosilver. (Bug #9512)
* | | | | | Merge branch 'bug/nickvergessen/58745' into develop-olympusNils Adermann2010-04-042-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug/nickvergessen/58745: [bug/58745] Correct changelog message [bug/58745] Correctly close user-delete-form in ACP User Overview (Bug #58745) Conflicts: phpBB/docs/CHANGELOG.html
| * | | | | | [bug/58745] Correct changelog messageJoas Schilling2010-04-031-1/+1
| | | | | | |