aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-251-15/+15
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14437] Make sure attachments array is properly ordered before processing [ticket/14437] Preserve attachment ID order by ordering by attach_id [ticket/14437] Sort attachments after assigning inline attachments [ticket/14437] Correctly assume index from attachment display order
| * | | | | Merge pull request #4190 from marc1706/ticket/14437Tristan Darricau2016-03-251-15/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14437] Correctly assume index from attachment display order * marc1706/ticket/14437: [ticket/14437] Make sure attachments array is properly ordered before processing [ticket/14437] Preserve attachment ID order by ordering by attach_id [ticket/14437] Sort attachments after assigning inline attachments [ticket/14437] Correctly assume index from attachment display order
| | * | | | | [ticket/14437] Make sure attachments array is properly ordered before processingMarc Alexander2016-03-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14437
| | * | | | | [ticket/14437] Sort attachments after assigning inline attachmentsMarc Alexander2016-03-061-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does not seem to cause any issues but prevents us from having to consider the currenty display order. PHPBB3-14437
| | * | | | | [ticket/14437] Correctly assume index from attachment display orderMarc Alexander2016-02-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14437
* | | | | | | Merge pull request #4218 from marc1706/ticket/14527Tristan Darricau2016-03-252-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14527] Retrieve link URL from href and not link text * marc1706/ticket/14527: [ticket/14527] Decode automatically generated postlink without prefix [ticket/14527] Add tests for reverted improper fix [ticket/14527] Retrieve link URL from href and not link text
| * | | | | | | [ticket/14527] Decode automatically generated postlink without prefixMarc Alexander2016-03-132-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The http prefix gets automatically added and should be removed prior to outputting the post to the user. PHPBB3-14527
| * | | | | | | [ticket/14527] Retrieve link URL from href and not link textMarc Alexander2016-03-132-2/+2
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-14527
* | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-251-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13630] Prevent empty parameter select_single
| * | | | | | Merge pull request #4231 from Senky/ticket/13630Tristan Darricau2016-03-251-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13630] Prevent empty parameter select_single * Senky/ticket/13630: [ticket/13630] Prevent empty parameter select_single
| | * | | | | | [ticket/13630] Prevent empty parameter select_singleJakub Senko2016-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13630
* | | | | | | | Merge pull request #4239 from marc1706/ticket/14530Tristan Darricau2016-03-252-2/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14530] Only generate text again if sig was parsed for storage * marc1706/ticket/14530: [ticket/14530] Only generate text again if sig was parsed for storage [ticket/14530] Add accidentally removed sig_parsed flag
| * | | | | | | | [ticket/14530] Only generate text again if sig was parsed for storageMarc Alexander2016-03-242-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14530
* | | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-251-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14290] Correctly use modified since header
| * | | | | | | | [ticket/14290] Correctly use modified since headerMarc Alexander2016-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14290
* | | | | | | | | Merge pull request #4237 from Nicofuma/ticket/14555Marc Alexander2016-03-242-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14555] Uniformize cache directory usages
| * | | | | | | | | [ticket/14555] Uniformize cache directory usagesTristan Darricau2016-03-242-4/+4
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14555
* | | | | | | | | Merge branch 'ticket/14136' into ticket/14136-3.2.xMarc Alexander2016-03-242-0/+3
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/adm/style/install_update_diff.html phpBB/adm/style/installer_header.html phpBB/install/database_update.php phpBB/install/index.php phpBB/styles/subsilver2/template/overall_header.html phpBB/styles/subsilver2/template/simple_header.html phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html phpBB/styles/subsilver2/template/viewtopic_print.html
| * | | | | | | [ticket/14136] Add back X-UA-Compatible meta tagMarc Alexander2016-03-242-0/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was previously removed without needing to. Adding it back to force users to not emulate the page for previous versions of IE. The imagetoolbar http-equiv tag was not restored as IE does not contain that anymore since IE7. Also, the chome=1 has been removed from the X-UA-Compatible content as ChromeFrame does not receive any further updates since 2014 and is potentially broken. PHPBB3-14136
* | | | | | | [ticket/14550] Fix the number of characters returned by unique_id()Tristan Darricau2016-03-231-1/+1
| |/ / / / / |/| | | | | | | | | | | | | | | | | PHPBB3-14450
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-101-4/+19
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4184 from lavigor/ticket/14486Marc Alexander2016-03-101-4/+19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14486] Add an event and fix an event in login_box()
| | * | | | | [ticket/14486] Use empty() and move error check.lavigor2016-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14486
| | * | | | | [ticket/14486] Add an event and fix an event in login_box()lavigor2016-02-181-4/+19
| | | |_|/ / | | |/| | | | | | | | | | | | | | | PHPBB3-14486
* | | | | | [ticket/13264] Don't force approved state if post visibility is known (3.2)Máté Bartus2016-03-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous PR broke 3.2 because of different variable names PHPBB3-13264
* | | | | | Merge branch '3.1.x' into 3.2.xMáté Bartus2016-03-091-1/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13264] Link to post if user can view it [ticket/13264] Do not force approved state if post visibility is known
| * | | | | Merge pull request #4205 from marc1706/ticket/13264Máté Bartus2016-03-091-1/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | [ticket/13264] Do not force approved state if post visibility is known
| | * | | | | [ticket/13264] Link to post if user can view itMarc Alexander2016-03-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13264
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 11:46:44 +0000