aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | | | [ticket/15186] Fully implement the force_delete_allowed featurerxu2017-04-191-5/+43
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15186
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-251-1/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/15250] Add core event to MCP at the end of merge_postsDaniel Sinn2017-06-201-1/+15
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-15250
* | | | | Merge pull request #4794 from lr94/ticket/15176Marc Alexander2017-06-242-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/15176] Add setting for user activity display limit.
| * | | | | [ticket/15176] Add setting for user activity display limit.lr942017-04-162-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up to phpBB 3.2 the maximum number of posts a user must have to have his activity shown is 5000. This limit is hardcoded in functions_display.php. It would be useful if board administrators could choose to disable the limit or to set an higher value. PHPBB3-15176
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-052-2/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #4840 from rmcgirr83/ticket_15237Marc Alexander2017-06-052-2/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/15237] Fix unguarded includes to functions_user
| | * | | | | [ticket/15237] Fix unguarded includes to functions_userRMcGirr832017-05-242-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-15237 PHPBB3-15237
* | | | | | | Merge pull request #4833 from javiexin/ticket/15227Marc Alexander2017-06-051-78/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15227] Check PHP version and remove old unused code
| * | | | | | | [ticket/15227] Remove function deregister_globals, not neededjaviexin2017-05-211-58/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15227
| * | | | | | | [ticket/15227] Remove STRIP, as always falsejaviexin2017-05-211-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15227
| * | | | | | | [ticket/15227] Check PHP version and remove old unused codejaviexin2017-05-121-21/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15227
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-051-1/+31
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #4810 from rxu/ticket/15199Marc Alexander2017-06-051-1/+31
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15199] Add core event to the messenger send() function
| | * | | | | | | [ticket/15199] Add core event to the messenger send() functionrxu2017-04-271-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15199
* | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-053-21/+63
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #4784 from rubencm/ticket/15150Marc Alexander2017-06-053-21/+63
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15150] Add Jabber SSL context configuration options
| | * | | | | | | | [ticket/15150] Remove php4 constructorRubén Calvo2017-04-171-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB-15150