aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4612 from javiexin/ticket/14950Marc Alexander2017-04-153-3/+93
|\
| * [ticket/14950] Add possibility to delete a template blockjaviexin2017-01-121-1/+1
| * [ticket/14950] Add possibility to delete a template blockjaviexin2017-01-081-1/+1
| * [ticket/14950] Add possibility to delete a template blockjaviexin2017-01-081-1/+6
| * [ticket/14950] Add possibility to delete a template blockjaviexin2017-01-081-2/+2
| * [ticket/14950] Add possibility to delete a template blockjaviexin2017-01-071-0/+42
| * [ticket/14950] Add possibility to delete a template blockjaviexin2017-01-042-2/+43
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-04-110-0/+0
|\ \
| * \ Merge pull request #4761 from VSEphpbb/ticket/15142Marc Alexander2017-04-113-6/+358
| |\ \
* | \ \ Merge pull request #4790 from VSEphpbb/ticket/15142-merge32xMarc Alexander2017-04-114-6/+363
|\ \ \ \
| * \ \ \ [ticket/15142] Merge branch 'ticket/15142' into 32xMatt Friedman2017-04-104-6/+363
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | [ticket/15142] Remove duplicate codeMatt Friedman2017-04-031-1/+0
| | * | | [ticket/15142] Add ext branch update testsMatt Friedman2017-03-241-0/+292
| | * | | [ticket/15142] Handle versions for unmatched branchesMatt Friedman2017-03-241-5/+13
| | * | | [ticket/15142] Check extension updates on current branchMatt Friedman2017-03-242-6/+59
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-04-091-6/+6
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #4778 from marc1706/ticket/15139Marc Alexander2017-04-091-6/+7
| |\ \ \ \
| | * | | | [ticket/15139] Assigned 'topics_per_page' before template includedupstrocker2017-03-281-6/+7
| |/ / / /
* | | | | Merge pull request #4775 from hanakin/ticket/15157Marc Alexander2017-03-282-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ticket/15157] simple headerhanakin2017-03-281-1/+1
| * | | | [ticket/15157] Add proper google font callhanakin2017-03-281-1/+1
|/ / / /
* | | | 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 #4762 from Nicofuma/ticket/15137Marc Alexander2017-03-251-2/+2
|\ \ \ \ \
| * | | | | [ticket/15137] Global Announcements shouldn't always be never endingTristan Darricau2017-03-251-2/+2
* | | | | | 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-242-9/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #4757 from VSEphpbb/ticket/15143Tristan Darricau2017-03-242-9/+6
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | [ticket/15143] Fix display of version update in ACPMatt Friedman2017-03-222-9/+6
| |/ / / /
* | | | | Merge pull request #4751 from marc1706/ticket/15135Tristan Darricau2017-03-242-5/+7
|\ \ \ \ \
| * | | | | [ticket/15135] Correctly pass exception arguments and add back link againMarc Alexander2017-03-232-4/+5
| * | | | | [ticket/15135] Parse language files in acp_extensions instead of md managerMarc Alexander2017-03-192-4/+5
* | | | | | Merge pull request #4752 from nomind60s/ticket/15137Tristan Darricau2017-03-212-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/15137] Missed one language string changenomind60s2017-03-211-1/+1
| * | | | | [ticket/15137] Global announcements can stick for a non-zero number of daysnomind60s2017-03-203-5/+5
| |/ / / /
* | | | | Merge pull request #4711 from javiexin/ticket/15102Tristan Darricau2017-03-191-1/+1
|\ \ \ \ \
| * | | | | [ticket/15102] Missing parameter calling version_checkjaviexin2017-02-241-1/+1
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-03-191-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'mukeshkharita-ticket/14758' into 3.1.xTristan Darricau2017-03-191-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/14758] Improve the ACP Parameter wordingMukesh Kumar Kharita2017-03-191-1/+1
| |/ / / / /
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-03-191-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4734 from rxu/ticket/14806Tristan Darricau2017-03-191-2/+2
| |\ \ \ \ \
| | * | | | | [ticket/14806] Fix ACP test emails authentication failurerxu2017-03-111-2/+2
* | | | | | | Merge branch 'ticket/14928' into 3.2.xTristan Darricau2017-03-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [ticket/14928] fixing valid stability %sRishabh04-022017-03-191-1/+1
|/ / / / / / /