aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #4266 from marc1706/ticket/13502Tristan Darricau2016-04-031-3/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13502] Handle callable functions/objects in controller resolver * marc1706/ticket/13502: [ticket/13502] Also cover passing object to resolver in tests [ticket/13502] Test getArguments() method of controller resolver [ticket/13502] Fix coding style [ticket/13502] Controller resolver should handle callable functions and objects
| * | | | | | [ticket/13502] Fix coding styleMarc Alexander2016-04-011-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13502
| * | | | | | [ticket/13502] Controller resolver should handle callable functions and objectsRFD2016-04-011-3/+12
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-13502
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-04-031-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * 3.1.x: [ticket/14532] Do not escape column default in mssql
| * | | | | [ticket/14532] Do not escape column default in mssqlMarc Alexander2016-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The column default shouldn't be escaped for mssql. This is a regression from 743d816631292a2081af4c5f7fc2fad2aff17c58. Prior to that commit, the default value for the column was not escaped. Escaping it will cause SQL errors while altering columns. PHPBB3-14532
* | | | | | Merge branch 'ticket/14577' into ticket/14577-3.2.xMarc Alexander2016-04-021-1/+1
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | | Conflicts: phpBB/includes/acp/acp_modules.php
* | | | | Merge pull request #4255 from CHItA/ticket/14393Tristan Darricau2016-03-313-11/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14393] Fix updater behaviour * CHItA/ticket/14393: [ticket/14393] Fix db update progress bar [ticket/14393] Fix init for conflict archive [ticket/14393] Fix updater behaviour
| * | | | | [ticket/14393] Fix db update progress barMáté Bartus2016-03-301-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14393
| * | | | | [ticket/14393] Fix init for conflict archiveMáté Bartus2016-03-271-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14393
| * | | | | [ticket/14393] Fix updater behaviourMáté Bartus2016-03-273-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14393
* | | | | | 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 #4021 from marc1706/ticket/14272Tristan Darricau2016-03-277-19/+19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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/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
* | | | | | | [ticket/14564] Fix cookie domain calculationMáté Bartus2016-03-271-1/+8
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | PHPBB3-14564
* | | | | | Merge pull request #4251 from marc1706/ticket/14272-3.2.xTristan Darricau2016-03-277-19/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-19/+19
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | / / | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Fix invalid or missing min/max settingsMarc Alexander2015-11-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14272
| | * | | | [ticket/14272] Only use maxlength and size for allowed input elementsMarc Alexander2015-11-067-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14272
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-272-2/+10
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | | | | | | | | | | * 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-272-2/+10
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Respect HTTP_X_FORWARDED headers for implying httpsMarc Alexander2016-02-152-2/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-14481
* | | | | Merge pull request #4199 from VSEphpbb/ticket/12684Tristan Darricau2016-03-261-0/+328
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Add extended help for the user:add commandMatt Friedman2016-03-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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-291-143/+136
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | [ticket/12684] Add send email optionMatt Friedman2016-02-291-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | [ticket/12684] Add input validationMatt Friedman2016-02-291-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | [ticket/12684] Updates for 3.2 APIMatt Friedman2016-02-291-10/+32
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | [ticket/12684] Fix header fileTristan Darricau2016-02-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | [ticket/12684] Fix testsTristan Darricau2016-02-291-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | [ticket/12684] Add doc blocks and test file for user:addLEZY Thomas2016-02-291-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
| * | | | | [ticket/12684] Add command user:addLEZY Thomas2016-02-291-0/+167
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12684
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-251-4/+30
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14241] Log fatal captcha error to error log [ticket/14241] Prevent empty q&a as a result of improper settings
| * | | | | Merge pull request #4214 from marc1706/ticket/14241Tristan Darricau2016-03-251-4/+30
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14241] Prevent empty q&a as a result of improper settings * marc1706/ticket/14241: [ticket/14241] Log fatal captcha error to error log [ticket/14241] Prevent empty q&a as a result of improper settings
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-11 23:32:39 +0000