aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x'Nicofuma2015-05-062-10/+159
|\
| * Merge pull request #3583 from nickvergessen/ticket/13807Nicofuma2015-05-062-10/+159
| |\
| | * [ticket/13807] Fix minor coding flawsJoas Schilling2015-05-021-2/+3
| | * [ticket/13807] Add an option to generate a diff for the release highlightsJoas Schilling2015-05-022-5/+30
| | * [ticket/13807] Allow filtering template eventsJoas Schilling2015-05-021-1/+27
| | * [ticket/13807] Allow filtering events by phpBB versionJoas Schilling2015-05-021-4/+101
* | | Merge branch '3.1.x'Andreas Fischer2015-05-061-0/+1
|\ \ \ | |/ /
* | | [ticket/13638] Inject $filesystem in \phpbb\template\assetNicofuma2015-05-053-9/+29
* | | [ticket/13638] Handle assets outside of phpbb_root_pathNicofuma2015-05-041-3/+15
* | | [ticket/13638] Prepend the assets path phpbb rootNicofuma2015-05-041-2/+2
* | | Merge pull request #3590 from rxu/ticket/13814Tristan Darricau2015-05-041-1/+1
|\ \ \
| * | | [ticket/13814] Prevent phpbb_is_writable() method from truncating filesrxu2015-05-041-1/+1
* | | | [ticket/13782] Rename null log to dummy for PHP7 compatibilityMarc Alexander2015-05-041-2/+2
* | | | [ticket/13782] Rename null driver to dummy for PHP7 compatibilityMarc Alexander2015-05-041-2/+2
* | | | Merge branch '3.1.x'Joas Schilling2015-05-031-0/+32
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-05-031-0/+32
| |\ \ \
| | * | | [prep-release-3.1.4] Add migrationJoas Schilling2015-05-031-0/+32
* | | | | Merge branch '3.1.x'Andreas Fischer2015-05-031-0/+37
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-05-031-0/+37
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-05-031-0/+37
* | | | [ticket/13762] Replace user service with lang in twig extensionMateBartus2015-05-021-6/+6
* | | | [ticket/13762] Optional DI injectable default language module arrayMateBartus2015-05-021-5/+14
* | | | [ticket/13762] Moving language related functionality into a separate classMateBartus2015-05-028-234/+1015
* | | | [ticket/13793] Remove translation on throwing exceptionsMateBartus2015-05-017-47/+20
* | | | Merge branch '3.1.x'Joas Schilling2015-04-291-0/+32
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-04-291-0/+32
| |\ \ \ | | |/ /
| | * | [prep-release-3.1.4] Increase version number to 3.1.4-RC2Joas Schilling2015-04-291-0/+32
* | | | Merge branch '3.1.x'Andreas Fischer2015-04-281-0/+37
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-281-0/+37
| |\ \ | | |/
| | * Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-04-281-0/+37
* | | [ticket/8672] Remove outdated imagesize classMarc Alexander2015-04-241-549/+0
* | | [ticket/8672] Use fastImageSize in classesMarc Alexander2015-04-245-8/+8
* | | [ticket/8672] Updated the text_formatter.s9e serviceJoshyPHP2015-04-241-9/+5
* | | [ticket/8672] Add class for retrieving imagesize without downloadMarc Alexander2015-04-245-28/+581
* | | Merge branch '3.1.x'Andreas Fischer2015-04-221-1/+1
|\ \ \ | |/ /
| * | [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()brunoais2015-04-211-1/+1
* | | [ticket/13768] Fix deprecationsTristan Darricau2015-04-192-3/+3
* | | Merge pull request #3539 from MateBartus/ticket/13766Tristan Darricau2015-04-171-1/+1
|\ \ \
| * | | [ticket/13766] Add style_parent_id in textformater's data_access::get_styles()MateBartus2015-04-161-1/+1
* | | | Merge pull request #3446 from MateBartus/ticket/13654Tristan Darricau2015-04-1615-0/+1069
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/13654] Moving reporting into controllerMateBartus2015-04-1615-0/+1069
* | | | Merge pull request #3487 from MateBartus/ticket/13697Tristan Darricau2015-04-1620-80/+1336
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/13697] Moving filesystem related functions to filesystem serviceMateBartus2015-04-1620-80/+1336
* | | | Merge branch '3.1.x'Dhruv2015-04-141-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | [ticket/13756] Fix resize after upload with pluploadOliver Schramm2015-04-111-2/+2
| | |/ | |/|
* | | Merge branch '3.1.x'Joas Schilling2015-04-101-0/+31
|\ \ \ | |/ /
| * | [prep-release-3.1.4] Add migration for 3.1.4-RC1Joas Schilling2015-04-091-0/+31
* | | Merge branch '3.1.x'Joas Schilling2015-04-061-0/+6
|\ \ \ | |/ /
| * | Merge pull request #3392 from marc1706/ticket/13493Joas Schilling2015-04-061-0/+6
| |\ \
| | * | [ticket/13493] Append page name to base url if it doesn't contain itMarc Alexander2015-02-111-0/+6