aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10070] Fixed line endings after ticket/9549.Oleg Pudeyev2011-03-012-708/+708
| | | | PHPBB3-10070
* Merge branch 'ticket/9549' into developOleg Pudeyev2011-03-0123-237/+908
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/9549: [ticket/9549] Display users in their primary group instead of their first group [ticket/9549] Change default value of "sort legend by group name" to false. [ticket/9549] Fix displaying empty groups [ticket/9549] Fix language strings. [ticket/9549] Only add group to legend/teampage when the checkbox is checked. [ticket/9549] New method move() to move a group more than 1 up/down. [ticket/9549] Fix some minor issues with descriptions and coding-guidelines. [ticket/9549] Throw an error when the given field-name is invalid. [ticket/9549] Make the class non static and extend delete_group function. [ticket/9549] Add template changes for subsilver2. [ticket/9549] Enhance teampage and legend functionality [ticket/9549] Add the module and files for the ACP. [ticket/9549] Update database with the new config values and columns [ticket/9549] Enhance teampage functionality with a new class, group_positions. Conflicts: phpBB/install/database_update.php
| * [ticket/9549] Display users in their primary group instead of their first groupJoas Schilling2011-02-252-1/+6
| | | | | | | | PHPBB3-9549
| * [ticket/9549] Change default value of "sort legend by group name" to false.Joas Schilling2011-02-242-2/+2
| | | | | | | | PHPBB3-9549
| * [ticket/9549] Fix displaying empty groupsJoas Schilling2011-02-241-15/+20
| | | | | | | | PHPBB3-9549
| * [ticket/9549] Fix language strings.Joas Schilling2011-02-181-4/+4
| | | | | | | | PHPBB3-9549
| * [ticket/9549] Only add group to legend/teampage when the checkbox is checked.Joas Schilling2011-02-172-2/+6
| | | | | | | | | | | | The checkbox for the teampage was also missing from the template file. PHPBB3-9549
| * [ticket/9549] New method move() to move a group more than 1 up/down.Joas Schilling2011-02-161-24/+35
| | | | | | | | PHPBB3-9549
| * [ticket/9549] Fix some minor issues with descriptions and coding-guidelines.Joas Schilling2011-02-163-9/+8
| | | | | | | | PHPBB3-9549
| * [ticket/9549] Throw an error when the given field-name is invalid.Joas Schilling2011-02-162-5/+21
| | | | | | | | | | | | Also the code now only appends an adm_back_link, when we are in the ACP. PHPBB3-9549
| * [ticket/9549] Make the class non static and extend delete_group function.Joas Schilling2011-02-164-99/+122
| | | | | | | | | | | | | | delete_group() can now be used, so it does not update the actual group. This can save a query, when you update the group anyway. PHPBB3-9549
| * [ticket/9549] Add template changes for subsilver2.Joas Schilling2011-02-161-36/+15
| | | | | | | | PHPBB3-9549
| * [ticket/9549] Enhance teampage and legend functionalityJoas Schilling2011-02-164-186/+156
| | | | | | | | PHPBB3-9549
| * [ticket/9549] Add the module and files for the ACP.Joas Schilling2011-02-166-0/+368
| | | | | | | | PHPBB3-9549
| * [ticket/9549] Update database with the new config values and columnsJoas Schilling2011-02-1610-17/+89
| | | | | | | | PHPBB3-9549
| * [ticket/9549] Enhance teampage functionality with a new class, group_positions.Joas Schilling2011-02-161-0/+220
| | | | | | | | PHPBB3-9549
* | Merge branch 'feature/igorw/request-class' into developAndreas Fischer2011-03-011-1/+1
|\ \ | | | | | | | | | | | | * feature/igorw/request-class: [feature/request-class] Fix the error message when accessing superglobal
| * | [feature/request-class] Fix the error message when accessing superglobalIgor Wiedler2011-02-281-1/+1
| | | | | | | | | | | | | | | | | | Adjust the misleading "This error message was generated" text. PHPBB3-9716
* | | Merge branch 'ticket/nickvergessen/7938' into developOleg Pudeyev2011-02-281-1/+1
|\ \ \ | |/ / |/| | | | | | | | * ticket/nickvergessen/7938: [ticket/7938] Display information about unread and new PMs in the header.
| * | [ticket/7938] Display information about unread and new PMs in the header.Joas Schilling2011-03-011-1/+1
| | | | | | | | | | | | PHPBB3-7938
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-02-281-0/+1
|\ \ \ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10024] Populate unread information to template for styling issues.
| * \ \ Merge branch 'ticket/nickvergessen/10024' into develop-olympusIgor Wiedler2011-02-281-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/10024: [ticket/10024] Populate unread information to template for styling issues.
| | * | | [ticket/10024] Populate unread information to template for styling issues.Philippe Chevrier2011-02-281-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10024
* | | | | Merge branch 'ticket/hanakin/10001' into developIgor Wiedler2011-02-2815-9/+70
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | * ticket/hanakin/10001: [ticket/10001] Created the new styles within colours.css to handle the displaying of the forum & topic images [ticket/10001] Created new Template variable to house class names based on $folder_img value, Modified prosilver template files to utilize class for forum & topic images through out template via the newly created Template variable, Created the new styles within colours.css to handle the displaying of the forum & topic images
| * | | | [ticket/10001] Created the new styles within colours.css to handle the ↵hanakin2011-01-181-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | displaying of the forum & topic images * Created the new styles within colours.css to handle the displaying of the forum & topic images - NOTES: This changes are the first step in the revamp of prosilver initiative, this provides the ground work to handle the images via sprites to reduce the amount of HTTP requests by the server PHPBB3-10001
| * | | | [ticket/10001] Created new Template variable to house class names based on ↵hanakin2011-01-1814-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $folder_img value, Modified prosilver template files to utilize class for forum & topic images through out template via the newly created Template variable, Created the new styles within colours.css to handle the displaying of the forum & topic images * Created new Template variable to house class names based on $folder_img value in functions_display.php. * Created new Template variable to house class names based on $folder_img value in mcp_forums.php. * Created new Template variable to house class names based on $folder_img value in ucp_main.php. * Created new Template variable to house class names based on $folder_img value in search.php. * Created new Template variable to house class names based on $folder_img value in ucp_pm_viewfolder.php. * Created new Template variable to house class names based on $folder_img value in search.php. * Created new Template variable to house class names based on $folder_img value in viewforum.php. * Modified forumlist_body.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified mcp_forum.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified search_results.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified ucp_main_bookmarks.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified ucp_main_subscribed.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified ucp_main_front.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified ucp_pm_viewfolder.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified viewforum_body.html to utilize class for forum & topic images through out template via the newly created Template variable * Created the new styles within colours.css to handle the displaying of the forum & topic images - NOTES: This changes are the first step in the revamp of prosilver initiative, this provides the ground work to handle the images via sprites to reduce the amount of HTTP requests by the server PHPBB3-10001
* | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-02-277-9/+9
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * develop-olympus: [ticket/9980] URLs to javascript should be T_SUPER_TEMPLATE_PATH instead of T_TEMPLATE_PATH
| * | | | Merge branch 'ticket/raimon/9980' into develop-olympusIgor Wiedler2011-02-277-9/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/raimon/9980: [ticket/9980] URLs to javascript should be T_SUPER_TEMPLATE_PATH instead of T_TEMPLATE_PATH
| | * | | | [ticket/9980] URLs to javascript should be T_SUPER_TEMPLATE_PATH instead of ↵Raimon2011-01-087-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | T_TEMPLATE_PATH PHPBB3-9980
* | | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 03:45:34 +0000