aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14039] Fix inclusion logic in update helperMate Bartus2015-10-191-6/+1
| | | | PHPBB3-14039
* [ticket/14039] Fix folder creation and deleted binary file issueMate Bartus2015-10-182-1/+8
| | | | PHPBB3-14039
* [ticket/14039] Fix file check for deleted filesMate Bartus2015-10-181-1/+1
| | | | PHPBB3-14039
* [ticket/14039] Fix acp linkMate Bartus2015-10-181-1/+1
| | | | PHPBB3-14039
* [ticket/14039] Fix ACP link generationMate Bartus2015-10-182-17/+12
| | | | PHPBB3-14039
* [ticket/14039] Fix constants for the updaterMate Bartus2015-10-182-2/+12
| | | | PHPBB3-14039
* [ticket/14039] Include phpBB constants on startupMate Bartus2015-10-181-0/+1
| | | | PHPBB3-14039
* [ticket/14039] Fix migrator's language callsMate Bartus2015-10-182-2/+3
| | | | PHPBB3-14039
* [ticket/14039] Fix misunderstandable comment in the archive file updaterMate Bartus2015-10-181-1/+3
| | | | PHPBB3-14039
* [ticket/14039] Use shared language service in the container factoryMate Bartus2015-10-182-4/+17
| | | | PHPBB3-14039
* [ticket/14039] Fix filesystem file updater's mkdir usageMate Bartus2015-10-181-16/+1
| | | | PHPBB3-14039
* [ticket/14039] Only show log container when it has contentMate Bartus2015-10-182-2/+4
| | | | PHPBB3-14039
* [ticket/14039] Use compatibility globals from the update packageMate Bartus2015-10-181-1/+8
| | | | PHPBB3-14039
* [ticket/14039] Use http_exception instead of die()Mate Bartus2015-10-181-2/+3
| | | | PHPBB3-14039
* [ticket/14039] Fix T_TEMPLATE_PATH constantMate Bartus2015-10-182-2/+2
| | | | PHPBB3-14039
* [ticket/14039] Fix language constants and commentsMate Bartus2015-10-183-3/+3
| | | | PHPBB3-14039
* [ticket/14039] Revamp updaterMate Bartus2015-10-1789-252/+4469
| | | | PHPBB3-14039
* 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.