aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3870 from Zoddo/ticket/9485Tristan Darricau2015-09-092-1/+50
|\
| * [ticket/9485] Add a "View post" link in the moderation logsZoddo2015-08-302-1/+50
* | Merge branch '3.1.x'Tristan Darricau2015-09-091-0/+1
|\ \
| * \ Merge pull request #3890 from marc1706/ticket/13423Tristan Darricau2015-09-091-0/+1
| |\ \
| | * | [ticket/13423] Set busyTimeout on connect to prevent db lockingMarc Alexander2015-09-071-0/+1
* | | | Merge pull request #3891 from marc1706/ticket/14150Tristan Darricau2015-09-092-4/+4
|\ \ \ \
| * | | | [ticket/14150] Update fast-image-size to newest versionMarc Alexander2015-09-082-4/+4
* | | | | Merge branch '3.1.x'Marc Alexander2015-09-081-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge pull request #3881 from VSEphpbb/ticket/14142Marc Alexander2015-09-081-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/14142] Remove unused ignore_configs from avatar driversMatt Friedman2015-09-041-1/+1
* | | | Merge branch '3.1.x'Joas Schilling2015-09-051-0/+31
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.1.6' into 3.1.xJoas Schilling2015-09-051-0/+31
| |\ \ \ | | |/ / | |/| |
| | * | [prep-release-3.1.6] Add migration for 3.1.6Joas Schilling2015-09-051-0/+31
* | | | Merge branch '3.1.x'Tristan Darricau2015-09-021-0/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #3855 from VSEphpbb/ticket/14123Tristan Darricau2015-09-021-0/+1
| |\ \ \
| | * | | [ticket/14123] Remove redundant help messagesMatt Friedman2015-08-2814-14/+0
| | * | | [ticket/14123] Add descriptive help to the CLI help outputMatt Friedman2015-08-2315-0/+15
* | | | | Merge branch '3.1.x'Tristan Darricau2015-09-021-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3872 from Zoddo/ticket/11468Tristan Darricau2015-09-021-2/+4
| |\ \ \ \
| | * | | | [ticket/11468] Allow controllers to set paramters of page_header()Zoddo2015-08-301-2/+4
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-09-011-0/+22
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | [ticket/13950] Hide undefined categoriesZoddo2015-08-281-0/+11
| * | | | [ticket/13950] Hide undefined permissionsZoddo2015-08-281-0/+11
| |/ / /
* | | | Merge branch '3.1.x'Tristan Darricau2015-08-281-4/+2
|\ \ \ \ | |/ / /
| * | | Merge pull request #3764 from Zoddo/ticket/13988Tristan Darricau2015-08-281-4/+2
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/13988] Use absolute path for image attachments in feedsCarstenF2015-07-151-4/+2
* | | | Merge pull request #3858 from Nicofuma/ticket/14125Máté Bartus2015-08-281-12/+45
|\ \ \ \
| * | | | [ticket/14125] Add --env option to all CLI commandsTristan Darricau2015-08-241-12/+45
* | | | | Merge pull request #3470 from Nicofuma/ticket/13645Máté Bartus2015-08-2827-539/+1281
|\ \ \ \ \
| * | | | | [ticket/13645] Fix docblocksTristan Darricau2015-08-241-1/+3
| * | | | | [ticket/13645] Proper OOP for feedsTristan Darricau2015-08-2314-320/+505
| * | | | | [ticket/13645] Move the feeds to controllersNicofuma2015-08-2316-224/+779
* | | | | | Merge pull request #3863 from VSEphpbb/ticket/14128Tristan Darricau2015-08-271-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/14128] Fix img bbcode regression, lost postimage classMatt Friedman2015-08-261-1/+1
* | | | | | | [ticket/12505] Fix variable usage in migration filen-aleha2015-08-241-1/+1
* | | | | | | [ticket/12505] Add migrationn-aleha2015-08-241-0/+83
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #3652 from Elsensee/ticket/12143Tristan Darricau2015-08-232-0/+70
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | [ticket/12143] Add group helper class to translate groupnamesOliver Schramm2015-08-051-0/+40
| * | | | | [ticket/12143] Add is_set method to language serviceOliver Schramm2015-08-051-0/+30
* | | | | | 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-231-0/+31
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | [prep-release-3.1.6] Add migration for 3.1.6-RC1Joas Schilling2015-08-231-0/+31
| * | | | | | Merge pull request #3829 from Nicofuma/ticket/14099Joas Schilling2015-08-231-0/+19
| |\ \ \ \ \ \
| | * | | | | | [ticket/14099] Fix the assetsTristan Darricau2015-08-181-3/+14
| | * | | | | | [ticket/14099] Fix testsTristan Darricau2015-08-141-0/+8
* | | | | | | | 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
| | |/ / / / / /