aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* [ticket/14264] Don't use constants as return valuesOliver Schramm2015-11-038-67/+11
* Merge pull request #3971 from VSEphpbb/ticket/14237Oliver Schramm2015-10-2917-73/+112
|\
| * [ticket/14237] Consistent references to classes in docblocksMatt Friedman2015-10-141-3/+3
| * [ticket/14237] Use $language class for notificationsMatt Friedman2015-10-1317-76/+115
* | 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
| * | [ticket/14258] Add event into auth::login before session creationPaul Sohier2015-10-241-8/+7
| * | [ticket/14258] Add event into auth::login before session creationPaul Sohier2015-10-241-0/+20
* | | Merge branch '3.1.x'Mate Bartus2015-10-211-1/+1
|\ \ \ | |/ /
| * | Merge pull request #3997 from CHItA/ticket/13976Máté Bartus2015-10-211-1/+1
| |\ \
| | * | [ticket/13976] Fix comment typo in salted_md5.phpSumanai2015-10-211-1/+1
* | | | Merge pull request #3794 from CHItA/ticket/14039Tristan Darricau2015-10-1957-169/+3733
|\ \ \ \
| * | | | [ticket/14039] Use update helper to include files in container factoryMate Bartus2015-10-191-24/+15
| * | | | [ticket/14039] Fix inclusion logic in update helperMate Bartus2015-10-191-6/+1
| * | | | [ticket/14039] Fix folder creation and deleted binary file issueMate Bartus2015-10-182-1/+8
| * | | | [ticket/14039] Fix file check for deleted filesMate Bartus2015-10-181-1/+1
| * | | | [ticket/14039] Fix acp linkMate Bartus2015-10-181-1/+1
| * | | | [ticket/14039] Fix ACP link generationMate Bartus2015-10-181-17/+11
| * | | | [ticket/14039] Fix constants for the updaterMate Bartus2015-10-181-1/+12
| * | | | [ticket/14039] Fix migrator's language callsMate Bartus2015-10-182-2/+3
| * | | | [ticket/14039] Fix misunderstandable comment in the archive file updaterMate Bartus2015-10-181-1/+3
| * | | | [ticket/14039] Use shared language service in the container factoryMate Bartus2015-10-181-4/+16
| * | | | [ticket/14039] Fix filesystem file updater's mkdir usageMate Bartus2015-10-181-16/+1
| * | | | [ticket/14039] Use compatibility globals from the update packageMate Bartus2015-10-181-1/+8
| * | | | [ticket/14039] Use http_exception instead of die()Mate Bartus2015-10-181-2/+3
| * | | | [ticket/14039] Fix T_TEMPLATE_PATH constantMate Bartus2015-10-181-1/+1
| * | | | [ticket/14039] Fix language constants and commentsMate Bartus2015-10-182-2/+2
| * | | | [ticket/14039] Revamp updaterMate Bartus2015-10-1757-145/+3703
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-191-2/+4
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge pull request #3647 from marc1706/ticket/13799Tristan Darricau2015-10-191-2/+4
| |\ \ \
| | * | | [ticket/13799] Correctly urlencode category and show selected avatarMarc Alexander2015-05-301-2/+4
| | * | | [ticket/13799] Do not rawurlencode category in gallery avatarMarc Alexander2015-05-281-1/+1
* | | | | Merge branch '3.1.x'Marc Alexander2015-10-178-9/+9
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/13892] Replace other uses of self with static.Cesar G2015-10-157-9/+9
| * | | | [ticket/13892] Respect "Someone reports a post" notification setting.Cesar G2015-10-151-1/+1
* | | | | [ticket/13789] Upgrade reCaptcha plugin to 2.0 API.Cesar G2015-10-141-117/+10
* | | | | [ticket/13652] Fix coding styleTristan Darricau2015-10-141-1/+1
* | | | | Merge pull request #3441 from brunoais/feature/sql-bool-builderTristan Darricau2015-10-141-1/+136
|\ \ \ \ \
| * | | | | [feature/sql-bool-builder] Adding the IS operator to predicted operatorsbrunoais2015-03-171-0/+18
| * | | | | [feature/sql-bool-builder] Added LIKE and NOT_LIKE to the comparationsbrunoais2015-03-161-0/+12
| * | | | | [feature/sql-bool-builder] Explain better the code in the firstbrunoais2015-03-161-0/+2
| * | | | | [feature/sql-bool-builder] Also use parenthesis for the NOT operatorbrunoais2015-03-161-1/+1
| * | | | | [feature/sql-bool-builder] AS keyword must be lowercase;brunoais2015-03-161-1/+1
| * | | | | [feature/sql-bool-builder] Added code to use this feature for the WHERE clausebrunoais2015-03-161-1/+12
| * | | | | [feature/sql-bool-builder] Removed non-necessary spacesbrunoais2015-03-161-29/+29
| * | | | | [feature/sql-bool-builder] First working versionbrunoais2015-03-161-0/+92
* | | | | | Merge pull request #3913 from marc1706/ticket/14168Tristan Darricau2015-10-144-0/+989
|\ \ \ \ \ \
| * | | | | | [ticket/14168] Correctly state return type of upload and upload_attachmentMarc Alexander2015-10-122-2/+2
| * | | | | | [ticket/14168] Fix docblock in managerMarc Alexander2015-10-091-2/+2
| * | | | | | [ticket/14168] Fix tabs in manager and add test fileMarc Alexander2015-10-091-71/+71