aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | | | 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 commit
| | * | | | | | [ticket/14104] Fix missing variables from previous commitbrunoais2015-08-151-0/+4
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing variables wrongly attributed in PHPBB3-13691 PHPBB3-14104
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-201-0/+20
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | [ticket/14037] Minor coding style improvements to eventMarc Alexander2015-08-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14037
| * | | | | [ticket/14037] Allows adapting memberlist profile fields headlinejaviexin2015-08-201-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an event to allow modifying the profile fields headline in line with modifications to profile fields data. PHPBB3-14037
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-08-202-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | * 3.1.x: [ticket/14116] sql_affectedrows method has no arguments
| * | | | Merge pull request #3848 from VSEphpbb/ticket/14116Andreas Fischer2015-08-202-3/+3
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | [ticket/14116] sql_affectedrows method has no arguments * VSEphpbb/ticket/14116: [ticket/14116] sql_affectedrows method has no arguments
| | * | | [ticket/14116] sql_affectedrows method has no argumentsMatt Friedman2015-08-192-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-14116
* | | | | Merge branch '3.1.x'Marc Alexander2015-08-131-0/+8
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/13968] Add core.user_setup_after eventZoddo2015-08-121-0/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | It allows to execute code at the end of user setup. It can replace the phpbb_user_session_handler hook. PHPBB3-13968
* | | | Merge branch '3.1.x'Andreas Fischer2015-08-101-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration
| * | | Merge pull request #3811 from marcovo/ticket/14069Andreas Fischer2015-08-101-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration * marcovo/ticket/14069: [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration
| | * | | [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migrationMarco Kubuntu2015-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the sql_fetchfield() call to comply to the function definition. PHPBB3-14069
* | | | | Merge branch '3.1.x'Marc Alexander2015-08-091-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3822 from brunoais/ticket/14083Marc Alexander2015-08-091-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14083] Fix wrong variables from previous commit
| | * | | | [ticket/14083] Fix wrong variables from previous commitbrunoais2015-08-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing variables wrongly attributed in PHPBB3-13693 PHPBB3-14083
* | | | | | Merge branch '3.1.x'Marc Alexander2015-08-091-5/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/14082] Fix wrong variables from previous commitbrunoais2015-08-081-5/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixing variables wrongly attributed in PHPBB3-13686 PHPBB3-14082
* | | | | Merge branch '3.1.x'Marc Alexander2015-08-081-7/+67
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/phpbb/avatar/driver/upload.php tests/avatar/manager_test.php
| * | | | Merge pull request #3738 from javiexin/ticket/13981Marc Alexander2015-08-081-7/+67
| |\ \ \ \ | | |/ / / | |/| | | | | | | | [ticket/13981] Add events to capture avatar deletion or overwriting
| | * | | [ticket/13981] Add events to capture avatar deletion or overwritingjaviexin2015-07-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An event to capture new avatar moving in place (and maybe overwriting existing avatar), and another to capture deletion. Includes better error processing. Rename event. PHPBB3-13981
| | * | | [ticket/13981] Add events to capture avatar deletion or overwritingjaviexin2015-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An event to capture overwriting, and another to capture deletion. Includes better error processing. Replaced global by dependency injection. Fix typo. PHPBB3-13981