aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-301-6/+7
|\
| * [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 pull request #4021 from marc1706/ticket/14272Tristan Darricau2016-03-2738-89/+135
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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
* | | [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 pull request #4251 from marc1706/ticket/14272-3.2.xTristan Darricau2016-03-2732-83/+126
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-2732-83/+126
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0629-76/+79
| | | | | | | | | | | | | | | | | | | | PHPBB3-14272
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-274-3/+23
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | | | | | | | | * 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-274-3/+23
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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
| | * | | [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
* | | | | | | Merge pull request #4199 from VSEphpbb/ticket/12684Tristan Darricau2016-03-263-0/+352
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12684] Add console command user:add * VSEphpbb/ticket/12684: (26 commits) [ticket/12684] Use a switch statement for readability [ticket/12684] Refactor a test [ticket/12684] Use interactive method correctly [ticket/12684] Extract interactivity to a method [ticket/12684] Update option help [ticket/12684] Add extended help for the user:add command [ticket/12684] Add shorthand alternates to the options [ticket/12684] Remove whitespace [ticket/12684] Add an error on user creation failure [ticket/12684] Remove unnecessary null arguments [ticket/12684] Additional clean up [ticket/12684] Allowed to use $this in enclosure [ticket/12684] Move all lang keys to cli [ticket/12684] Fix a few mistakes and clean it up [ticket/12684] Some code clean up [ticket/12684] Another little fix [ticket/12684] Fix tests [ticket/12684] Update to use non-deprecated methods [ticket/12684] Add send email option [ticket/12684] Add input validation ...
| * | | | | | | [ticket/12684] Use a switch statement for readabilityMatt Friedman2016-03-211-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | | | [ticket/12684] Use interactive method correctlyMatt Friedman2016-03-091-30/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | | | [ticket/12684] Extract interactivity to a methodMatt Friedman2016-03-091-37/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | | | [ticket/12684] Update option helpMatt Friedman2016-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | | | [ticket/12684] Add extended help for the user:add commandMatt Friedman2016-03-082-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | | | [ticket/12684] Add shorthand alternates to the optionsMatt Friedman2016-03-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | | | [ticket/12684] Remove whitespaceMatt Friedman2016-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | | | [ticket/12684] Add an error on user creation failureMatt Friedman2016-03-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | | | [ticket/12684] Remove unnecessary null argumentsMatt Friedman2016-02-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | | | [ticket/12684] Additional clean upMatt Friedman2016-02-291-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | | | [ticket/12684] Allowed to use $this in enclosureMatt Friedman2016-02-291-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | | | [ticket/12684] Move all lang keys to cliMatt Friedman2016-02-293-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | | | [ticket/12684] Fix a few mistakes and clean it upMatt Friedman2016-02-291-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | | | [ticket/12684] Some code clean upMatt Friedman2016-02-291-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | | | [ticket/12684] Another little fixMatt Friedman2016-02-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | | | [ticket/12684] Fix testsMatt Friedman2016-02-291-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | | | [ticket/12684] Update to use non-deprecated methodsMatt Friedman2016-02-292-155/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684