aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14660] Fix parsing board email messages through template engine.rxu2016-06-182-13/+19
| | | | PHPBB3-14660
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-131-5/+24
|\
| * [ticket/14626] Event core.make_jumpbox_modify_tpl_aryTobi Schäfer2016-06-131-4/+2
| | | | | | | | PHPBB3-14626
| * [ticket/14626] Event core.make_jumpbox_modify_tpl_aryTobi Schäfer2016-06-131-2/+2
| | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-14626 PHPBB3-14626
| * [ticket/14626] Event core.make_jumpbox_modify_tpl_aryTobi Schäfer2016-06-131-5/+26
| | | | | | | | PHPBB3-14626
* | Merge branch '3.1.x' into 3.2.xAndreas Fischer2016-06-111-1/+1
|\ \ | |/ | | | | | | * 3.1.x: [ticket/14291] Do not update filesize if displaying thumbnail
| * [ticket/14291] Do not update filesize if displaying thumbnailMarc Alexander2016-05-301-1/+1
| | | | | | | | PHPBB3-14291
* | [ticket/14649] Add preview variable back to ucp_profile for eventRichard McGirr2016-05-261-1/+3
| | | | | | | | PHPBB3-14649
* | [ticket/14624] Remove no longer existing event argumemtMarc Alexander2016-05-161-1/+0
| | | | | | | | PHPBB3-14624
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-05-151-0/+26
|\ \ | |/ | | | | | | Conflicts: phpBB/includes/ucp/ucp_profile.php
| * [ticket/14624] Remove whitespaceRichard McGirr2016-05-051-2/+2
| | | | | | | | PHPBB3-14624
| * [ticket/14624] Fix typo and phpBB versionRichard McGirr2016-05-051-2/+2
| | | | | | | | PHPBB3-14624
| * [ticket/14624] Move event so it actually worksRichard McGirr2016-05-051-13/+13
| | | | | | | | PHPBB3-14624
| * [ticket/14624] Add event to ucp_profile in signature sectionRichard McGirr2016-05-051-0/+26
| | | | | | | | PHPBB3-14624
| * [3.1.x] Increase version for 3.1.10 developmentJoas Schilling2016-04-091-1/+1
| |
| * [prep-release-3.1.9] Update version to 3.1.9-RC1Joas Schilling2016-04-091-1/+1
| |
* | [ticket/13616] Fix UI testsTristan Darricau2016-04-031-2/+0
| | | | | | | | PHPBB3-13616
* | [ticket/13616] Updates direct call to twig environment constructorTristan Darricau2016-04-032-2/+0
| | | | | | | | PHPBB3-13616
* | [ticket/14426] Fixed undefined offset errorJoshyPHP2016-04-031-0/+5
| | | | | | | | PHPBB3-14426
* | Merge pull request #4271 from kasimi/ticket/14562-3.2.xTristan Darricau2016-04-021-2/+2
|\ \ | | | | | | | | | | | | | | | | | | [ticket/14562] Language fallback for extension permissions (3.2.x) * kasimi/ticket/14562-3.2.x: [ticket/14562] Language fallback for extension permissions (3.2.x)
| * | [ticket/14562] Language fallback for extension permissions (3.2.x)kasimi2016-04-011-2/+2
| | | | | | | | | | | | PHPBB3-14562
* | | Revert "[ticket/14562] Language fallback for extension permissions"Tristan Darricau2016-04-021-31/+2
| | | | | | | | | | | | This reverts commit 621b958b1ca41e1def6349e07e0e3c8258a9d9f3.
* | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-04-021-2/+31
|\ \ \ | | |/ | |/| | | | | | | * 3.1.x: [ticket/14562] Language fallback for extension permissions
| * | Merge pull request #4270 from kasimi/ticket/14562Tristan Darricau2016-04-021-2/+31
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14562] Language fallback for extension permissions * kasimi/ticket/14562: [ticket/14562] Language fallback for extension permissions
| | * | [ticket/14562] Language fallback for extension permissionskasimi2016-04-011-2/+31
| | | | | | | | | | | | | | | | PHPBB3-14562
* | | | Merge branch 'ticket/14577' into ticket/14577-3.2.xMarc Alexander2016-04-023-10/+10
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | Conflicts: phpBB/includes/acp/acp_modules.php
| * | [ticket/14577] Do not calculate size of array in for loopMarc Alexander2016-04-024-11/+11
| |/ | | | | | | | | | | | | For loops that modify the size of the looped arrays were obviously not changed. PHPBB3-14577
| * Merge pull request #4021 from marc1706/ticket/14272Tristan Darricau2016-03-277-22/+61
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14272] Use html5 valid input elements * marc1706/ticket/14272: [ticket/14272] Allow input of floats for filesize [ticket/14272] Use input type number instead of text in avatars [ticket/14272] Assign min and max values for avatar driver settings [ticket/14272] Define min and max values for avatar width and height [ticket/14272] Disable not toggled form elements [ticket/14272] Make sure phpbb_avatar_manager was defined [ticket/14272] Remove useless check [ticket/14272] Fix invalid or missing min/max settings [ticket/14272] Assign min/max for all allowed types [ticket/14272] Only use maxlength and size for allowed input elements
* | \ Merge pull request #4251 from marc1706/ticket/14272-3.2.xTristan Darricau2016-03-277-25/+61
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14272] Use html5 valid input elements * marc1706/ticket/14272-3.2.x: [ticket/14272] Allow input of floats for filesize [ticket/14272] Use input type number instead of text in avatars [ticket/14272] Assign min and max values for avatar driver settings [ticket/14272] Define min and max values for avatar width and height [ticket/14272] Disable not toggled form elements [ticket/14272] Make sure phpbb_avatar_manager was defined [ticket/14272] Remove useless check [ticket/14272] Fix invalid or missing min/max settings [ticket/14272] Assign min/max for all allowed types [ticket/14272] Only use maxlength and size for allowed input elements
| * \ \ Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.xMarc Alexander2016-03-277-25/+61
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/adm/style/acp_icons.html phpBB/includes/acp/acp_groups.php phpBB/includes/acp/acp_users.php phpBB/includes/functions_acp.php phpBB/includes/ucp/ucp_groups.php phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html phpBB/styles/prosilver/template/ucp_avatar_options_remote.html phpBB/styles/subsilver2/template/mcp_topic.html phpBB/styles/subsilver2/template/posting_attach_body.html phpBB/styles/subsilver2/template/posting_body.html phpBB/styles/subsilver2/template/posting_poll_body.html phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
| | * | [ticket/14272] Allow input of floats for filesizeMarc Alexander2016-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This might be needed while switching the default input from KiB to MiB or similar changes to settings. PHPBB3-14272
| | * | [ticket/14272] Assign min and max values for avatar driver settingsMarc Alexander2016-01-013-0/+24
| | | | | | | | | | | | | | | | PHPBB3-14272
| | * | [ticket/14272] Define min and max values for avatar width and heightMarc Alexander2015-12-271-0/+7
| | | | | | | | | | | | | | | | PHPBB3-14272
| | * | [ticket/14272] Make sure phpbb_avatar_manager was definedMarc Alexander2015-12-033-3/+8
| | | | | | | | | | | | | | | | PHPBB3-14272
| | * | [ticket/14272] Remove useless checkMarc Alexander2015-11-081-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14272
| | * | [ticket/14272] Fix invalid or missing min/max settingsMarc Alexander2015-11-061-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14272
| | * | [ticket/14272] Assign min/max for all allowed typesMarc Alexander2015-11-061-4/+4
| | | | | | | | | | | | | | | | PHPBB3-14272
| | * | [ticket/14272] Only use maxlength and size for allowed input elementsMarc Alexander2015-11-063-16/+19
| | | | | | | | | | | | | | | | PHPBB3-14272
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-271-0/+6
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14481] Add tests for x_forwarded_proto header [ticket/14481] Use port 443 if https is specified in x-forwarded-proto [ticket/14481] Respect HTTP_X_FORWARDED headers for implying https
| * | | Merge pull request #4182 from marc1706/ticket/14481Tristan Darricau2016-03-271-0/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14481] Respect HTTP_X_FORWARDED headers for implying https * marc1706/ticket/14481: [ticket/14481] Add tests for x_forwarded_proto header [ticket/14481] Use port 443 if https is specified in x-forwarded-proto [ticket/14481] Respect HTTP_X_FORWARDED headers for implying https
| | * | | [ticket/14481] Use port 443 if https is specified in x-forwarded-protoMarc Alexander2016-02-161-0/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-14481
* | | | | Merge pull request #4228 from Senky/ticket/9435Marc Alexander2016-03-274-27/+43
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | [ticket/9435] Replace BBcode magic numbers with constants
| * | | | [ticket/9435] Switch "ID" and BBcode name in constants keysJakub Senko2016-03-193-39/+39
| | | | | | | | | | | | | | | | | | | | PHPBB3-9435
| * | | | [ticket/9435] Add NUM_PREDEFINED_BBCODES constantJakub Senko2016-03-182-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-9435
| * | | | [ticket/9435] Convert bbcode magic numbers to constantsJakub Senko2016-03-183-26/+41
| | | | | | | | | | | | | | | | | | | | PHPBB3-9435
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-261-4/+20
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14134] Fix Okay in a comment. [ticket/14134] Fix code comments. [ticket/14134] Send warning notification PM in user's language.
| * | | | Merge pull request #3874 from lavigor/ticket/14134Tristan Darricau2016-03-261-4/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14134] Send warning notification PM in user's language. * lavigor/ticket/14134: [ticket/14134] Fix Okay in a comment. [ticket/14134] Fix code comments. [ticket/14134] Send warning notification PM in user's language.
| | * | | | [ticket/14134] Fix Okay in a comment.lavigor2016-03-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14134
| | * | | | [ticket/14134] Fix code comments.lavigor2016-02-271-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14134
| | * | | | [ticket/14134] Send warning notification PM in user's language.lavigor2015-09-021-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14134
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-11 16:38:46 +0000