aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-192-4/+7
|\
| * Merge pull request #4781 from nomind60s/ticket/15151Tristan Darricau2017-04-192-4/+7
| |\
| | * [ticket/15151] Use redirected link for consistencynomind60s2017-04-191-1/+1
| | * [ticket/15151] ACP Cookie settings explanatory textnomind60s2017-03-291-1/+1
| | * [ticket/15151] ACP Cookie settings add explanatory text where it was missingnomind60s2017-03-292-4/+7
* | | Merge pull request #4786 from vinny/ticket/15158Tristan Darricau2017-04-181-5/+5
|\ \ \
| * | | [ticket/15158] Update oauth to v0.8.10Vinny2017-04-041-5/+5
* | | | Merge pull request #4792 from Louis7777/ticket/15173Tristan Darricau2017-04-181-5/+5
|\ \ \ \
| * | | | [ticket/15173] Fix message area resizing lagLouis77772017-04-141-5/+5
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-181-7/+14
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #4796 from marc1706/ticket/15174Tristan Darricau2017-04-181-7/+14
| |\ \ \ \
| | * | | | [ticket/15174] Split timeout message to extra method and set timeout to 60sMarc Alexander2017-04-171-7/+14
| | * | | | [ticket/15174] Increase timeout for loading indicatorMarc Alexander2017-04-161-1/+1
* | | | | | [ticket/15163] Escape curly braces in smilies HTML attributesJoshyPHP2017-04-181-1/+15
* | | | | | Merge pull request #4692 from rubencm/ticket/15084Tristan Darricau2017-04-181-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/15084] fix wrong order of breadcrumbs on module managementRubén Calvo2017-03-131-1/+1
* | | | | | | Merge pull request #4693 from marc1706/ticket/15079Tristan Darricau2017-04-181-1/+4
|\ \ \ \ \ \ \
| * | | | | | | [ticket/15079] Parse message before inserting it into drafts tableMarc Alexander2017-02-101-1/+4
| |/ / / / / /
* | | | | | | Merge pull request #4705 from nomind60s/ticket/15097Tristan Darricau2017-04-183-21/+42
|\ \ \ \ \ \ \
| * | | | | | | [ticket/15097] New 'Installed software' lead sectionnomind60s2017-02-192-26/+41
| * | | | | | | [ticket/15097] Resolve travis-ci errornomind60s2017-02-171-1/+1
| * | | | | | | [ticket/15097] Resolve travis-ci errornomind60s2017-02-171-1/+1
| * | | | | | | [ticket/15097] Add PHP version to Board statisticsnomind60s2017-02-172-2/+2
| * | | | | | | [ticket/15097] Add PHP version to Board statisticsnomind60s2017-02-173-0/+6
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-181-6/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #4718 from javiexin/ticket/15108Tristan Darricau2017-04-181-6/+0
| |\ \ \ \ \ \
| | * | | | | | [ticket/15108] Remove duplicate code in request->contextjaviexin2017-03-021-6/+0
* | | | | | | | Merge pull request #4768 from marc1706/ticket/15103Tristan Darricau2017-04-181-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/15103] Update fast-image-size to 1.1.3Marc Alexander2017-03-261-5/+5
* | | | | | | | | Merge pull request #4800 from Nicofuma/ticket/15180Marc Alexander2017-04-181-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/15180] Adjust \phpbb\di\extension\core::TWIG_OPTIONS_POSITIONTristan Darricau2017-04-171-1/+1
* | | | | | | | | | [ticket/15125] Remove the function play_qt_file in forum_fn.jsRishabh04-022017-04-181-31/+0
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4771 from Crizz0/ticket/15152Marc Alexander2017-04-177-639/+2670
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/15152] Updates Font Awesome Icons to version 4.7.0Christian Schnegelberger2017-03-267-639/+2670
* | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-04-171-17/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #4689 from javiexin/ticket/15080Marc Alexander2017-04-171-45/+15
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | [ticket/15080] Save unneeded file loads for extension metadatajaviexin2017-02-091-45/+15
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #4592 from javiexin/ticket/14938Marc Alexander2017-04-162-21/+17
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/14938] Inconsistency in ext_mgr all_available vs is_availablejaviexin2017-02-102-5/+5
| | * | | | | | | | [ticket/14938] Inconsistency in ext_mgr all_available vs is_availablejaviexin2017-02-091-18/+4
| | * | | | | | | | [ticket/14938] Inconsistency in ext_mgr all_available vs is_availablejaviexin2016-12-301-17/+3
| | * | | | | | | | [ticket/14938] Inconsistency in ext_mgr all_available vs is_availablejaviexin2016-12-261-1/+23
| | |/ / / / / / /
| * | | | | | | | Merge pull request #4581 from javiexin/ticket/14919Marc Alexander2017-04-161-62/+62
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/14919] Do not directly use globals in acp_extensionsjaviexin2016-12-251-1/+1
| | * | | | | | | | [ticket/14919] Do not directly use globals in acp_extensionsjaviexin2016-12-191-0/+1
| | * | | | | | | | [ticket/14919] Do not directly use globals in acp_extensionsjaviexin2016-12-171-66/+65
| | |/ / / / / / /
| * | | | | | | | Merge pull request #4761 from VSEphpbb/ticket/15142Marc Alexander2017-04-112-6/+66
| |\ \ \ \ \ \ \ \
* | | | | | | | | | [ticket/14990] Move dispatcher object to the front of the options arrayrxu2017-04-164-6/+6
* | | | | | | | | | [ticket/14990] Fix event name, email parsing, installer and dispatcher callsrxu2017-04-163-16/+23
* | | | | | | | | | [ticket/14990] Add core events to the Twig environmentrxu2017-04-162-1/+32