aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14576] Move common required files to bootstrapMatt Friedman2016-03-31141-289/+10
| | | | PHPBB3-14576
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-3132-0/+160
|\
| * Merge pull request #4264 from VSEphpbb/ticket/14570Marc Alexander2016-03-3132-0/+160
| |\ | | | | | | | | | [ticket/14570] Add effectively installed to 3.1.x versions
| | * [ticket/14570] Use phpbb_version_compareMatt Friedman2016-03-2932-32/+32
| | | | | | | | | | | | PHPBB3-14570
| | * [ticket/14570] Add effectively installed to 3.1.x versionsMatt Friedman2016-03-2932-0/+160
| | | | | | | | | | | | PHPBB3-14570
* | | Merge pull request #4267 from GregRyckman/ticket/14572Marc Alexander2016-03-301-2/+2
|\ \ \ | | | | | | | | | | | | [ticket/14572] Fix quote notification deletion
| * | | [ticket/14572] Fix quote notification deletionGreg Ryckman2016-03-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some array_key calls were incorrect in the notification checks for quotes. Two calls were being made in a row, resulting in incorrect arrays. PHPBB3-14572
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-301-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ / | | | Conflicts: composer.phar
| * | Merge pull request #4259 from Nicofuma/ticket/14565Marc Alexander2016-03-302-0/+5
| |\ \ | | | | | | | | | | | | [ticket/14565] Updates composer.phar to 1.0.0-beta2
| | * | [ticket/14565] Workaround for php 5.3.3Tristan Darricau2016-03-291-0/+5
| | | | | | | | | | | | | | | | PHPBB3-14565
| | * | [ticket/14565] Updates composer.phar to 1.0.0-beta2Tristan Darricau2016-03-271-0/+0
| | | | | | | | | | | | | | | | PHPBB3-14565
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-301-6/+7
|\ \ \ \ | |/ / /
| * | | Merge pull request #4262 from Senky/ticket/10356Marc Alexander2016-03-301-6/+7
| |\ \ \ | | | | | | | | | | | | | | | [ticket/10356] Find inactive users in livesearch when having permissions
| | * | | [ticket/10356] Find inactive users in livesearch when having permissionsJakub Senko2016-03-291-6/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | While original ticket request is already fixed, livesearch did not reflect it. PHPBB3-10356
* | | | Merge branch '3.1.x' into 3.2.xMáté Bartus2016-03-282-7/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/14568] Update the repository readme
| * | | Merge pull request #4260 from VSEphpbb/ticket/14568Máté Bartus2016-03-282-7/+7
| |\ \ \ | | |/ / | |/| | [ticket/14568] Update the repository readme
| | * | [ticket/14568] Update the repository readmeMatt Friedman2016-03-282-7/+7
| | |/ | | | | | | | | | PHPBB3-14568
* | | Merge pull request #4257 from CHItA/ticket/14564Marc Alexander2016-03-281-1/+8
|\ \ \ | | | | | | | | | | | | [ticket/14564] Fix cookie domain calculation
| * | | [ticket/14564] Fix cookie domain calculationMáté Bartus2016-03-271-1/+8
|/ / / | | | | | | | | | PHPBB3-14564
* | | Merge pull request #4252 from RMcGirr83/ticket_14329Tristan Darricau2016-03-271-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14329] Add missing ACP language vars * RMcGirr83/ticket_14329: [ticket/14329] Add missing ACP language vars
| * | | [ticket/14329] Add missing ACP language varsRichard McGirr2016-03-271-0/+10
| | | | | | | | | | | | | | | | PHPBB3-14329
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-270-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | * 3.1.x:
| * | | Merge pull request #4021 from marc1706/ticket/14272Tristan Darricau2016-03-2739-93/+139
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-2733-87/+130
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-2733-87/+130
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This might be needed while switching the default input from KiB to MiB or similar changes to settings. PHPBB3-14272
| | * | | | [ticket/14272] Use input type number instead of text in avatarsMarc Alexander2016-01-013-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14272
| | * | | | [ticket/14272] Assign min and max values for avatar driver settingsMarc Alexander2016-01-015-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14272
| | * | | | [ticket/14272] Define min and max values for avatar width and heightMarc Alexander2015-12-272-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14272
| | * | | | [ticket/14272] Disable not toggled form elementsMarc 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-064-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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-0630-80/+83
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14272
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-275-6/+126
|\ \ \ \ \ \ | | |_|/ / / | |/| | / / | |_|_|/ / |/| | | | | | | | | | | | | | * 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-275-6/+126
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Add tests for x_forwarded_proto headerMarc Alexander2016-03-101-3/+103
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14481
| | * | | | [ticket/14481] Use port 443 if https is specified in x-forwarded-protoMarc Alexander2016-02-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14481
| | * | | | [ticket/14481] Respect HTTP_X_FORWARDED headers for implying httpsMarc Alexander2016-02-153-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | 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.xMarc Alexander2016-03-271-5/+6
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #4246 from RMcGirr83/ticket_13625Marc Alexander2016-03-271-5/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13625] Fix types of properties
| | * | | | | | [ticket/13625] Fix types of propertiesRichard McGirr2016-03-251-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13625
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-271-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge pull request #4230 from Senky/ticket/13028Marc Alexander2016-03-271-1/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | [ticket/13028] Rename unanswered search label
| | * | | | | [ticket/13028] Rename unanswered search labelJakub Senko2016-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13028
generated by cgit v1.2.1 (git 2.21.0) at 2026-01-04 23:13:24 +0000