aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5' into feature/prune-usersOleg Pudeyev2011-05-080-0/+0
|\ | | | | | | | | | | | | | | * commit 'e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5': [ticket/9872] Removed some useless code that broke delete_posts These changes have already been applied in an earlier commit. Therefore this commit is empty. Merge was done using 'ours' strategy.
| * Merge branch 'ticket/callumacrae/9872' into develop-olympusOleg Pudeyev2011-02-241-38/+0
| |\ | | | | | | | | | | | | * ticket/callumacrae/9872: [ticket/9872] Removed some useless code that broke delete_posts
| | * [ticket/9872] Removed some useless code that broke delete_postsCallum Macrae2011-02-241-38/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When in the ACP, there is the option to delete a user and all their posts. This would then call the user_delete function and define $mode as 'remove'. On lines 485-521 was some code that would delete their topics, then after that there would be a call to delete_posts - which would also delete their topics. It would not update the board statistics, and the thread count would remain the same, even though several had been deleted. It stopped delete_topics functioning correctly, so delete_topics would not update the board statistics either. My solution to this is to delete lines 485-521 and allow delete_posts to call delete_topics, thus updating the thread count in the statistics. PHPBB3-9872
* | | Merge commit '47dc492839ea44cb9aa3d0ad23f09dd2fd0b4ed9' into feature/prune-usersOleg Pudeyev2011-05-081-2/+2
|\ \ \ | |/ / | | | | | | | | | * commit '47dc492839ea44cb9aa3d0ad23f09dd2fd0b4ed9': [ticket/9997] Fixed an inconsistency in the Moderator Control Panel
| * | Merge branch 'ticket/callumacrae/9997' into develop-olympusOleg Pudeyev2011-02-241-2/+2
| |\ \ | | | | | | | | | | | | | | | | * ticket/callumacrae/9997: [ticket/9997] Fixed an inconsistency in the Moderator Control Panel
| | * | [ticket/9997] Fixed an inconsistency in the Moderator Control PanelCallum Macrae2011-02-241-2/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The order of the Approve / Disapprove buttons was inconsistent in the Moderator Control Panel - while on the main page and the moderation queue itself the Approve button was to the right of the Disapprove button, in the post details the Approve button was to the left of the Disapprove button. This very simple edit simply switches the position of these two buttons in the post details page in the mcp. PHPBB3-9995
* | | Merge commit '441755bf170e49799e311c71b2123ff263970d62' into feature/prune-usersOleg Pudeyev2011-05-084-14/+18
|\ \ \ | |/ / | | | | | | | | | * commit '441755bf170e49799e311c71b2123ff263970d62': [ticket/9874] view_log() performs unneeded count query over all log entries.
| * | Merge branch 'ticket/nickvergessen/9874' into develop-olympusOleg Pudeyev2011-02-244-14/+18
| |\ \ | | | | | | | | | | | | | | | | * ticket/nickvergessen/9874: [ticket/9874] view_log() performs unneeded count query over all log entries.
| | * | [ticket/9874] view_log() performs unneeded count query over all log entries.Joas Schilling2011-02-254-14/+18
| | |/ | | | | | | | | | PHPBB3-9874
* | | [feature/prune-users] Adjust some language strings for new featuresJosh Woody2011-05-084-45/+161
| | | | | | | | | | | | | | | | | | | | | Adjust two language strings for ACP prune feature to include descriptions for new features. PHPBB3-9622
* | | [feature/prune-users] Apply e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5.Oleg Pudeyev2011-05-081-40/+1
| | | | | | | | | | | | | | | | | | This was done in PHPBB3-9872. PHPBB3-9622
* | | [feature/prune-users] Rework user_delete() functions_user.phpJosh Woody2011-05-083-126/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | user_delete now uses fewer queries to delete a set of users of size > 1 by accepting an array of users rather than a single user at a time. This required changing the third parameter, however the function retains its former behavior with the old-style parameters. PHPBB3-9622
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-02-241-0/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10058] Initialize $phpbb_root_path in mysql_upgrader.php.
| * | Merge branch 'ticket/p/10058' into develop-olympusIgor Wiedler2011-02-241-0/+1
| |\ \ | | |/ | |/| | | | | | | * ticket/p/10058: [ticket/10058] Initialize $phpbb_root_path in mysql_upgrader.php.
| | * [ticket/10058] Initialize $phpbb_root_path in mysql_upgrader.php.Oleg Pudeyev2011-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since knowledge base instructions tell users to place this script in the root of the forum, use './' as phpbb root path. Actual initialization code copied from check_flash_bbcodes.php. PHPBB3-10058
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-243-1/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10056] Corrected a typo in Firebird name. [ticket/10041] Use send_status_line more in download/file.php Conflicts: phpBB/download/file.php
| * | Merge branch 'ticket/p/10041' into develop-olympusAndreas Fischer2011-02-241-0/+12
| |\ \ | | | | | | | | | | | | | | | | * ticket/p/10041: [ticket/10041] Use send_status_line more in download/file.php
| | * | [ticket/10041] Use send_status_line more in download/file.phpOleg Pudeyev2011-02-231-0/+12
| | | | | | | | | | | | | | | | PHPBB3-10041
| * | | Merge branch 'ticket/p/10056' into develop-olympusAndreas Fischer2011-02-241-1/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | * ticket/p/10056: [ticket/10056] Corrected a typo in Firebird name.
| | * | [ticket/10056] Corrected a typo in Firebird name.Oleg Pudeyev2011-02-231-1/+1
| | |/ | | | | | | | | | PHPBB3-10056
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-2310-10/+21
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/7778] Update all the schema files [ticket/7778] Add the column change to `mysql_upgrader.php` [ticket/7778] BBCode single limit Conflicts: phpBB/install/database_update.php
| * | Merge branch 'ticket/erikfrerejean/7778' into develop-olympusOleg Pudeyev2011-02-2310-10/+20
| |\ \ | | |/ | |/| | | | | | | | | | | | | * ticket/erikfrerejean/7778: [ticket/7778] Update all the schema files [ticket/7778] Add the column change to `mysql_upgrader.php` [ticket/7778] BBCode single limit
| | * [ticket/7778] Update all the schema filesErik Frèrejean2011-02-235-5/+5
| | | | | | | | | | | | | | | | | | Correct all the schema files to contain the new field type PHPBB3-7778
| | * [ticket/7778] Add the column change to `mysql_upgrader.php`Erik Frèrejean2011-02-231-1/+1
| | | | | | | | | | | | PHPBB3-7778
| | * [ticket/7778] BBCode single limitErik Frèrejean2011-02-234-4/+14
| |/ | | | | | | | | | | | | | | | | | | | | | | | | There are currently two hard limits for the number of BBCodes allowed. One is enforced by the type of the `bbcode_id` column, the other by an hard limit in `acp/acp_bbcode.php`. However this limit can never be reached due to the size of the database column. Suggested fix involves adding a new constant to define the max. number of BBCodes (as with smilies) and chaning the database column from a tinyint to a smallint to actually allow 1511 BBCodes PHPBB3-7778
* | Merge branch 'develop-olympus' into developNils Adermann2011-02-246-78/+274
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/10052] Add comments to the session testable factory. [ticket/10052] Correct session tests, and separate session factory from tests
| * Merge branch 'ticket/naderman/10052' into develop-olympusNils Adermann2011-02-235-78/+218
| |\ | | | | | | | | | | | | | | | * ticket/naderman/10052: [ticket/10052] Add comments to the session testable factory. [ticket/10052] Correct session tests, and separate session factory from tests
| | * [ticket/10052] Add comments to the session testable factory.Nils Adermann2011-02-232-7/+60
| | | | | | | | | | | | PHPBB3-10052
| | * [ticket/10052] Correct session tests, and separate session factory from testsNils Adermann2011-02-235-78/+165
| | | | | | | | | | | | PHPBB3-10052
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-213-44/+237
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9675] Correctly check whether the style/component is still in use. [ticket/9675] Put the code into methods to avoid code duplication. [ticket/9675] Adjust the language-string to reflect the changes. [ticket/9675] Add option to delete template/theme/imageset when deleting style.
| * | Merge branch 'ticket/nickvergessen/9675' into develop-olympusOleg Pudeyev2011-02-213-44/+237
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | * ticket/nickvergessen/9675: [ticket/9675] Correctly check whether the style/component is still in use. [ticket/9675] Put the code into methods to avoid code duplication. [ticket/9675] Adjust the language-string to reflect the changes. [ticket/9675] Add option to delete template/theme/imageset when deleting style.
| | * [ticket/9675] Correctly check whether the style/component is still in use.Joas Schilling2011-02-081-28/+64
| | | | | | | | | | | | | | | | | | And don't allow to delete it in that case. PHPBB3-9675
| | * [ticket/9675] Put the code into methods to avoid code duplication.Joas Schilling2011-02-083-124/+162
| | | | | | | | | | | | PHPBB3-9675
| | * [ticket/9675] Adjust the language-string to reflect the changes.Joas Schilling2011-02-081-1/+1
| | | | | | | | | | | | PHPBB3-9675
| | * [ticket/9675] Add option to delete template/theme/imageset when deleting style.Joas Schilling2011-02-083-2/+121
| | | | | | | | | | | | PHPBB3-9675
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-203-12/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10049] Mark session init test incomplete for now. [ticket/10049] Mark session continue test incomplete for now. [ticket/10049] Globalize $_SID. [ticket/10049] Chase assertResultEquals rename. [ticket/10049] Fixed requires in session tests and mock. [ticket/10049] Renamed session test files to proper file names.
| * | Merge branch 'ticket/p/10049' into develop-olympusAndreas Fischer2011-02-203-12/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/p/10049: [ticket/10049] Mark session init test incomplete for now. [ticket/10049] Mark session continue test incomplete for now. [ticket/10049] Globalize $_SID. [ticket/10049] Chase assertResultEquals rename. [ticket/10049] Fixed requires in session tests and mock. [ticket/10049] Renamed session test files to proper file names.
| | * | [ticket/10049] Mark session init test incomplete for now.Oleg Pudeyev2011-02-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This test passes by itself but fails when run as part of the compete suite. Mark it incomplete to avoid breaking the suite. PHPBB3-10049
| | * | [ticket/10049] Mark session continue test incomplete for now.Oleg Pudeyev2011-02-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I am unable to find any code revision in which this test worked. Thus to not break the entire suite I mark it incomplete. PHPBB3-10049
| | * | [ticket/10049] Globalize $_SID.Oleg Pudeyev2011-02-191-0/+1
| | | | | | | | | | | | | | | | PHPBB3-10049
| | * | [ticket/10049] Chase assertResultEquals rename.Oleg Pudeyev2011-02-192-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd694e9b9dfd59c8be00a52b30db8e6c280b97a9 renamed assertResultEquals to assertSqlResultEquals. However, since the session tests were never executed calls in them were never updated. Parameter order also changed; chase that too. PHPBB3-10049
| | * | [ticket/10049] Fixed requires in session tests and mock.Oleg Pudeyev2011-02-193-8/+6
| | | | | | | | | | | | | | | | PHPBB3-10049
| | * | [ticket/10049] Renamed session test files to proper file names.Oleg Pudeyev2011-02-192-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phpunit.xml.dist specifies that only files ending in _test.php are test files; with the old names session tests were not run as a result. PHPBB3-10049
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-201-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10047] Do not put session id in URL on posting.php when cookies are on.
| * | | Merge branch 'ticket/bantu/10047' into develop-olympusOleg Pudeyev2011-02-201-2/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | * ticket/bantu/10047: [ticket/10047] Do not put session id in URL on posting.php when cookies are on.
| | * | [ticket/10047] Do not put session id in URL on posting.php when cookies are on.Andreas Fischer2011-02-191-2/+2
| |/ / | | | | | | | | | PHPBB3-10047
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-172-9/+35
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9944] Add empty line before the while() so you can better read the code [ticket/9944] Extension groups naming don't use users' language in ACP Conflicts: phpBB/install/database_update.php
| * | Merge branch 'ticket/nickvergessen/9944' into develop-olympusOleg Pudeyev2011-02-172-9/+35
| |\ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9944: [ticket/9944] Add empty line before the while() so you can better read the code [ticket/9944] Extension groups naming don't use users' language in ACP
| | * | [ticket/9944] Add empty line before the while() so you can better read the codeJoas Schilling2011-02-141-0/+1
| | | | | | | | | | | | | | | | PHPBB3-9944
| | * | [ticket/9944] Extension groups naming don't use users' language in ACPJoas Schilling2011-01-272-9/+34
| | |/ | | | | | | | | | | | | | | | Only happens on boards which were installed with 3.0.8 PHPBB3-9944
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 03:52:48 +0000