aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.3.x'HEADmasterMarc Alexander2020-02-016-4/+51
|\
| * Merge branch '3.2.x' into 3.3.xMarc Alexander2020-02-016-4/+51
| |\
| | * Merge pull request #5832 from KYPREO/ticket/16329•••[ticket/16329] Add configuration options for Plupload origin/3.2.xMarc Alexander2020-02-016-4/+51
| | |\
| | | * [ticket/16329] Add configuration options for Plupload•••PHPBB3-16329 PHPBB3-16330 KYPREO2020-01-283-6/+6
| | | * Merge branch '3.2.x' into ticket/16329KYPREO2020-01-222-0/+18
| | | |\
| | | * | [ticket/16329] Add configuration options for Plupload•••PHPBB3-16329 PHPBB3-16330 KYPREO2020-01-224-7/+7
| | | * | [ticket/16329] Add configuration options for Plupload•••PHPBB3-16329 PHPBB3-16330 KYPREO2020-01-203-27/+21
| | | * | [ticket/16329] Add configuration options for Plupload•••PHPBB3-16329 PHPBB3-16330 KYPREO2020-01-205-5/+58
* | | | | Merge branch '3.3.x'Marc Alexander2020-01-303-7/+7
|\| | | |
| * | | | Merge pull request #5843 from JoshyPHP/ticket/16342•••[ticket/16342] Increase default hashing costs for Argon2 passwords Marc Alexander2020-01-303-7/+7
| |\ \ \ \
| | * | | | [ticket/16342] Increase default hashing costs for Argon2 passwords•••PHPBB3-16342 JoshyPHP2020-01-283-7/+7
* | | | | | Merge branch '3.3.x'Marc Alexander2020-01-301-1/+18
|\| | | | |
| * | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-301-1/+18
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Merge pull request #5834 from mrgoldy/ticket/15370•••[ticket/15370] Loading indicator when submitting permissions Marc Alexander2020-01-301-1/+18
| | |\ \ \
| | | * | | [ticket/15370] Loading indicator when submitting permissions•••PHPBB3-15370 mrgoldy2020-01-211-1/+18
| | | |/ /
* | | | | Merge branch '3.3.x'Marc Alexander2020-01-272-110/+95
|\| | | |
| * | | | Merge pull request #5825 from AlfredoRamos/ticket/16313•••[ticket/16313] Remove http block from sample Nginx configuration file Marc Alexander2020-01-272-110/+95
| |\ \ \ \
| | * | | | [ticket/16313] Remove http block from sample Nginx configuration file•••Change placeholder domain to example.com Also prefer fastcgi.conf over fastcgi_params as per Nginx documentation. PHPBB3-16313 Alfredo Ramos2020-01-092-110/+95
* | | | | | Merge branch '3.3.x'Marc Alexander2020-01-252-0/+9
|\| | | | |
| * | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-252-0/+9
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge pull request #5837 from 3D-I/ticket/16337•••[ticket/16337] Fix Emoji in BBcode Helpline Marc Alexander2020-01-252-0/+9
| | |\ \ \ \
| | | * | | | [ticket/16337] Fix Emoji in BBcode Helpline•••PHPBB3-16337 3D-I2020-01-241-1/+4
| | | * | | | [ticket/16337] Fix Emoji in BBcode Helpline•••PHPBB3-16337 3D-I2020-01-241-1/+7
| | | * | | | [ticket/16337] Fix Emoji in BBcode Helpline•••PHPBB3-16337 3D-I2020-01-242-2/+2
* | | | | | | Merge branch '3.3.x'Marc Alexander2020-01-241-19/+26
|\| | | | | |
| * | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-241-19/+26
| |\| | | | |
| | * | | | | Merge pull request #5836 from 3D-I/ticket/16316•••[ticket/16316] Fix breadcrumbs markup validation Marc Alexander2020-01-241-19/+28
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | [ticket/16316] Fix breadcrumbs markup validation•••PHPBB3-16316 3D-I2020-01-241-3/+3
| | | * | | | [ticket/16316] Fix breadcrumbs markup validation•••PHPBB3-16316 3D-I2020-01-211-19/+28
| | | | |_|/ | | | |/| |
* | | | | | Merge branch '3.3.x'Marc Alexander2020-01-221-6/+0
|\| | | | |
| * | | | | Merge pull request #5822 from rxu/ticket/16307•••[ticket/16307] Fix SQL time reporting when debug.sql_explain parameter is set Marc Alexander2020-01-221-6/+0
| |\ \ \ \ \
| | * | | | | [ticket/16307] Fix SQL time reporting when debug.sql_explain parameter is set•••PHPBB3-16307 rxu2020-01-081-6/+0
* | | | | | | Merge branch '3.3.x'Marc Alexander2020-01-224-9/+10
|\| | | | | |
| * | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-224-9/+10
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge pull request #5833 from mrgoldy/ticket/16332•••[ticket/16332] Code and Quote language strings globally available Marc Alexander2020-01-224-9/+10
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | [ticket/16332] Amend formatting tests to expect translated code string•••PHPBB3-16332 mrgoldy2020-01-212-6/+6
| | | * | | | [ticket/16332] Code and Quote language strings globally available•••PHPBB3-16332 mrgoldy2020-01-212-3/+4
| | | | |_|/ | | | |/| |
* | | | | | Merge branch '3.3.x'Marc Alexander2020-01-201-0/+6
|\| | | | |
| * | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-201-0/+6
| |\| | | |
| | * | | | Merge pull request #5814 from 3D-I/ticket/15079•••[ticket/15079] Fix Emoji and rich text in subject of post draft Marc Alexander2020-01-201-0/+6
| | |\ \ \ \
| | | * | | | [ticket/15079] Fix Emoji and rich text in Draft subject•••User can save Emoji in drafts since the topic title is checked on post submission already. Moreover this way the draft can not be lost somehow. PHPBB3-15079 3D-I2020-01-021-18/+1
| | | * | | | [ticket/15079] Fix Emoji and rich text in Draft subject•••PHPBB3-15079 3D-I2020-01-021-0/+23
* | | | | | | Merge branch '3.3.x'Marc Alexander2020-01-201-0/+12
|\| | | | | |
| * | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-201-0/+12
| |\| | | | |
| | * | | | | Merge pull request #5813 from 3D-I/ticket/15712•••[ticket/15712] Fix Emoji and rich text in PM subject & draft Marc Alexander2020-01-201-0/+12
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | [ticket/15712] Add Emoji and rich text in PM Draft subject•••Extends to Drafts PHPBB3-15712 3D-I2020-01-031-0/+6
| | | * | | | [ticket/15712] Add Emoji and rich text in PM subject•••PHPBB3-15712 3D-I2020-01-021-0/+6
| | | |/ / /
* | | | | | Merge branch '3.3.x'Marc Alexander2020-01-183-7/+12
|\| | | | |
| * | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-183-7/+12
| |\| | | |
| | * | | | Merge pull request #5821 from marc1706/ticket/16296•••[ticket/16296] Adjust form token check for mark actions Marc Alexander2020-01-183-7/+12
| | |\ \ \ \
| | | * | | | [ticket/16296] Adjust form token check for mark actions•••PHPBB3-16296 Marc Alexander2020-01-073-7/+12
* | | | | | | Merge branch '3.3.x'Marc Alexander2020-01-181-2/+2
|\| | | | | |
| * | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-181-2/+2
| |\| | | | |
| | * | | | | Merge pull request #5830 from marc1706/ticket/16328•••[ticket/16328] Inform admins about PHP requirements in phpBB 3.3 Marc Alexander2020-01-181-2/+2
| | |\ \ \ \ \
| | | * | | | | [ticket/16328] Inform admins about PHP requirements in phpBB 3.3•••PHPBB3-16328 Marc Alexander2020-01-181-2/+2
| | |/ / / / /
* | | | | | | Merge branch '3.3.x'Marc Alexander2020-01-182-4/+6
|\| | | | | |
| * | | | | | Merge pull request #5828 from AlfredoRamos/ticket/16323•••[ticket/16323] Replace the spaceless tag with its homologue filter Marc Alexander2020-01-182-4/+6
| |\ \ \ \ \ \
| | * | | | | | [ticket/16323] Replace the spaceless tag with its homologue filter•••PHPBB3-16323 Alfredo Ramos2020-01-142-4/+6
| |/ / / / / /
* | | | | | | Merge pull request #5808 from marc1706/ticket/16284•••[ticket/16284] Move 4.0 migrations to v400 folderMarc Alexander2020-01-1438-352/+625
|\ \ \ \ \ \ \
| * | | | | | | [ticket/16284] Add depends_on to classes•••PHPBB3-16284 Marc Alexander2020-01-146-0/+42
| * | | | | | | [ticket/16284] Adjust create schema and add tables to tests•••PHPBB3-16284 Marc Alexander2020-01-0116-31/+103
| * | | | | | | [ticket/16284] Add effectively installed checks where applicable•••PHPBB3-16284 Marc Alexander2020-01-018-119/+181
| * | | | | | | [ticket/16284] Add effectively_installed to add_storage_permission•••PHPBB3-16284 Marc Alexander2020-01-011-6/+20
| * | | | | | | [ticket/16284] Use tables array in acp_storage_module•••PHPBB3-16284 Marc Alexander2020-01-011-1/+1
| * | | | | | | [ticket/16284] Provide tables as array in migrations•••PHPBB3-16284 Marc Alexander2020-01-013-9/+34
| * | | | | | | [ticket/16284] Add effectively_installed check to acp_storage_module•••PHPBB3-16284 Marc Alexander2020-01-011-8/+30
| * | | | | | | [ticket/16284] Add migration for 4.0.0-dev•••PHPBB3-16284 Marc Alexander2020-01-011-0/+36
| * | | | | | | [ticket/16284] Move migrations not included in 3.3 to v400•••PHPBB3-16284 Marc Alexander2020-01-0110-0/+0
* | | | | | | | Merge branch '3.3.x'Marc Alexander2020-01-131-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-131-1/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge pull request #5819 from mrgoldy/ticket/16291•••[ticket/16291] Add missing report time Marc Alexander2020-01-131-1/+1
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | [ticket/16291] Add missing report time•••PHPBB3-16291 mrgoldy2020-01-051-1/+1
| | | | |/ / / | | | |/| | |
* | | | | | | Merge branch '3.3.x'Marc Alexander2020-01-111-5/+1
|\| | | | | |
| * | | | | | Merge pull request #5826 from 3D-I/ticket/16308•••[ticket/16308] Fix UCP reset password Marc Alexander2020-01-111-5/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | [ticket/16308] Fix UCP reset password•••PHPBB3-16308 3D-I2020-01-111-1/+1
| | * | | | | [ticket/16308] Fix UCP reset password•••remove HTML from PHP and code beautify PHPBB3-16308 3D-I2020-01-102-3/+2
| | * | | | | [ticket/16308] Fix UCP reset password•••PHPBB3-16308 3D-I2020-01-092-6/+3
| |/ / / / /
* | | | | | Merge branch '3.3.x'Marc Alexander2020-01-094-7/+34
|\| | | | |
| * | | | | Merge pull request #5823 from JoshyPHP/ticket/16309•••[ticket/16309] Fix smilies with a left square bracket Marc Alexander2020-01-094-7/+34
| |\ \ \ \ \
| | * | | | | [ticket/16309] Fix smilies with a left square bracket•••PHPBB3-16309 JoshyPHP2020-01-084-7/+34
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch '3.3.x'Marc Alexander2020-01-0921-46/+110
|\| | | | |
| * | | | | Merge pull request #5812 from rxu/ticket/16288•••[ticket/16288] PHP 8 compatibility Marc Alexander2020-01-0921-46/+110
| |\ \ \ \ \
| | * | | | | [ticket/16288] Drop redundant parentheses•••PHPBB3-16288 rxu2020-01-081-1/+1
| | * | | | | [ticket/16288] PHP 8 compatibility•••PHPBB3-16288 rxu2020-01-0321-46/+110
* | | | | | | Merge branch '3.3.x'Marc Alexander2020-01-091-1/+1
|\| | | | | |
| * | | | | | Merge pull request #5824 from rxu/ticket/16311•••[ticket/16311] Fix password length ACP setting explanation Marc Alexander2020-01-091-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | [ticket/16311] Fix password length ACP setting explanation•••PHPBB3-16311 rxu2020-01-091-1/+1
| |/ / / / /
* | | | | | Merge pull request #5731 from marc1706/ticket/16204•••[ticket/16204] Remove hooks systemMarc Alexander2020-01-069-433/+21
|\ \ \ \ \ \
| * | | | | | [ticket/16204] Remove mentions of hooks•••PHPBB3-16204 Marc Alexander2019-12-061-2/+0
| * | | | | | [ticket/16204] Remove hook finder and services file•••PHPBB3-16204 Marc Alexander2019-11-234-107/+0
| * | | | | | [ticket/16204] Remove hooks system•••PHPBB3-16204 Marc Alexander2019-11-076-324/+21
* | | | | | | Merge branch '3.3.x'Marc Alexander2020-01-0613-31/+119
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'prep-release-3.3.0' into 3.3.xMarc Alexander2020-01-0618-36/+124
| |\ \ \ \ \ \
| | * | | | | | [prep-release-3.3.0] Update changelogMarc Alexander2020-01-061-0/+1
| | * | | | | | Merge pull request #5820 from marc1706/ticket/16293•••[ticket/16293] Do not update to hashes that don't support combined hashing Marc Alexander2020-01-061-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | [ticket/16293] Do not update to hashes that don't support combined hashing•••PHPBB3-16293 Marc Alexander2020-01-061-1/+1
| | * | | | | | | [prep-release-3.3.0] Rename 3.3 to ProteusMarc Alexander2020-01-051-3/+3
| | * | | | | | | Merge pull request #5818 from marc1706/ticket/16266•••[ticket/16266] Remove extra declaration of constants Marc Alexander2020-01-051-11/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | [ticket/16266] Remove extra declaration of constants•••PHPBB3-16266 Marc Alexander2020-01-051-11/+3
| | | |/ / / / / /
| | * | | | | | | [prep-release-3.3.0] Update changelogMarc Alexander2020-01-041-0/+1