aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [ticket/13645] Fix docblocksTristan Darricau2015-08-241-1/+3
* [ticket/13645] Proper OOP for feedsTristan Darricau2015-08-2315-320/+506
* [ticket/13645] Move the feeds to controllersNicofuma2015-08-2327-449/+914
* Merge pull request #3842 from CHItA/ticket/14097Tristan Darricau2015-08-231-3/+10
|\
| * [ticket/14097] Remove auto refresh on install failureMate Bartus2015-08-211-2/+1
| * [ticket/14097] Improve error and failure handling in the installerMate Bartus2015-08-171-2/+10
* | Merge branch '3.1.x'Joas Schilling2015-08-233-1/+121
|\ \
| * | [3.1.x] Update version to 3.1.7-devJoas Schilling2015-08-232-2/+2
| * | [prep-release-3.1.6] Add changelog for 3.1.6-RC1Joas Schilling2015-08-231-0/+89
| * | [prep-release-3.1.6] Add migration for 3.1.6-RC1Joas Schilling2015-08-231-0/+31
| * | [prep-release-3.1.6] Update version to 3.1.6-RC1Joas Schilling2015-08-235-7/+7
| * | Merge pull request #3829 from Nicofuma/ticket/14099Joas Schilling2015-08-233-21/+48
| |\ \
* | \ \ Merge pull request #3854 from Nicofuma/ticket/14099-masterJoas Schilling2015-08-231-8/+8
|\ \ \ \
| * \ \ \ Merge branch '3.1.x'Tristan Darricau2015-08-231-8/+8
| |\ \ \ \
| | * \ \ \ Merge branch 'ticket/14099' into 3.1.xTristan Darricau2015-08-213-21/+48
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | [ticket/14099] Fix the assetsTristan Darricau2015-08-181-3/+14
| | | * | | [ticket/14099] Fix testsTristan Darricau2015-08-141-0/+8
| | | * | | [ticket/14099] Update twig/twig to 1.20.0Tristan Darricau2015-08-142-21/+29
* | | | | | Merge branch '3.1.x'Marc Alexander2015-08-221-1/+12
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #3823 from lavigor/ticket/14087Marc Alexander2015-08-221-1/+12
| |\ \ \ \ \
| | * | | | | [ticket/14087] Add an event to ucp_activate.php.lavigor2015-08-091-1/+12
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-221-0/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3834 from brunoais/ticket/14104Marc Alexander2015-08-221-0/+4
| |\ \ \ \ \ \
| | * | | | | | [ticket/14104] Fix missing variables from previous commitbrunoais2015-08-151-0/+4
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-221-0/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3831 from rxu/ticket/14101Marc Alexander2015-08-221-0/+24
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/14101] Add core event to the download/file.phprxu2015-08-151-0/+24
| | |/ / / / / /
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-222-0/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3852 from marc1706/ticket/14068Marc Alexander2015-08-223-0/+22
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/14068] Add template events before and after poll paneljaviexin2015-08-223-0/+22
* | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-222-2/+18
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #3771 from Zoddo/ticket/14025Marc Alexander2015-08-223-2/+22
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/14091] Add mcp_topic_subject_* template eventsZoddo2015-08-113-2/+22
* | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-221-0/+23
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3813 from rxu/ticket/14072Marc Alexander2015-08-221-0/+23
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | [ticket/14072] Add core event to the function format_display()rxu2015-08-061-0/+23
* | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-222-1/+56
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3803 from rxu/ticket/14064Marc Alexander2015-08-223-2/+74
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [ticket/14064] Add template events to ucp_pm_history.htmlrxu2015-08-033-2/+74
| | |/ / / / / / / /
* | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-222-0/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3806 from rxu/ticket/14067Marc Alexander2015-08-223-0/+10
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [ticket/14067] Add template events to overall_header.html around feedsrxu2015-08-053-0/+10
| | |/ / / / / / / /
* | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-222-3/+32
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | / / / / | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Merge pull request #3804 from rxu/ticket/14065Marc Alexander2015-08-223-3/+40
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | [ticket/14065] Add template events to attachment.htmlrxu2015-08-033-3/+40
| | |/ / / / / /
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-201-0/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3849 from marc1706/ticket/14037Marc Alexander2015-08-201-0/+20
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/14037] Minor coding style improvements to eventMarc Alexander2015-08-201-0/+2
| | * | | | | | | [ticket/14037] Allows adapting memberlist profile fields headlinejaviexin2015-08-201-0/+18
* | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-202-6/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /