aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | [ticket/11301] Guidelines: Add spaces in front and after the / operator.Andreas Fischer2013-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11301
| * | | | | [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.Andreas Fischer2013-01-081-1/+1
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-11301
* | | | | Merge remote-tracking branch 'gn36/ticket/11292' into develop-olympusAndreas Fischer2013-01-061-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * gn36/ticket/11292: [ticket/11292] Fix: Newlines removed in display of PM reports
| * | | | | [ticket/11292] Fix: Newlines removed in display of PM reportsMartin Beckmann2012-12-241-0/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Report text is run through make_clickable and bbcode_nl2br for PMs just as it is for posts. PHPBB3-11292
* | | | | Merge remote-tracking branch 'p/ticket/11293' into develop-olympusAndreas Fischer2012-12-311-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11293: [ticket/11293] Add a note that mysqli should be in front of mysql.
| * | | | | [ticket/11293] Add a note that mysqli should be in front of mysql.Oleg Pudeyev2012-12-251-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | php 5.5 alpha 2 deprecated mysql extension, prefer mysqli if both are available. PHPBB3-11293
* | | | | Merge PR #1162 branch 'bantu/ticket/11291' into develop-olympusOleg Pudeyev2012-12-291-9/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11291: [ticket/11291] phing: Also add checkreturn="true" to composer execution. [ticket/11291] phing: Add checkreturn="true" to all new commands. [ticket/11291] phing: Exclude vendor folder from diffs. [ticket/11291] phing packaging: Export composer.phar and install dependencies. [ticket/11291] phing: Remove no longer needed create-package target. [ticket/11291] phing: The package target does not depend on composer. [ticket/11291] phing: Adjust directory format of composer exec. [ticket/11291] phing: Add description for composer target. [ticket/11291] phing: Add --dev to composer install. [ticket/11291] phing: Correct dependencies of composer target. [ticket/11291] phing: Make sure composer is available before calling it.
| * | | | | [ticket/11291] phing: Also add checkreturn="true" to composer execution.Andreas Fischer2012-12-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11291
| * | | | | [ticket/11291] phing: Add checkreturn="true" to all new commands.Andreas Fischer2012-12-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11291
| * | | | | [ticket/11291] phing: Exclude vendor folder from diffs.Andreas Fischer2012-12-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we end up with very huge diffs and the build process is severely slowed down. PHPBB3-11291
| * | | | | [ticket/11291] phing packaging: Export composer.phar and install dependencies.Andreas Fischer2012-12-291-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11291
| * | | | | [ticket/11291] phing: Remove no longer needed create-package target.Andreas Fischer2012-12-291-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11291
| * | | | | [ticket/11291] phing: The package target does not depend on composer.Andreas Fischer2012-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The packaging process does not require running composer in the phpBB tree. It does however require running composer on the git exports, but this is not what the composer target does. PHPBB3-11291
| * | | | | [ticket/11291] phing: Adjust directory format of composer exec.Andreas Fischer2012-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust the directory format to what all the other exec calls are using. PHPBB3-11291
| * | | | | [ticket/11291] phing: Add description for composer target.Andreas Fischer2012-12-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11291
| * | | | | [ticket/11291] phing: Add --dev to composer install.Andreas Fischer2012-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The composer target runs composer in the phpBB tree in order to load dependencies for testing. The testing framework may have additional development dependencies (e.g. goutte). We also have to load those. PHPBB3-11291
| * | | | | [ticket/11291] phing: Correct dependencies of composer target.Andreas Fischer2012-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This command runs composer in the phpBB tree and does not write to the build folders. Thus, it does not have to depend on prepare and clean targets. PHPBB3-11291
| * | | | | [ticket/11291] phing: Make sure composer is available before calling it.Andreas Fischer2012-12-231-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older versions of the tree didn't use it. PHPBB3-11291
* | | | | | Merge remote-tracking branch 'p/ticket/11294' into develop-olympusAndreas Fischer2012-12-261-2/+19
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11294: [ticket/11294] Capitalize phpunit. [ticket/11294] Update required/optional extension list for olympus.
| * | | | | [ticket/11294] Capitalize phpunit.Oleg Pudeyev2012-12-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11294
| * | | | | [ticket/11294] Update required/optional extension list for olympus.Oleg Pudeyev2012-12-251-1/+18
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-11294
* | | | | [develop-olympus] Set build version (and thus package name) to 3.0.12-dev.Andreas Fischer2012-12-231-3/+3
|/ / / / | | | | | | | | | | | | | | | | This is so generated packages are not confused with the already-released 3.0.11 version.
* | | | Merge PR #1152 branch 'nickvergessen/ticket/11278' into develop-olympusOleg Pudeyev2012-12-221-17/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11278: [ticket/11278] Comment out the code for dropping the Q&A tables [ticket/11278] Fix not running queries from db tools in database update
| * | | | [ticket/11278] Comment out the code for dropping the Q&A tablesJoas Schilling2012-12-211-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a bug, vanilla phpbb could not create captcha tables in 3.0.8 on firebird. It was possible for board administrators to adjust the code to work. If code was manually adjusted by board administrators, index names would not be the same as what 3.0.9 and newer expect. This code fragment drops captcha tables, destroying all entered Q&A captcha configuration, such that when Q&A is configured next the respective tables will be created with corrent index names. If you wish to preserve your Q&A captcha configuration, you can manually rename indexes to the currently expected name: phpbb_captcha_questions_lang_iso => phpbb_captcha_question_lang phpbb_captcha_answers_question_id => phpbb_captcha_answers_qid Again, this needs to be done only if a board was manually modified to fix broken captcha code. PHPBB3-11278
| * | | | [ticket/11278] Fix not running queries from db tools in database updateJoas Schilling2012-12-191-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The db_tools class is running in return mode, which means that the queries are not run, but just returned. Therefor the broken tables were not removed from the database. PHPBB3-11278
* | | | | Merge remote-tracking branch 'p/ticket/11285' into develop-olympusAndreas Fischer2012-12-201-7/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11285: [ticket/11285] Use more granularity in dependency checks in compress test
| * | | | | [ticket/11285] Use more granularity in dependency checks in compress testOleg Pudeyev2012-12-201-7/+18
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Some of the tests can be run without zlib or bz2 extensions present. PHPBB3-11285
* | | | | Merge remote-tracking branch 'p/ticket/10880' into develop-olympusAndreas Fischer2012-12-202-5/+7
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | * p/ticket/10880: [ticket/10880] The m_approve permisson no longer implies f_noapprove.
| * | | | [ticket/10880] The m_approve permisson no longer implies f_noapprove.Andreas Fischer2012-12-192-5/+7
|/ / / / | | | | | | | | | | | | PHPBB3-10880
* | | | Merge PR #1140 branch 'EXreaction/ticket/8610' into develop-olympusOleg Pudeyev2012-12-164-58/+168
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/8610: [ticket/8610] Update comment [ticket/8610] Do not use requests to submit posts except in posting_test.php [ticket/8610] Move posting helpers to separate file [ticket/8610] Create helper functions to create topic/post in functional tests [ticket/8610] Use phpbb_update_rows_avoiding_duplicates [ticket/8610] Revert some funky merging I did from rebase [ticket/8610] Add some comments [ticket/8610] Update Bookmarks and Subscriptions when splitting topics [ticket/8610] Update Bookmarks when merging posts into another topic [ticket/8610] Update Bookmarks when forking topics [ticket/8610] Update Bookmarks when merging topics
| * | | | [ticket/8610] Update commentNathan Guse2012-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-8610
| * | | | [ticket/8610] Do not use requests to submit posts except in posting_test.phpNathan Guse2012-12-153-137/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving my functional test functions from posting_helpers.php to posting_test.php since it is a bit nicer and more reusable if posting_test.php is to be expanded in the future. PHPBB3-8610
| * | | | [ticket/8610] Move posting helpers to separate fileNathan Guse2012-12-133-105/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to prevent cluttering up the functional test case class more PHPBB3-8610
| * | | | [ticket/8610] Create helper functions to create topic/post in functional testsNathan Guse2012-12-132-78/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be used to test splitting/copying/merging/etc in functional tests Also convert functional posting_test.php to use these functions PHPBB3-8610
| * | | | Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610Nathan Guse2012-12-1312-45/+693
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (29) and others # Via Andreas Fischer (3) and others * 'develop-olympus' of github.com:phpbb/phpbb3: (36 commits) [ticket/11262] Add .lock in cache directory to .gitignore [ticket/11265] Add assertions for board installation success. [ticket/11162] Reformat. [ticket/10491] Make recreate_database static. [ticket/11162] Rename tricky updates to database helper. [ticket/10491] Install board once per test run. [ticket/10972] Drop user deletion. [ticket/10972] Tweak user addition. [ticket/10972] Add destroy method to mock cache. [ticket/10972] Add mock null cache. [ticket/10972] Backport get_db from develop. [ticket/10972] Added explicit checks for creating duplicate users. [ticket/10972] Moved tests into appropriate places and added comments [ticket/10972] Added methods for creating and deleting basic users [ticket/11162] Use empty($queries). [ticket/11162] Review comments fixed. [ticket/11162] Reformat. [ticket/11162] Newlines to LF. [ticket/11162] Use correct functions. [ticket/11162] Account for notify_status. ... Conflicts: phpBB/includes/mcp/mcp_topic.php
* | | | | Merge remote-tracking branch 'p/ticket/11162' into develop-olympusAndreas Fischer2012-12-147-13/+516
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11162: (22 commits) [ticket/11162] Reformat. [ticket/11162] Rename tricky updates to database helper. [ticket/11162] Use empty($queries). [ticket/11162] Review comments fixed. [ticket/11162] Reformat. [ticket/11162] Newlines to LF. [ticket/11162] Use correct functions. [ticket/11162] Account for notify_status. [ticket/11162] This test really only works for bookmarks. [ticket/11162] The test is not at all trivial. [ticket/11162] Add includes. [ticket/11162] Move to a separate file to avoid blowing out functions.php. [ticket/11162] No whitespace changes in olympus. [ticket/11162] Fix inaccurately copy pasted comment. [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp. [ticket/11162] Clarify that only the two tables actually work. [ticket/11162] Uncomment transactions. [ticket/11162] An implementation that actually works. [ticket/11162] Make count function upper case. [ticket/11162] Rename count variable name to remaining_rows. ...
| * | | | | [ticket/11162] Reformat.Oleg Pudeyev2012-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| * | | | | [ticket/11162] Rename tricky updates to database helper.Oleg Pudeyev2012-12-127-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| * | | | | [ticket/11162] Use empty($queries).Oleg Pudeyev2012-12-051-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| * | | | | [ticket/11162] Review comments fixed.Oleg Pudeyev2012-12-052-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| * | | | | [ticket/11162] Reformat.Oleg Pudeyev2012-12-051-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| * | | | | [ticket/11162] Newlines to LF.Oleg Pudeyev2012-12-051-208/+208
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| * | | | | [ticket/11162] Use correct functions.Oleg Pudeyev2012-12-052-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| * | | | | [ticket/11162] Account for notify_status.Oleg Pudeyev2012-12-053-10/+239
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| * | | | | [ticket/11162] This test really only works for bookmarks.Oleg Pudeyev2012-12-043-3/+50
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| * | | | | [ticket/11162] The test is not at all trivial.Oleg Pudeyev2012-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| * | | | | [ticket/11162] Add includes.Oleg Pudeyev2012-12-042-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| * | | | | [ticket/11162] Move to a separate file to avoid blowing out functions.php.Oleg Pudeyev2012-12-044-88/+104
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| * | | | | [ticket/11162] No whitespace changes in olympus.Oleg Pudeyev2012-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11162
| * | | | | [ticket/11162] Fix inaccurately copy pasted comment.Oleg Pudeyev2012-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11162
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 01:11:02 +0000