aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developIgor Wiedler2011-02-271-19/+27
|\ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10009] Entries are always posts, update fields accordingly. [ticket/10009] Always show 'published' data in feed item statistics. [ticket/10009] Make atom:update output unconditional and before atom:published [ticket/10009] Send atom:updated whenever possible [ticket/10009] Differentiate published from updated in Atom feed
| * Merge branch 'ticket/bantu/10009' into develop-olympusIgor Wiedler2011-02-271-19/+27
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/10009: [ticket/10009] Entries are always posts, update fields accordingly. [ticket/10009] Always show 'published' data in feed item statistics. [ticket/10009] Make atom:update output unconditional and before atom:published [ticket/10009] Send atom:updated whenever possible [ticket/10009] Differentiate published from updated in Atom feed
| | * [ticket/10009] Entries are always posts, update fields accordingly.Andreas Fischer2011-02-211-7/+5
| | | | | | | | | | | | PHPBB3-10009
| | * [ticket/10009] Always show 'published' data in feed item statistics.Andreas Fischer2011-02-211-2/+2
| | | | | | | | | | | | PHPBB3-10009
| | * [ticket/10009] Make atom:update output unconditional and before atom:publishedKevin Locke2011-02-211-9/+2
| | | | | | | | | | | | PHPBB3-10009
| | * [ticket/10009] Send atom:updated whenever possibleKevin Locke2011-02-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | For posts/topics which have not been edited/updated, use the creation date to populate atom:updated, as suggested by bantu. This should increase compatibility with user agents which expect an atom:updated element. PHPBB3-10009
| | * [ticket/10009] Differentiate published from updated in Atom feedKevin Locke2011-02-211-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the handling of dates to differentiate between the date when an entry was published and the date on which it was last updated. Incorporate this information into the Atom feed by using <published> and <updated> appropriately according to sections 4.2.9 and 4.2.15 of the spec. PHPBB3-10009
* | | Merge branch 'ticket/p/8641' into developAndreas Fischer2011-02-261-7/+7
|\ \ \ | | | | | | | | | | | | | | | | * ticket/p/8641: [ticket/8641] Added/removed several commas for consistency in acp_board.php.
| * | | [ticket/8641] Added/removed several commas for consistency in acp_board.php.mtrs2011-02-261-7/+7
| | | | | | | | | | | | | | | | PHPBB3-8641
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-261-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * develop-olympus: [ticket/10036] Use image from configuration file for displaying online-status.
| * | Merge branch 'ticket/nickvergessen/10036' into develop-olympusAndreas Fischer2011-02-261-1/+1
| |\ \ | | | | | | | | | | | | | | | | * ticket/nickvergessen/10036: [ticket/10036] Use image from configuration file for displaying online-status.
| | * | [ticket/10036] Use image from configuration file for displaying online-status.Joas Schilling2011-02-241-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10036
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-261-6/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/9912] Fix error in logic. Do not strip SID when user is not a bot.
| * | | [ticket/9912] Fix error in logic. Do not strip SID when user is not a bot.Andreas Fischer2011-02-251-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also moves the code up to the point where we know that the user is a bot. Regression from d07e152ea7e820c5a0e47aeb8004fa0b5621a314 PHPBB3-9912
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-247-56/+22
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9874] view_log() performs unneeded count query over all log entries. [ticket/7834] Topic time didn't update when first post was deleted [ticket/9997] Fixed an inconsistency in the Moderator Control Panel [ticket/9872] Removed some useless code that broke delete_posts
| * | | Merge branch 'ticket/callumacrae/7834' into develop-olympusOleg Pudeyev2011-02-241-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/callumacrae/7834: [ticket/7834] Topic time didn't update when first post was deleted
| | * | | [ticket/7834] Topic time didn't update when first post was deletedCallum Macrae2011-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the first post of a topic was deleted, the topic time didn't update - it should have changed to the time of the next post. This commit simply applies lefty74's patch posted in the ticket. It gets the post time of the next post from the database, and updates the thread accordingly. This patch is not my work at all and all credits go to lefty74, I just transferred it onto GitHub PHPBB3-7834
| * | | | 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 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 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
* | | | | 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
| * | | | [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 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 developOleg Pudeyev2011-02-201-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [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
* | | | [ticket/10045] Update version in some more files.Joas Schilling2011-02-1611-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | I did not include the docs/INSTALL.html, because we need to do a bit more on that file before releasing 3.1 (Add section how to update from 3.0 to 3.1, ...) PHPBB3-10045
* | | | [ticket/10045] Database updater version for 3.1-changes should be 3.1.0-devJoas Schilling2011-02-161-3/+5
| | | | | | | | | | | | | | | | PHPBB3-10045
* | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-02-131-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/8904] Show default value for numeric custom profile fields when editing
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-06 08:56:58 +0000