aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-05-281-0/+12
|\
| * Merge pull request #4173 from lavigor/ticket/14466Marc Alexander2016-05-281-0/+12
| |\
| | * [ticket/14466] Fix class name in PHPDoc comment.lavigor2016-03-251-1/+1
| | * [ticket/14466] Add an event to cron.phplavigor2016-02-071-0/+12
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-05-271-2/+7
|\ \ \ | |/ /
| * | Merge pull request #4332 from Senky/ticket/11446Marc Alexander2016-05-271-14/+17
| |\ \
| | * | [ticket/11446] Make get_notification_type_ids work with string tooJakub Senko2016-05-271-2/+7
| | * | [ticket/11446] Use sql_in_set properly in phpbb_notification_managerJakub Senko2016-05-231-12/+10
* | | | Merge pull request #4333 from markshawtoronto/ticket/14648Marc Alexander2016-05-271-8/+31
|\ \ \ \
| * | | | [ticket/14648] Remove whitespace at the end of a lineMark Shaw2016-05-251-1/+1
| * | | | [ticket/14648] Fix bug where default notifications stop working if another se...Mark Shaw2016-05-251-8/+31
* | | | | Merge branch '3.1.x' into 3.2.xMáté Bartus2016-05-272-0/+10
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #4335 from marc1706/ticket/14650Máté Bartus2016-05-272-0/+10
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | [ticket/14650] Semi-colon instead of slash to make Matt happyMarc Alexander2016-05-261-1/+1
| | * | | [ticket/14650] Move CONTRIBUTING.md and add pull request templateMarc Alexander2016-05-262-0/+10
| |/ / /
* | | | Merge pull request #4334 from rmcgirr83/ticket_14649Marc Alexander2016-05-261-1/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | [ticket/14649] Add preview variable back to ucp_profile for eventRichard McGirr2016-05-261-1/+3
|/ / /
* | | Merge pull request #4325 from DavidIQ/ticket/14591Marc Alexander2016-05-241-3/+3
|\ \ \
| * | | [ticket/14591] Use the correct delimiter for MSSQLDavid Colón2016-05-181-3/+3
* | | | Merge pull request #4327 from paul999/ticket/14645Máté Bartus2016-05-221-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/14645] Language pack not reconised when using a symlinkPaul Sohier2016-05-211-0/+1
|/ / /
* | | Merge pull request #4315 from Nicofuma/ticket/14628Marc Alexander2016-05-161-4/+5
|\ \ \
| * | | [ticket/14628] Supports translatable error messages in the CLI installerTristan Darricau2016-05-051-4/+5
* | | | Merge pull request #4320 from marc1706/ticket/14624Máté Bartus2016-05-161-1/+0
|\ \ \ \
| * | | | [ticket/14624] Remove no longer existing event argumemtMarc Alexander2016-05-161-1/+0
|/ / / /
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-05-151-0/+26
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #4314 from rmcgirr83/ticket_14624Marc Alexander2016-05-151-0/+26
| |\ \ \
| | * | | [ticket/14624] Remove whitespaceRichard McGirr2016-05-051-2/+2
| | * | | [ticket/14624] Fix typo and phpBB versionRichard McGirr2016-05-051-2/+2
| | * | | [ticket/14624] Move event so it actually worksRichard McGirr2016-05-051-13/+13
| | * | | [ticket/14624] Add event to ucp_profile in signature sectionRichard McGirr2016-05-051-0/+26
* | | | | Merge pull request #4319 from derekheld/ticket/14595Tristan Darricau2016-05-155-0/+16
|\ \ \ \ \
| * | | | | [ticket/14595] Added smtp_port where places where smtp_host exists.Derek Held2016-05-144-0/+13
| * | | | | [ticket/14595] Added SMTP port to getConfigTreeBuilderDerek Held2016-05-141-0/+3
|/ / / / /
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-05-121-5/+9
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Merge pull request #4317 from rmcgirr83/ticket_14610Marc Alexander2016-05-121-5/+9
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/14610] Implement lavigor methodRichard McGirr2016-05-091-10/+9
| | * | [ticket/14610] Remove whitespaceRichard McGirr2016-05-081-1/+1
| | * | [ticket/14610] Don't log an error if the Q&A captcha has been solvedRichard McGirr2016-05-081-0/+5
| |/ /
* | | Merge pull request #4310 from Crizz0/ticket/14619Tristan Darricau2016-05-024-23/+23
|\ \ \
| * | | [ticket/14619] Updates 3.1.x/ascraeus to 3.2.x/rheaCrizzo2016-05-014-23/+23
* | | | Merge pull request #4308 from marc1706/ticket/14607Tristan Darricau2016-05-022-1/+3435
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/14607] Add missing auto_increment to report_idMarc Alexander2016-05-012-1/+3435
|/ / /
* | | Merge pull request #4303 from paul999/ticket/13969Tristan Darricau2016-04-292-470/+0
|\ \ \
| * | | [ticket/13969] Remove obsolute language filesPaul Sohier2016-04-282-470/+0
* | | | Merge branch 'prep-release-3.2.0-b2' into 3.2.xTristan Darricau2016-04-283-3390/+74
|\ \ \ \ | |/ / / |/| | |
| * | | [prep-release-3.2.0-b2] Add schema.jsonTristan Darricau2016-03-031-3389/+1
| * | | [prep-release-3.2.0-b2] Add changelog for 3.2.0-b2Tristan Darricau2016-03-031-1/+33
| * | | [prep-release-3.2.0-b2] Add migration for 3.2.0-b2Tristan Darricau2016-03-031-0/+40
| * | | [prep-release-3.2.0-b2] Update version to 3.2.0-b2Tristan Darricau2016-03-026-7/+7