aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/9530] Subsilver2 is missing BBCode-less quotes fallback-option when ↵Joas Schilling2010-05-163-1/+61
| | | | | | bbcodes are disabled. PHPBB3-9530
* 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
| | | | | |
| * | | | | [bug/58745] Correctly close user-delete-form in ACP User Overview (Bug #58745)Joas Schilling2010-04-032-1/+2
| | | | | |
* | | | | | Merge branch 'bug/nickvergessen/58695' into develop-olympusNils Adermann2010-04-042-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | [bug/58695] Use method to get forums where user is moderator, thanks to ↵Joas Schilling2010-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | bantu for the hint
| * | | | | | [bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695)Joas Schilling2010-04-032-2/+3
| | | | | | |
* | | | | | | Merge branch 'feature/evil3/git-tools' into develop-olympusNils Adermann2010-04-042-6/+88
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | [git-tools] add note about PHP_BIN using envIgor Wiedler2010-04-031-0/+1
| | | | | | |
| * | | | | | [git-tools] do not display stderrIgor Wiedler2010-04-031-1/+1
| | | | | | |
| * | | | | | Merge branch 'develop-olympus' into git-toolsIgor Wiedler2010-04-0314-27/+678
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'feature/dbal-tests' into develop-olympusNils Adermann2010-04-021-3/+5
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * feature/dbal-tests: [feature/dbal-tests] Remove hardcoded 'mysql' from PDO DSN in DBAL test. [feature/dbal-tests] Fix mysql (not mysqli) dbal test.
| * | | | | | [feature/dbal-tests] Remove hardcoded 'mysql' from PDO DSN in DBAL test.Andreas Fischer2010-04-021-1/+1
| | | | | | |
| * | | | | | [feature/dbal-tests] Fix mysql (not mysqli) dbal test.Andreas Fischer2010-04-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly determine MySQL version from the database.
* | | | | | | Merge branch 'bug/bantu/9108' into develop-olympusNils Adermann2010-04-012-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug/bantu/9108: [bug/9108] Fix table binding issues with PostgreSQL in board-wide feed. (Old Bug #58425) Conflicts: phpBB/docs/CHANGELOG.html
| * | | | | | | [bug/9108] Fix table binding issues with PostgreSQL in board-wide feed. (Old ↵Andreas Fischer2010-04-012-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #58425) The order in the FROM clause is important. The posts table has to be the last one in the chain, so it can be correctly bound with the forums table in the LEFT JOIN. This only affects the overall feed (board-wide feed). All the other feeds are unaffected.
* | | | | | | | Merge branch 'feature/dbal-tests' into develop-olympusNils Adermann2010-04-018-20/+665
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * feature/dbal-tests: [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. [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
| * | | | | | | [feature/dbal-tests] Only output the missing config error message once.Nils Adermann2010-04-011-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error message was also not properly escaping the variables, thus producing an incorrect example configuration file.
| * | | | | | | [feature/dbal-tests] Make the PDO prefix depend on the dbms.Nils Adermann2010-04-011-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The database base test will need a few more changes to run on all the databases we support. But those really need to be made on a system where they run and can be tested. Patches welcome!
| * | | | | | | [feature/dbal-tests] Fix whitespace and line endings.Nils Adermann2010-04-012-21/+21
| | | | | | | |
| * | | | | | | [feature/dbal-tests] Make some tests for build_array_data on SELECTJoas Schilling2010-03-272-4/+114
| | | | | | | |
| * | | | | | | [feature/dbal-tests] Make some tests for return_on_error on SELECT-queriesJoas Schilling2010-03-261-8/+208
| | | | | | | |
| * | | | | | | [feature/dbal-tests] Tests for $db->sql_query_limit()Joas Schilling2010-03-262-1/+47
| | | | | | | |
| * | | | | | | [feature/dbal-tests] Load phpbb-schema after creating the connection to the ↵Joas Schilling2010-03-262-3/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | database
| * | | | | | | [feature/dbal-tests] Added tests for dbal fetchrow and fetchfield.Joas Schilling2010-03-264-0/+100
| | | | | | | |
| * | | | | | | [feature/dbal-tests] Added database test & refactored test frameworkJoas Schilling2010-03-264-20/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is now a phpbb_database_test_case which can be used as a base class for tests that require database access. You have to set up a test_config.php file in your tests/ directory containing host, user, pass etc. Extra test functionality has been moved to phpbb_test_case_helpers to provide the same functionality in database tests and regular tests without duplicating the code. This is achieved through delegation of method calls.
* | | | | | | | Merge branch 'bug/nickvergessen/59135' into develop-olympusNils Adermann2010-04-013-4/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug/nickvergessen/59135: [bug/59135] Fix open_basedir issues when accessing styles- and language-management. (Bug #59135) Conflicts: phpBB/docs/CHANGELOG.html
| * | | | | | | [bug/59135] Fix open_basedir issues when accessing styles- and ↵Joas Schilling2010-03-133-4/+5
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | language-management. (Bug #59135) introduced in r10496 and r10360/r10361
* | | | | | | Merge branch 'bug/kellanved/59425' into develop-olympusNils Adermann2010-03-282-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug/kellanved/59425: [bug/59425] Correctly check for double inclusion in captcha garbage collection
| * | | | | | | [bug/59425] Correctly check for double inclusion in captcha garbage collectionU-H-PC\H2010-03-282-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check to avoid the double inclusion of the captcha factory class in the garbage collection code was faulty, checking for "captcha_factory" instead of "phpbb_captcha_factory". TerryE pointed the problem out, thanks!
* | | | | | | | Merge branch 'bug/kellanved/58465' into develop-olympusNils Adermann2010-03-282-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * bug/kellanved/58465: [bug/58465] The redirect hidden field is now XHTML conform