aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-191-1/+1
|\
| * Merge pull request #4763 from javiexin/ticket/15146Tristan Darricau2017-04-191-1/+1
| |\
| | * [ticket/15146] Date profile field validation incorrectjaviexin2017-03-241-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 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
| | | |/ | | |/|
* | | | [ticket/15180] Adjust \phpbb\di\extension\core::TWIG_OPTIONS_POSITIONTristan Darricau2017-04-171-1/+1
* | | | 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 #4761 from VSEphpbb/ticket/15142Marc Alexander2017-04-111-0/+63
| |\ \ \
* | | | | [ticket/14990] Move dispatcher object to the front of the options arrayrxu2017-04-161-2/+2
* | | | | [ticket/14990] Fix event name, email parsing, installer and dispatcher callsrxu2017-04-161-14/+18
* | | | | [ticket/14990] Add core events to the Twig environmentrxu2017-04-161-1/+31
* | | | | Merge pull request #4698 from javiexin/ticket/15087Marc Alexander2017-04-163-145/+68
|\ \ \ \ \
| * | | | | [ticket/15087] Optimize creation of metadata objects by cachingjaviexin2017-02-123-82/+38
| * | | | | [ticket/15087] Optimize creation of metadata objects by cachingjaviexin2017-02-121-48/+16
| * | | | | [ticket/15087] Optimize creation of metadata objects by cachingjaviexin2017-02-121-17/+11
* | | | | | Merge pull request #4793 from marc1706/ticket/15090Tristan Darricau2017-04-161-4/+3
|\ \ \ \ \ \
| * | | | | | [ticket/15090] Ensure send stats module exists before removingMarc Alexander2017-04-151-4/+3
* | | | | | | Merge pull request #4612 from javiexin/ticket/14950Marc Alexander2017-04-152-2/+43
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [ticket/14950] Add possibility to delete a template blockjaviexin2017-01-121-1/+1
| * | | | | | [ticket/14950] Add possibility to delete a template blockjaviexin2017-01-042-2/+43
| | |_|_|/ / | |/| | | |
* | | | | | [ticket/15142] Merge branch 'ticket/15142' into 32xMatt Friedman2017-04-102-2/+65
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | [ticket/15142] Remove duplicate codeMatt Friedman2017-04-031-1/+0
| * | | | | [ticket/15142] Handle versions for unmatched branchesMatt Friedman2017-03-241-5/+13
| * | | | | [ticket/15142] Check extension updates on current branchMatt Friedman2017-03-241-0/+56
* | | | | | Merge pull request #4530 from senky/ticket/14557Marc Alexander2017-03-261-0/+12
|\ \ \ \ \ \
| * | | | | | [ticket/14557] Rename $offset to $subarrayJakub Senko2016-12-271-5/+5
| * | | | | | [ticket/14557] Don't return $valueJakub Senko2016-12-271-2/+1
| * | | | | | [ticket/14557] Simplify updating overloaded events for extensionsJakub Senko2016-12-261-0/+13
* | | | | | | Merge pull request #4750 from rubencm/ticket/15134Marc Alexander2017-03-251-4/+12
|\ \ \ \ \ \ \
| * | | | | | | [ticket/15134] Return false if errorRubén Calvo2017-03-201-2/+3
| * | | | | | | [ticket/15134] Follow coding guidelinessRubén Calvo2017-03-191-1/+4
| * | | | | | | [ticket/15134] Replace php native functions for filesystem service methodsRubén Calvo2017-03-191-3/+7
* | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-03-241-5/+5
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | [ticket/15143] Fix display of version update in ACPMatt Friedman2017-03-221-5/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | [ticket/15135] Correctly pass exception arguments and add back link againMarc Alexander2017-03-231-2/+2
* | | | | | | [ticket/15135] Parse language files in acp_extensions instead of md managerMarc Alexander2017-03-191-3/+3
* | | | | | | Merge pull request #4736 from rubencm/ticket/15123Tristan Darricau2017-03-192-0/+14
|\ \ \ \ \ \ \
| * | | | | | | [ticket/15123] modified return error codesRubén Calvo2017-03-132-2/+2
| * | | | | | | [ticket/15123] modified language stringsRubén Calvo2017-03-132-2/+2