aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4930 from rubencm/ticket/15201Marc Alexander2017-10-221-2/+2
|\ | | | | | | [ticket/15201] Set user style to default style when it is disabled or uninstalled
| * [ticket/15201] FixRubén Calvo2017-08-281-6/+2
| | | | | | | | PHPBB3-15201
| * [ticket/15201] CastingsRubén Calvo2017-08-281-2/+6
| | | | | | | | PHPBB3-15201
| * [ticket/15201] Set user style to default style when it is disabled or ↵Rubén Calvo2017-08-281-2/+2
| | | | | | | | | | | | uninstalled PHPBB3-15201
* | Merge pull request #4910 from javiexin/ticket/15331_BMarc Alexander2017-10-171-6/+1
|\ \ | | | | | | | | | [ticket/15331] Allow gravatars to be overridden by existing event - B
| * | [ticket/15331] Allow gravatars to be changed in the existing eventjaviexin2017-08-191-6/+1
| | | | | | | | | | | | | | | | | | | | | Option B: - change the get_avatar function PHPBB3-15331
| * | Merge branch 'prep-release-3.1.11' into 3.1.xMarc Alexander2017-07-162-0/+12
| |\ \
* | \ \ Merge pull request #5003 from kasimi/ticket/15409Marc Alexander2017-10-171-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15409] Add u_action to core.acp_users_overview_run_quicktool
| * | | | [ticket/15409] Add u_action to core.acp_users_overview_run_quicktoolkasimi2017-10-161-2/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-15409
* | | | | Merge pull request #4888 from javiexin/ticket/15306Marc Alexander2017-10-131-2/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | [ticket/15306] Error and missing data in core.acp_users_profile_validate
| * | | | [ticket/15306] Error and missing data in core.acp_users_profile_validatejaviexin2017-08-061-2/+4
| |/ / / | | | | | | | | | | | | PHPBB3-15306
| * | | [3.1.x] Update version number to 3.1.12-devMarc Alexander2017-07-111-1/+1
| | | |
* | | | Merge pull request #4942 from rubencm/ticket/15172Marc Alexander2017-10-111-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15172] Fix redirection to wrong port
| * | | | [ticket/15172] Cast port to integerRubén Calvo2017-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-15172
| * | | | [ticket/15172] Use symfony request component to get portRubén Calvo2017-09-091-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-15172
* | | | | Merge pull request #4967 from Leinad4Mind/3.2.xOliver Schramm2017-10-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [PHPBB3-14629] round() the log() explicitly to a proper integer
| * | | | | [PHPBB3-14629] round() the log() explicitly to a proper integerDaniel Mota2017-09-211-1/+1
| | | | | |
* | | | | | [ticket/15362] Fix colspan in notification options tableJakub Senko2017-10-021-1/+1
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-15362
* | | | | Merge pull request #4889 from javiexin/ticket/15307Oliver Schramm2017-09-101-0/+16
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | [ticket/15307] Extensions may add modes to acp_users
| * | | | [ticket/15307] Extensions may add modes to acp_usersjaviexin2017-08-061-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes both PHP and Template events. PHPBB3-15307
* | | | | Merge pull request #4940 from Elsensee/ticket/15355Tristan Darricau2017-09-091-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15355] Remove version field when no update is available * github.com:phpbb/phpbb: [ticket/15355] Remove version field when no update is available
| * | | | | [ticket/15355] Remove version field when no update is availableOliver Schramm2017-09-091-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15355
* | | | | | Merge pull request #4932 from Nicofuma/ticket/15351Máté Bartus2017-09-091-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | [ticket/15351] Makes confirm_works in a router context (app.php)
| * | | | | [ticket/15351] Makes confirm_works in a router context (app.php)Tristan Darricau2017-09-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15351
* | | | | | [ticket/7845] Ensure config script path is not emptyMarc Alexander2017-09-081-1/+1
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-7845
* | | | | Merge pull request #4928 from Crizz0/ticket/15350Tristan Darricau2017-09-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15350] Changes outdated wiki-link for plural-rules to new docs/ * github.com:phpbb/phpbb: [ticket/15350] Changes outdated wiki-link to new docs/
| * | | | | [ticket/15350] Changes outdated wiki-link to new docs/Crizzo2017-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15350
* | | | | | Merge pull request #4900 from rxu/ticket/15318Máté Bartus2017-09-071-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/15318] Make user option to disable word censoring effective again
| * | | | | | [ticket/15318] Make user option to disable word censoring effective againrxu2017-08-121-0/+8
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | PHPBB3-15318
* | | | | | Merge pull request #4903 from rxu/ticket/15323Máté Bartus2017-09-071-1/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [ticket/15323] Allow Twig syntax in bbcode.html
| * | | | | [ticket/15323] Allow Twig syntax in bbcode.htmlrxu2017-08-151-1/+4
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-15323
* | | | | Merge pull request #4905 from rxu/ticket/15324Máté Bartus2017-09-073-5/+49
|\ \ \ \ \ | | | | | | | | | | | | [ticket/15324] Add more core and template events
| * | | | | [ticket/15324] Add more core and template eventsrxu2017-08-163-5/+49
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-15324
* | | | | [ticket/15328] Disable checkbox if notification method isn't supportedkasimi2017-08-241-3/+5
|/ / / / | | | | | | | | | | | | PHPBB3-15328
* | | | Merge branch 'prep-release-3.2.1' into 3.2.xMarc Alexander2017-07-162-0/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'prep-release-3.1.11' into prep-release-3.2.1Marc Alexander2017-07-161-0/+7
| |\ \ \ | | | |/ | | |/|
| | * | [prep-release-3.1.11] Update version numbers to 3.1.11Marc Alexander2017-07-161-1/+1
| | | |
| | * | Merge pull request #32 from phpbb/ticket/security-203Marc Alexander2017-07-161-0/+5
| | |\ \ | | | | | | | | | | | | | | | [ticket/security-203] Fully validate version check data in version helper
| | * \ \ Merge pull request #37 from phpbb/ticket/security/208Marc Alexander2017-07-161-0/+7
| | |\ \ \ | | | |_|/ | | |/| | | | | | | [ticket/security/208] Add form key to password reset form
| | | * | [ticket/security/208] Add form key to password reset formMarc Alexander2017-06-181-0/+7
| | | | | | | | | | | | | | | | | | | | SECURITY-208
| | * | | Merge branch '3.1.x' into prep-release-3.1.11Marc Alexander2017-06-251-5/+43
| | |\ \ \
| | * | | | [prep-release-3.1.11] Update version numbers to 3.1.11-RC1Marc Alexander2017-06-251-1/+1
| | | | | |
| * | | | | [prep-release-3.2.1] Update versions for 3.2.1Marc Alexander2017-07-161-1/+1
| | | | | |
| * | | | | Merge pull request #35 from phpbb/ticket/security-203-rheaMarc Alexander2017-07-161-0/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/security-203] Fully validate version check data in version helper -- Rhea
| | * \ \ \ \ Merge branch 'ticket/security-203' into ticket/security-203-rheaMarc Alexander2016-12-281-0/+5
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | [ticket/security-203] Fully validate version check data in version helperMarc Alexander2016-12-261-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will also take care of SECURITY-204 as it's the same underlying issue. Admins still need to ensure they don't visit malicious sites for URLs provided by extensions. SECURITY-203
* | | | | | | [3.2.x] Update version numbers for 3.2.2-devMarc Alexander2017-07-111-1/+1
|/ / / / / /
* | | | | | [prep-release-3.2.1] Update version numbers for 3.2.1-RC1Marc Alexander2017-06-251-1/+1
| | | | | |
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-251-5/+43
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #4804 from rxu/ticket/15186Marc Alexander2017-06-251-5/+43
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | [ticket/15186] Fully implement the force_delete_allowed feature