Commit graph

13165 commits

Author SHA1 Message Date
Andreas Fischer
9ce0873bd1 [ticket/9514] Correctly delete big datasets when deleting a forum including topics/posts on non-MySQL databases.
PHPBB3-9514
2010-05-14 02:10:50 +02:00
Nils Adermann
b3bbe57603 Merge branch 'ticket/p/6726' into develop-olympus
* ticket/p/6726:
  [ticket/6726] Added localhost/127.0.0.1 note to database server hostname explanation in install language.
2010-05-14 01:41:31 +02:00
Oleg Pudeyev
3a515bffb9 [ticket/6726] Added localhost/127.0.0.1 note to database server hostname 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
2010-05-14 01:41:10 +02:00
Nils Adermann
5fb945c220 Merge branch 'feature/bantu/remote_upload-filesize' into develop-olympus
* 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.
2010-05-14 01:19:49 +02:00
Andreas Fischer
e4398ef42e [feature/remote_upload-filesize] Also check HTTP content-length before actually starting the file transfer.
PHPBB3-9517
2010-05-14 01:19:34 +02:00
Andreas Fischer
d19565756a [feature/remote_upload-filesize] When transferring files from a remote webserver, abort the transfer as soon as the allowed filesize has been exceeded.
PHPBB3-9517
2010-05-14 01:19:34 +02:00
Andreas Fischer
3e9d15a25d [ticket/9176] Take current board timezone settings into account when setting board date format.
PHPBB3-9176
2010-05-13 14:25:44 +02:00
Nils Adermann
0ed69d91b2 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [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/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.
  [develop-olympus] Basic gitignore file for cache files and backups.
  [ticket/9170] Unable to get image size in img bbcode when URL has multiple parameters.
  [feature/webpi] Validate inline with MSSQL password policy.
2010-05-03 19:56:19 +02:00
Nils Adermann
91399fd357 Merge branch 'feature/webpi' into develop-olympus
* feature/webpi:
  [feature/webpi] Validate inline with MSSQL password policy.
2010-05-03 19:43:57 +02:00
Nils Adermann
ad93eaaaf3 Merge branch 'ticket/cs278/9582' into develop-olympus
* 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.
2010-05-03 19:41:04 +02:00
Chris Smith
11d097fc1a [ticket/9582] MSSQL native backups can now be restored.
PHPBB3-9583
PHPBB3-9582
2010-05-03 19:40:45 +02:00
Rob House
e95faaeb68 [ticket/9582] Advanced search cannot be accessed using MSSQL native.
PHPBB3-9562
PHPBB3-9582
2010-05-03 19:40:39 +02:00
Rob House
a20576fdd4 [ticket/9582] Removing a report reason leaves reports with an unknown reason under MSSQL native.
PHPBB3-9564
PHPBB3-9582
2010-05-03 19:40:33 +02:00
Rob House
5739426136 [ticket/9582] Unable to edit CPFs from UCP under MSSQL native driver.
PHPBB3-9566
PHPBB3-9582
2010-05-03 19:40:26 +02:00
Rob House
171807213f [ticket/9582] Custom profile fields cannot be created under MSSQL native.
PHPBB3-9565
PHPBB3-9582
2010-05-03 19:38:42 +02:00
Nils Adermann
38ba3dcdd9 Merge branch 'ticket/cs278/9520' into develop-olympus
* 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.
2010-05-03 19:36:18 +02:00
Chris Smith
43f47dba4c [ticket/9520] Additionally filter requests for {common,config}.php
PHPBB3-9520
2010-05-03 19:32:29 +02:00
Chris Smith
8612fc23d4 [ticket/9520] New web.config file as suggested by Microsoft using request filter
PHPBB3-9520
2010-05-03 19:31:54 +02:00
Chris Smith
e11e53e11b [ticket/9520] Removed per directory web.config files.
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
2010-05-03 19:31:40 +02:00
Chris Smith
9ac7c492ed [ticket/9520] Add suggested web.config for root files as suggested by Microsoft.
PHPBB3-9520
2010-05-03 19:31:18 +02:00
Chris Smith
cdd9ecdd68 [ticket/9520] Add some default web.config files for IIS.
These deny access to the various directories written to by phpBB.

PHPBB3-9520
2010-05-03 19:30:52 +02:00
Nils Adermann
fd23bccd4d [develop-olympus] Basic gitignore file for cache files and backups. 2010-05-02 23:44:42 +02:00
Nils Adermann
e09ab8a4c5 Merge branch 'ticket/bantu/9170' into develop-olympus
* ticket/bantu/9170:
  [ticket/9170] Unable to get image size in img bbcode when URL has multiple parameters.
2010-05-02 23:43:46 +02:00
Andreas Fischer
abacc2d07d [ticket/9170] Unable to get image size in img bbcode when URL has multiple parameters.
Since we htmlspecialchars() all input we have to htmlspecialchars_decode() before passing the URL along to getimagesize().

PHPBB3-9170
2010-05-02 23:43:32 +02:00
rxu
b3028567c8 [ticket/9567] Newly registered users group description rewording.
Reword 'NEW_MEMBER_GROUP_DEFAULT_EXPLAIN' language entry to make it more linguistically correct.

PHPBB3-9567
2010-05-02 14:50:33 +08:00
Nils Adermann
0ba247ef0f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [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
  [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.
2010-04-28 12:37:36 +02:00
Nils Adermann
cb3cf71805 Merge branch 'feature/cs278/git-tools' into develop-olympus
* 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
2010-04-28 12:31:24 +02:00
Joas Schilling
5f4c6e9c91 [ticket/9548] Delete user quicktool drop down should have an empty or invalid selection as the default
PHPBB3-9548
2010-04-18 15:13:53 +02:00
Chris Smith
b22a651c5c [feature/webpi] Validate inline with MSSQL password policy. 2010-04-15 23:00:27 +01:00
Chris Smith
f6dd150ed8 Merge branch 'p/git-tools' into git-tools 2010-04-13 21:46:19 +01:00
Oleg Pudeyev
9674214b2f [git-tools] Use @ instead of : in sed command in pre-commit hook for wider compatibility. 2010-04-13 21:44:18 +01:00
Oleg Pudeyev
9afe2c9b6e [git-tools] Adjusted pre-commit hook to run under freebsd /bin/sh. 2010-04-13 21:44:12 +01:00
Oleg Pudeyev
5a3ec9901d [git-tools] Changed pre-commit hook to use sh instead of bash 2010-04-13 21:44:03 +01:00
Nils Adermann
03d50a2e83 Merge branch 'feature/cs278/webpi' into develop-olympus
* 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.
2010-04-09 09:10:12 +02:00
Chris Smith
cc127d8217 [feature/webpi] Web PI supports UNIX line endings so we'll remove them 2010-04-08 17:23:15 +01:00
Chris Smith
a2fe71a6d3 [feature/webpi] Hopefully finally fix this 2010-04-08 17:01:10 +01:00
Chris Smith
f9946de5b3 [feature/webpi] Fix messed up line endings 2010-04-08 16:56:24 +01:00
Chris Smith
839f464b78 [feature/webpi] Add WebPI support to the build script. 2010-04-08 17:29:05 +02:00
Chris Smith
02aed4b66f [feature/webpi] Package files for Microsoft Web Platform Installer 2010-04-08 17:28:47 +02:00
Andreas Fischer
eaa591046f [feature/dbal-tests] Remove hardcoded 'mysql' from PDO DSN in DBAL test. 2010-04-08 17:26:39 +02:00
Andreas Fischer
584206b8ae [feature/dbal-tests] Fix mysql (not mysqli) dbal test.
Correctly determine MySQL version from the database.
2010-04-08 17:26:38 +02:00
Nils Adermann
f8ff68f21d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [bug/9047] Use correct forum_id to generate the active topics list. (Bug #9047)
  [bug/9512] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512)
  [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
  [bug/58745] Correct changelog message
  [bug/58745] Correctly close user-delete-form in ACP User Overview (Bug #58745)
  [bug/58695] Use method to get forums where user is moderator, thanks to bantu for the hint
  [bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695)
  [bug/59465] Remove start=0 from topic pagination links.
  [bug/59465] Removes start=0 from URLs used by viewtopic and viewforum.
2010-04-04 15:33:48 +02:00
Nils Adermann
925a135613 Merge branch 'bug/cs278/59465' into develop-olympus
* bug/cs278/59465:
  [bug/59465] Remove start=0 from topic pagination links.
  [bug/59465] Removes start=0 from URLs used by viewtopic and viewforum.
2010-04-04 15:32:36 +02:00
Nils Adermann
560a1b3ad4 Merge branch 'bug/nickvergessen/9047' into develop-olympus
* bug/nickvergessen/9047:
  [bug/9047] Use correct forum_id to generate the active topics list. (Bug #9047)

Conflicts:
	phpBB/docs/CHANGELOG.html
2010-04-04 15:31:38 +02:00
Nils Adermann
1af1a96501 Merge branch 'feature/nickvergessen/unapproved-posts-in-feed' into 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
2010-04-04 15:29:45 +02:00
Nils Adermann
feb3987802 Merge branch 'bug/nickvergessen/9512' into develop-olympus
* bug/nickvergessen/9512:
  [bug/9512] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512)

Conflicts:
	phpBB/docs/CHANGELOG.html
2010-04-04 15:26:50 +02:00
Nils Adermann
5b5463a981 Merge branch 'bug/nickvergessen/58745' into develop-olympus
* 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
2010-04-04 15:21:27 +02:00
Nils Adermann
f07c9fab2b Merge branch 'bug/nickvergessen/58695' into develop-olympus
* bug/nickvergessen/58695:
  [bug/58695] Use method to get forums where user is moderator, thanks to bantu for the hint
  [bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695)

Conflicts:
	phpBB/docs/CHANGELOG.html
2010-04-04 15:17:48 +02:00
Nils Adermann
382354925d Merge branch 'develop-olympus' into develop
* develop-olympus: (26 commits)
  [git-tools] add note about PHP_BIN using env
  [git-tools] do not display stderr
  [git-tools] Prepend the branch to the commit message for all branches.
  [git-tools] Use env to find the correct paths to binaries.
  [git-tools] Display what parse errors were found.
  [git-tools] This script requires bash to run, so point directly to bash.
  [feature/dbal-tests] Remove hardcoded 'mysql' from PDO DSN in DBAL test.
  [feature/dbal-tests] Fix mysql (not mysqli) dbal test.
  [feature/dbal-tests] Only output the missing config error message once.
  [feature/dbal-tests] Make the PDO prefix depend on the dbms.
  [feature/dbal-tests] Fix whitespace and line endings.
  [bug/9108] Fix table binding issues with PostgreSQL in board-wide feed. (Old Bug #58425)
  [bug/59425] Correctly check for double inclusion in captcha garbage collection
  [bug/58465] The redirect hidden field is now XHTML conform
  [feature/dbal-tests] Make some tests for build_array_data on SELECT
  [feature/dbal-tests] Make some tests for return_on_error on SELECT-queries
  [feature/dbal-tests] Tests for $db->sql_query_limit()
  [feature/dbal-tests] Load phpbb-schema after creating the connection to the database
  [feature/dbal-tests] Added tests for dbal fetchrow and fetchfield.
  [feature/dbal-tests] Added database test & refactored test framework
  ...
2010-04-04 15:04:56 +02:00
Nils Adermann
fa9510be23 Merge branch 'feature/evil3/git-tools' into develop-olympus
* feature/evil3/git-tools:
  [git-tools] add note about PHP_BIN using env
  [git-tools] do not display stderr
  [git-tools] Prepend the branch to the commit message for all branches.
  [git-tools] Use env to find the correct paths to binaries.
  [git-tools] Display what parse errors were found.
  [git-tools] This script requires bash to run, so point directly to bash.
  [git-tools] Improvements for the pre-commit hook
  [git-tools] Improvements on prepare-commt-msg hook
  [git-tools] Some pre-commit enhancements, abolish tempfile
  [git-tools] use mktemp in pre-commit (thanks nn-)
  [git-tools] pre-commit hook for syntax checking
2010-04-04 15:04:28 +02:00