aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14078] Fix SQL error when editing a post with a quoteZoddo2015-09-131-1/+1
| | | | PHPBB3-14078
* [ticket/14158] Fix 5.3 compatibilityTristan Darricau2015-09-121-1/+1
| | | | PHPBB3-14158
* [ticket/14158] Add language::lang_array() to avoid using call_user_func_arrayTristan Darricau2015-09-121-10/+21
| | | | PHPBB3-14158
* Merge pull request #3870 from Zoddo/ticket/9485Tristan Darricau2015-09-092-1/+50
|\ | | | | | | | | | | | | | | | | [ticket/9485] Add a "View post" link in the moderation logs * Zoddo/ticket/9485: [ticket/9485] Fix tests [ticket/9485] Add post_id to relevant $phpbb_log->add() [ticket/9485] Add a "View post" link in the moderation logs
| * [ticket/9485] Add a "View post" link in the moderation logsZoddo2015-08-302-1/+50
| | | | | | | | PHPBB3-9485
* | Merge branch '3.1.x'Tristan Darricau2015-09-091-0/+1
|\ \ | | | | | | | | | | | | * 3.1.x: [ticket/13423] Set busyTimeout on connect to prevent db locking
| * \ Merge pull request #3890 from marc1706/ticket/13423Tristan Darricau2015-09-091-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13423] Set busyTimeout on connect to prevent db locking * marc1706/ticket/13423: [ticket/13423] Set busyTimeout on connect to prevent db locking
| | * | [ticket/13423] Set busyTimeout on connect to prevent db lockingMarc Alexander2015-09-071-0/+1
| | | | | | | | | | | | | | | | PHPBB3-13423
* | | | Merge pull request #3891 from marc1706/ticket/14150Tristan Darricau2015-09-092-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14150] Update fast-image-size to newest version * marc1706/ticket/14150: [ticket/14150] Update fast-image-size to newest version
| * | | | [ticket/14150] Update fast-image-size to newest versionMarc Alexander2015-09-082-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-14150
* | | | | 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 drivers
| | * | [ticket/14142] Remove unused ignore_configs from avatar driversMatt Friedman2015-09-041-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14142
* | | | Merge branch '3.1.x'Joas Schilling2015-09-051-0/+31
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: build/build.xml
| * | | Merge branch 'prep-release-3.1.6' into 3.1.xJoas Schilling2015-09-051-0/+31
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | * | [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
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14123] Fix typo [ticket/14123] Remove redundant help messages [ticket/14123] Add descriptive help to the CLI help output
| * | | Merge pull request #3855 from VSEphpbb/ticket/14123Tristan Darricau2015-09-021-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14123] Add descriptive help to the CLI help output * VSEphpbb/ticket/14123: [ticket/14123] Fix typo [ticket/14123] Remove redundant help messages [ticket/14123] Add descriptive help to the CLI help output
| | * | | [ticket/14123] Remove redundant help messagesMatt Friedman2015-08-2814-14/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-14123
| | * | | [ticket/14123] Add descriptive help to the CLI help outputMatt Friedman2015-08-2315-0/+15
| | | | | | | | | | | | | | | | | | | | PHPBB3-14123
* | | | | Merge branch '3.1.x'Tristan Darricau2015-09-021-2/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/11468] Allow controllers to set paramters of page_header()
| * | | | Merge pull request #3872 from Zoddo/ticket/11468Tristan Darricau2015-09-021-2/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11468] Allow controllers to set paramters of page_header() * Zoddo/ticket/11468: [ticket/11468] Allow controllers to set paramters of page_header()
| | * | | | [ticket/11468] Allow controllers to set paramters of page_header()Zoddo2015-08-301-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11468
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-09-011-0/+22
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | | | | | * 3.1.x: [ticket/13950] Hide undefined categories [ticket/13950] Hide undefined permissions
| * | | | [ticket/13950] Hide undefined categoriesZoddo2015-08-281-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This hides the categories added by disabled extensions PHPBB3-13950
| * | | | [ticket/13950] Hide undefined permissionsZoddo2015-08-281-0/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | This hides the permissions of the disabled extensions PHPBB3-13950
* | | | Merge branch '3.1.x'Tristan Darricau2015-08-281-4/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13988] Update tests [ticket/13988] Use absolute path for image attachments in feeds
| * | | Merge pull request #3764 from Zoddo/ticket/13988Tristan Darricau2015-08-281-4/+2
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | [ticket/13988] Use absolute path for image attachments in feeds * Zoddo/ticket/13988: [ticket/13988] Update tests [ticket/13988] Use absolute path for image attachments in feeds
| | * | [ticket/13988] Use absolute path for image attachments in feedsCarstenF2015-07-151-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | Previously, atom feeds use relative links for image attachments PHPBB3-13988
* | | | Merge pull request #3858 from Nicofuma/ticket/14125Máté Bartus2015-08-281-12/+45
|\ \ \ \ | | | | | | | | | | [ticket/14125] Add --env option to all CLI commands
| * | | | [ticket/14125] Add --env option to all CLI commandsTristan Darricau2015-08-241-12/+45
| | | | | | | | | | | | | | | | | | | | PHPBB3-14125
* | | | | Merge pull request #3470 from Nicofuma/ticket/13645Máté Bartus2015-08-2827-539/+1281
|\ \ \ \ \ | | | | | | | | | | | | [ticket/13645] Move the feeds to controllers
| * | | | | [ticket/13645] Fix docblocksTristan Darricau2015-08-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13645
| * | | | | [ticket/13645] Proper OOP for feedsTristan Darricau2015-08-2314-320/+505
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13645
| * | | | | [ticket/13645] Move the feeds to controllersNicofuma2015-08-2316-224/+779
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13645
* | | | | | Merge pull request #3863 from VSEphpbb/ticket/14128Tristan Darricau2015-08-271-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14128] Fix img bbcode regression, lost postimage class * VSEphpbb/ticket/14128: [ticket/14128] Fix img bbcode regression, lost postimage class
| * | | | | | [ticket/14128] Fix img bbcode regression, lost postimage classMatt Friedman2015-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14128
* | | | | | | [ticket/12505] Fix variable usage in migration filen-aleha2015-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12505
* | | | | | | [ticket/12505] Add migrationn-aleha2015-08-241-0/+83
| |_|/ / / / |/| | | | | | | | | | | | | | | | | PHPBB3-12505
* | | | | | Merge pull request #3652 from Elsensee/ticket/12143Tristan Darricau2015-08-232-0/+70
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12143] Make it possible to use translated group names for non-special groups * Elsensee/ticket/12143: [ticket/12143] Fix tests after rebase [ticket/12143] Avoid no output from get_group_name() [ticket/12143] Fix those tests [ticket/12143] Add some tests [ticket/12143] Oops, fixed array index [ticket/12143] Replace group name output [ticket/12143] Add group helper class to translate groupnames [ticket/12143] Add is_set method to language service
| * | | | | [ticket/12143] Add group helper class to translate groupnamesOliver Schramm2015-08-051-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can translate groupnames now even though these groups aren't special PHPBB3-12143
| * | | | | [ticket/12143] Add is_set method to language serviceOliver Schramm2015-08-051-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need that. PHPBB3-12143
* | | | | | Merge pull request #3842 from CHItA/ticket/14097Tristan Darricau2015-08-231-3/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14097] Improve error and failure handling in the installer * CHItA/ticket/14097: [ticket/14097] Remove auto refresh on install failure [ticket/14097] Improve error and failure handling in the installer
| * | | | | | [ticket/14097] Remove auto refresh on install failureMate Bartus2015-08-211-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14097
| * | | | | | [ticket/14097] Improve error and failure handling in the installerMate Bartus2015-08-171-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14097
* | | | | | | Merge branch '3.1.x'Joas Schilling2015-08-231-0/+31
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | | | | | [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] Update Twig to 1.20.0
| | * | | | | | [ticket/14099] Fix the assetsTristan Darricau2015-08-181-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14099
| | * | | | | | [ticket/14099] Fix testsTristan Darricau2015-08-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14099