aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14257] Add cron tasks for reparsing textOliver Schramm2015-10-243-0/+321
| | | | PHPBB3-14257
* Merge branch '3.1.x'Marc Alexander2015-10-241-0/+19
|\
| * [ticket/14258] Add event into auth::login before session creationPaul Sohier2015-10-241-1/+1
| | | | | | | | | | | | Fix typo PHPBB3-14258
| * [ticket/14258] Add event into auth::login before session creationPaul Sohier2015-10-241-8/+7
| | | | | | | | | | | | Update comments regarding variables. PHPBB3-14258
| * [ticket/14258] Add event into auth::login before session creationPaul Sohier2015-10-241-0/+20
| | | | | | | | | | | | | | Add a new event in the login method just before the session create, so extensions can do some additional validation during login. PHPBB3-14258
* | Merge branch '3.1.x'Cesar G2015-10-221-1/+1
|\ \ | |/ | | | | | | * 3.1.x: [ticket/14249] Fix online list order
| * [ticket/14249] Fix online list orderOliver Schramm2015-10-211-1/+1
| | | | | | | | PHPBB3-14249
* | Merge branch '3.1.x'Mate Bartus2015-10-211-1/+1
|\ \ | |/ | | | | | | * 3.1.x: [ticket/13976] Fix comment typo in salted_md5.php
| * Merge pull request #3997 from CHItA/ticket/13976Máté Bartus2015-10-211-1/+1
| |\ | | | | | | [ticket/13976] Fix comment typo in salted_md5.php
| | * [ticket/13976] Fix comment typo in salted_md5.phpSumanai2015-10-211-1/+1
| | | | | | | | | | | | PHPBB3-13976
* | | Merge pull request #3794 from CHItA/ticket/14039Tristan Darricau2015-10-1990-277/+4505
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14039] Refactoring the updater * CHItA/ticket/14039: [ticket/14039] Use update helper to include files in container factory [ticket/14039] Fix inclusion logic in update helper [ticket/14039] Fix folder creation and deleted binary file issue [ticket/14039] Fix file check for deleted files [ticket/14039] Fix acp link [ticket/14039] Fix ACP link generation [ticket/14039] Fix constants for the updater [ticket/14039] Include phpBB constants on startup [ticket/14039] Fix migrator's language calls [ticket/14039] Fix misunderstandable comment in the archive file updater [ticket/14039] Use shared language service in the container factory [ticket/14039] Fix filesystem file updater's mkdir usage [ticket/14039] Only show log container when it has content [ticket/14039] Use compatibility globals from the update package [ticket/14039] Use http_exception instead of die() [ticket/14039] Fix T_TEMPLATE_PATH constant [ticket/14039] Fix language constants and comments [ticket/14039] Revamp updater
| * | | [ticket/14039] Use update helper to include files in container factoryMate Bartus2015-10-192-24/+16
| | | | | | | | | | | | | | | | PHPBB3-14039
| * | | [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 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
| * | | | | [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