aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Nicofuma2015-05-171-3/+23
|\
| * Merge pull request #3601 from nickvergessen/ticket/13827Nicofuma2015-05-171-3/+23
| |\ | | | | | | | | | [ticket/13827] Correctly return JSON instead of HTML when valled from AJAX
| | * [ticket/13827] Use JsonResponse instead of our hacky json_response with exit()Joas Schilling2015-05-141-8/+11
| | | | | | | | | | | | PHPBB3-13827
| | * [ticket/13827] Correctly return JSON instead of HTML when valled from AJAXJoas Schilling2015-05-091-3/+20
| | | | | | | | | | | | PHPBB3-13827
* | | Merge branch '3.1.x'Joas Schilling2015-05-166-9/+19
|\ \ \ | |/ /
| * | [ticket/13838] Fix coding styleNicofuma2015-05-146-9/+19
| | | | | | | | | | | | PHPBB3-13838
* | | Merge pull request #3591 from Nicofuma/ticket/12632Oliver Schramm2015-05-163-1/+17
|\ \ \ | | | | | | | | | | | | [ticket/12632] Add twig.debug and twig.auto_reload in config.yml
| * | | [ticket/12632] Add twig.debug and twig.auto_reload in config.ymlTristan Darricau2015-05-043-1/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-13206 PHPBB3-12632
* | | | Merge pull request #3581 from MateBartus/ticket/13804Nicofuma2015-05-142-3/+38
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13804] Make template's user dependency optional
| * | | | [ticket/13804] Remove unnecessary array_mergeMateBartus2015-05-111-6/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13804
| * | | | [ticket/13804] Make template's user dependency optionalMateBartus2015-05-052-3/+43
| | | | | | | | | | | | | | | | | | | | PHPBB3-13804
* | | | | Merge pull request #3577 from MateBartus/ticket/13800Nicofuma2015-05-141-7/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13800] Make router's extension manager dependency optional
| * | | | | [ticket/13800] Make router's extension manager dependency optionalMateBartus2015-05-021-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13800
* | | | | | Merge branch '3.1.x'Marc Alexander2015-05-081-1/+2
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #3598 from VSEphpbb/ticket/13822Marc Alexander2015-05-081-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13822] Correctly display softdelete and post detail perms
| | * | | | | [ticket/13822] Correctly display softdelete and post detail permsMatt Friedman2015-05-071-1/+2
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | PHPBB3-13822
* | | | | | Merge branch '3.1.x'Nicofuma2015-05-062-10/+159
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3583 from nickvergessen/ticket/13807Nicofuma2015-05-062-10/+159
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Ticket/13807 Allow building changesets for the event list
| | * | | | [ticket/13807] Fix minor coding flawsJoas Schilling2015-05-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807
| | * | | | [ticket/13807] Add an option to generate a diff for the release highlightsJoas Schilling2015-05-022-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807
| | * | | | [ticket/13807] Allow filtering template eventsJoas Schilling2015-05-021-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807
| | * | | | [ticket/13807] Allow filtering events by phpBB versionJoas Schilling2015-05-021-4/+101
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-05-061-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13819] Add missing sql_freeresult() to files in includes/ Conflicts: phpBB/includes/acp/acp_database.php
* | | | | [ticket/13638] Inject $filesystem in \phpbb\template\assetNicofuma2015-05-053-9/+29
| | | | | | | | | | | | | | | | | | | | PHPBB3-13638
* | | | | [ticket/13638] Handle assets outside of phpbb_root_pathNicofuma2015-05-041-3/+15
| | | | | | | | | | | | | | | | | | | | PHPBB3-13638
* | | | | [ticket/13638] Prepend the assets path phpbb rootNicofuma2015-05-041-2/+2
| |_|_|/ |/| | | | | | | | | | | PHPBB3-13638
* | | | Merge pull request #3590 from rxu/ticket/13814Tristan Darricau2015-05-041-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13814] Prevent phpbb_is_writable() method from truncating files
| * | | | [ticket/13814] Prevent phpbb_is_writable() method from truncating filesrxu2015-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phpbb_is_writable() of filesystem class uses 'w' mode to fopen files which causes checked files to be truncated. Use the 'c' mode instead. PHPBB3-13814
* | | | | [ticket/13782] Rename null log to dummy for PHP7 compatibilityMarc Alexander2015-05-041-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13782
* | | | | [ticket/13782] Rename null driver to dummy for PHP7 compatibilityMarc Alexander2015-05-041-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13782
* | | | | Merge branch '3.1.x'Joas Schilling2015-05-031-0/+32
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: build/build.xml
| * | | | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-05-031-0/+32
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | * | | | [prep-release-3.1.4] Add migrationJoas Schilling2015-05-031-0/+32
| | | | | |
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-05-031-0/+37
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | | | | | * 3.1.x: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release.
| * | | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-05-031-0/+37
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | * prep-release-3.1.4: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release. Conflicts: build/build.xml
| | * | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-05-031-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release. Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
* | | | [ticket/13762] Replace user service with lang in twig extensionMateBartus2015-05-021-6/+6
| | | | | | | | | | | | | | | | PHPBB3-13762
* | | | [ticket/13762] Optional DI injectable default language module arrayMateBartus2015-05-021-5/+14
| | | | | | | | | | | | | | | | PHPBB3-13762
* | | | [ticket/13762] Moving language related functionality into a separate classMateBartus2015-05-028-234/+1015
| | | | | | | | | | | | | | | | PHPBB3-13762
* | | | [ticket/13793] Remove translation on throwing exceptionsMateBartus2015-05-017-47/+20
| | | | | | | | | | | | | | | | PHPBB3-13793
* | | | 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
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | * | [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
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | * 3.1.x: [3.0.x] Add changelog for 3.0.14 release. [3.0.x] Bump version numbers for 3.0.14-RC1 release. [3.0.x] Bumping version numbers to final for 3.0.14 releases.
| * | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-281-0/+37
| |\ \ | | |/ | | | | | | | | | | | | | | | * prep-release-3.1.4: [3.0.x] Add changelog for 3.0.14 release. [3.0.x] Bump version numbers for 3.0.14-RC1 release. [3.0.x] Bumping version numbers to final for 3.0.14 releases.
| | * Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-04-281-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [3.0.x] Add changelog for 3.0.14 release. [3.0.x] Bump version numbers for 3.0.14-RC1 release. [3.0.x] Bumping version numbers to final for 3.0.14 releases. Conflicts: build/build.xml phpBB/docs/CHANGELOG.html phpBB/docs/INSTALL.html phpBB/includes/constants.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/imageset/imageset.cfg phpBB/styles/prosilver/style.cfg phpBB/styles/prosilver/template/template.cfg phpBB/styles/prosilver/theme/theme.cfg phpBB/styles/subsilver2/imageset/imageset.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/template.cfg phpBB/styles/subsilver2/theme/theme.cfg
* | | [ticket/8672] Remove outdated imagesize classMarc Alexander2015-04-241-549/+0
| | | | | | | | | | | | PHPBB3-8672
* | | [ticket/8672] Use fastImageSize in classesMarc Alexander2015-04-245-8/+8
| | | | | | | | | | | | PHPBB3-8672
* | | [ticket/8672] Updated the text_formatter.s9e serviceJoshyPHP2015-04-241-9/+5
| | | | | | | | | | | | PHPBB3-8672
* | | [ticket/8672] Add class for retrieving imagesize without downloadMarc Alexander2015-04-245-28/+581
| | | | | | | | | | | | | | | | | | | | | | | | getimagesize() always downloads the complete file before checking the actual image dimensions. This class will be able to do the same without having to download possibly large files. PHPBB3-8672
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-11 21:29:37 +0000