aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Tristan Darricau2015-10-193-4/+7
|\ | | | | | | | | | | | | | | * 3.1.x: [ticket/13799] Split lines in HTML files for better readability [ticket/13799] Add missing space before checked attribute [ticket/13799] Correctly urlencode category and show selected avatar [ticket/13799] Do not rawurlencode category in gallery avatar
| * Merge pull request #3647 from marc1706/ticket/13799Tristan Darricau2015-10-194-5/+12
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13799] Do not rawurlencode category in gallery avatar * marc1706/ticket/13799: [ticket/13799] Split lines in HTML files for better readability [ticket/13799] Add missing space before checked attribute [ticket/13799] Correctly urlencode category and show selected avatar [ticket/13799] Do not rawurlencode category in gallery avatar
| | * [ticket/13799] Split lines in HTML files for better readabilityMarc Alexander2015-06-042-2/+7
| | | | | | | | | | | | PHPBB3-13799
| | * [ticket/13799] Add missing space before checked attributeMarc Alexander2015-06-042-2/+2
| | | | | | | | | | | | PHPBB3-13799
| | * [ticket/13799] Correctly urlencode category and show selected avatarMarc Alexander2015-05-304-5/+7
| | | | | | | | | | | | PHPBB3-13799
| | * [ticket/13799] Do not rawurlencode category in gallery avatarMarc Alexander2015-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | Otherwise the directory seperator will incorrectly be transformed to its HTML replacement. PHPBB3-13799
* | | Merge branch '3.1.x'Tristan Darricau2015-10-191-0/+11
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/9252] Do not try to disapprove a post that was just approved
| * | Merge pull request #3666 from marc1706/ticket/9252Tristan Darricau2015-10-191-0/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/9252] Do not try to disapprove a post that was just approved * marc1706/ticket/9252: [ticket/9252] Do not try to disapprove a post that was just approved
| | * | [ticket/9252] Do not try to disapprove a post that was just approvedMarc Alexander2015-05-301-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this change, posts that are approved by someone right before another moderator is trying to disapprove a post are actually deleted instead of disapproved. PHPBB3-9252
* | | | Merge branch '3.1.x'Marc Alexander2015-10-183-2/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/memberlist_body.html phpBB/styles/subsilver2/template/memberlist_team.html
| * | | Merge pull request #3993 from DavidIQ/ticket/10343Marc Alexander2015-10-185-4/+5
| |\ \ \ | | | | | | | | | | | | | | | [ticket/10343] Show clearer indication an account is inactive in memberlist
| | * | | [ticket/10343] Add inactive indicator to subsilver2 memberlistDavidIQ2015-10-172-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10343
| | * | | [ticket/10343] Show clearer indication an account is inactive in memberlistDavidIQ2015-10-173-2/+3
| |/ / / | | | | | | | | | | | | PHPBB3-10343
* | | | Merge pull request #3994 from prototech/ticket/14174Máté Bartus2015-10-181-2/+2
|\ \ \ \ | | | | | | | | | | [ticket/14174] Refine wording of error descriptions in new installer.
| * | | | [ticket/14174] Refine wording of error descriptions in new installer.Cesar G2015-10-171-2/+2
|/ / / / | | | | | | | | | | | | PHPBB3-14174
* | | | Merge pull request #3992 from Nicofuma/ticket/14243Máté Bartus2015-10-171-71/+70
|\ \ \ \ | | | | | | | | | | [ticket/14243] Exclude every .git directory from the pakages
| * | | | [ticket/14243] Exclude every .git directory from the pakagesTristan Darricau2015-10-171-71/+70
|/ / / / | | | | | | | | | | | | PHPBB3-14243
* | | | Merge pull request #3991 from Nicofuma/ticket/14243Máté Bartus2015-10-171-27/+28
|\ \ \ \ | | | | | | | | | | [ticket/14243] Exclude every .git directory from the pakages
| * | | | [ticket/14243] Exclude every .git directory from the pakagesTristan Darricau2015-10-171-27/+28
|/ / / / | | | | | | | | | | | | PHPBB3-14243
* | | | Merge pull request #3986 from CHItA/ticket/14240Tristan Darricau2015-10-172-2/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14240] Fix packaging script for 3.2 * CHItA/ticket/14240: [ticket/14240] Fix packaging script for 3.2
| * | | | [ticket/14240] Fix packaging script for 3.2Mate Bartus2015-10-152-2/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-14240
* | | | | Merge pull request #3990 from CHItA/ticket/13371Tristan Darricau2015-10-171-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13371] Fix language loading for the old installer * CHItA/ticket/13371: [ticket/13371] Add language files to the service as well [ticket/13371] Use user selected language in old installer [ticket/13371] Fix language loading for the old installer
| * | | | | [ticket/13371] Add language files to the service as wellMate Bartus2015-10-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13371
| * | | | | [ticket/13371] Use user selected language in old installerMate Bartus2015-10-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13371
| * | | | | [ticket/13371] Fix language loading for the old installerMate Bartus2015-10-171-0/+1
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-13371
* | | | | Merge branch '3.1.x'Marc Alexander2015-10-178-9/+9
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/phpbb/notification/type/bookmark.php phpBB/phpbb/notification/type/post.php phpBB/phpbb/notification/type/quote.php
| * | | | Merge pull request #3985 from prototech/ticket/13892Marc Alexander2015-10-178-10/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13892] Respect "Someone reports a post" notification setting.
| | * | | | [ticket/13892] Replace other uses of self with static.Cesar G2015-10-157-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13892
| | * | | | [ticket/13892] Respect "Someone reports a post" notification setting.Cesar G2015-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | report_post inherits from post_in_queue, therefore using self:: instead of static:: results in the incorrect notification type being used to determine which users to exclude from the notification. PHPBB3-13892
* | | | | | Merge branch '3.1.x'Marc Alexander2015-10-173-33/+8
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Merge pull request #3987 from prototech/ticket/13945Marc Alexander2015-10-173-33/+8
| |\ \ \ \ | | |/ / / | |/| | | | | | | | [ticket/13945] Send reactivation requests to admins using notifications system.
| | * | | [ticket/13945] Send reactivation requests to admins using notifications system.Cesar G2015-10-153-33/+8
| |/ / / | | | | | | | | | | | | PHPBB3-13945
* | | | Merge branch '3.1.x'Marc Alexander2015-10-151-0/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #3984 from prototech/ticket/12616Marc Alexander2015-10-151-0/+1
| |\ \ \ | | | | | | | | | | | | | | | [ticket/12616] Remove report notifications when post is deleted/disapproved.
| | * | | [ticket/12616] Remove report notifications when post is deleted/disapproved.Cesar G2015-10-141-0/+1
| |/ / / | | | | | | | | | | | | PHPBB3-12616
* | | | Merge pull request #3970 from prototech/ticket/13789Marc Alexander2015-10-157-173/+69
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13789] Upgrade reCaptcha plugin to 2.0 API.
| * | | | [ticket/13789] Update composer.lock.Cesar G2015-10-141-4/+49
| | | | | | | | | | | | | | | | | | | | PHPBB3-13789
| * | | | [ticket/13789] Upgrade reCaptcha plugin to 2.0 API.Cesar G2015-10-146-169/+20
|/ / / / | | | | | | | | | | | | PHPBB3-13789
* | | | Merge pull request #3982 from Nicofuma/ticket/13652Cesar G2015-10-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13652] Fix coding style
| * | | | [ticket/13652] Fix coding styleTristan Darricau2015-10-141-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-13652
* | | | Merge pull request #3981 from ErnadoO/ticket/14235Tristan Darricau2015-10-141-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14235] Font Awesome in simple_header.html * ErnadoO/ticket/14235: [ticket/14235] Font Awesome in simple_header.html
| * | | | [ticket/14235] Font Awesome in simple_header.htmlErwan Nader2015-10-141-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14235
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-142-12/+26
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | * 3.1.x: [ticket/14159] Hide version info on ACP if we don't have the permission
| * | | Merge pull request #3900 from Zoddo/ticket/14159Tristan Darricau2015-10-142-11/+25
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14159] Hide version info on ACP if we don't have the permission * Zoddo/ticket/14159: [ticket/14159] Hide version info on ACP if we don't have the permission
| | * | | [ticket/14159] Hide version info on ACP if we don't have the permissionZoddo2015-09-122-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also hide a link to an unreachable module (Check phpBB version). We could have simply remove the link to the module, but if the user hasn't the permission to access to the phpBB version check module, I think that he shouldn't view any version information about phpBB. PHPBB3-14159
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-141-1/+15
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/14192] Add core.memberlist_memberrow_before event
| * | | | Merge pull request #3926 from Senky/ticket/14192Tristan Darricau2015-10-141-1/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14192] Add core.memberlist_memberrow_before event * Senky/ticket/14192: [ticket/14192] Add core.memberlist_memberrow_before event
| | * | | | [ticket/14192] Add core.memberlist_memberrow_before eventJakub Senko2015-10-121-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14192
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-10-144-5/+18
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/10343] Add a distinction for inactive users on memberlist [ticket/10343] Allows a_user to show inactive accounts in memberlist
| * | | | | Merge pull request #3935 from Zoddo/ticket/10343Tristan Darricau2015-10-144-5/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10343] Allows a_user to show inactive accounts in memberlist * Zoddo/ticket/10343: [ticket/10343] Add a distinction for inactive users on memberlist [ticket/10343] Allows a_user to show inactive accounts in memberlist
generated by cgit v1.2.1 (git 2.21.0) at 2025-10-10 04:27:40 +0000