aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * [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
* | [ticket/14174] Refine wording of error descriptions in new installer.Cesar G2015-10-171-2/+2
| | | | | | | | PHPBB3-14174
* | Merge pull request #3986 from CHItA/ticket/14240Tristan Darricau2015-10-171-0/+1
|\ \ | | | | | | | | | | | | | | | | | | [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-151-0/+1
| | | | | | | | | | | | PHPBB3-14240
* | | [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
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | [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
|\ \ | |/
| * [ticket/12616] Remove report notifications when post is deleted/disapproved.Cesar G2015-10-141-0/+1
| | | | | | | | PHPBB3-12616
* | [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
* | [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
| | * | | [ticket/10343] Add a distinction for inactive users on memberlistZoddo2015-10-124-6/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-10343
| | * | | [ticket/10343] Allows a_user to show inactive accounts in memberlistZoddo2015-09-271-1/+7
| | |/ / | | | | | | | | | | | | PHPBB3-10343
* | | | Merge branch '3.1.x'Tristan Darricau2015-10-141-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/13851] Fix ignore flood limit check
| * | | Merge pull request #3978 from RMcGirr83/ticket_13851Tristan Darricau2015-10-141-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13851] Fix ignore flood limit check * RMcGirr83/ticket_13851: [ticket/13851] Fix ignore flood limit check
| | * | | [ticket/13851] Fix ignore flood limit checkRichard McGirr2015-10-141-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13851
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-141-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
| * | | | Merge pull request #3979 from prototech/ticket/9153Tristan Darricau2015-10-141-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/9153] Allow users without u_sendpm permission to delete existing PM's * prototech/ticket/9153: [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
| | * | | | [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.Cesar G2015-10-141-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The u_sendpm check in ucp_pm.php is merely for the purpose of displaying the error message within the UCP template. Otherwise it could be removed as compose_pm() will check the appropriate permission pertaining to the attempted action. PHPBB3-9153
* | | | | Merge pull request #3441 from brunoais/feature/sql-bool-builderTristan Darricau2015-10-141-1/+136
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [feature/sql-bool-builder] Extending DBAL query builder for boolean generation * brunoais/feature/sql-bool-builder: [feature/sql-bool-builder] Improved tests output to show the SQL error. [feature/sql-bool-builder] Adding the IS operator to predicted operators [feature/sql-bool-builder] test_single_not_like [feature/sql-bool-builder] test_single_like [feature/sql-bool-builder] test_single_not_in [feature/sql-bool-builder] test_single_in [feature/sql-bool-builder] test_and_of_or_of_and [feature/sql-bool-builder] test_triple_and_with_in [feature/sql-bool-builder] test_double_and_with_not_of_and [feature/sql-bool-builder] test_triple_and_with_is_null [feature/sql-bool-builder] Prepare testing class [feature/sql-bool-builder] Added LIKE and NOT_LIKE to the comparations [feature/sql-bool-builder] Explain better the code in the first [feature/sql-bool-builder] Also use parenthesis for the NOT operator [feature/sql-bool-builder] AS keyword must be lowercase; [feature/sql-bool-builder] Added code to use this feature for the WHERE clause [feature/sql-bool-builder] Removed non-necessary spaces [feature/sql-bool-builder] First working version
| * | | | | [feature/sql-bool-builder] Adding the IS operator to predicted operatorsbrunoais2015-03-171-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13652
| * | | | | [feature/sql-bool-builder] Added LIKE and NOT_LIKE to the comparationsbrunoais2015-03-161-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13652
| * | | | | [feature/sql-bool-builder] Explain better the code in the firstbrunoais2015-03-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain what that if and check is for in the first method that is called. PHPBB3-13652
| * | | | | [feature/sql-bool-builder] Also use parenthesis for the NOT operatorbrunoais2015-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Be on the safe side, also use parenthesis for the NOT operator PHPBB3-13652
| * | | | | [feature/sql-bool-builder] AS keyword must be lowercase;brunoais2015-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AS keyword must be lowercase; expected "as" but found "AS" PHPBB3-13652
| * | | | | [feature/sql-bool-builder] Added code to use this feature for the WHERE clausebrunoais2015-03-161-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13652
| * | | | | [feature/sql-bool-builder] Removed non-necessary spacesbrunoais2015-03-161-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13652
| * | | | | [feature/sql-bool-builder] First working versionbrunoais2015-03-161-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13652
* | | | | | [ticket/10572] Remove excessive new lineMarc Alexander2015-10-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10572
* | | | | | Merge branch '3.1.x'Cesar G2015-10-141-0/+5
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * 3.1.x: [ticket/13684] Prevent horizontal resize of attach comment textarea
| * | | | | Merge pull request #3959 from marc1706/ticket/13684Cesar G2015-10-141-0/+5
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | [ticket/13684] Prevent horizontal resize of attach comment textarea
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-07 10:47:51 +0000