Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4889 from javiexin/ticket/15307 | Oliver Schramm | 2017-09-10 | 1 | -0/+16 |
|\ | | | | | | | [ticket/15307] Extensions may add modes to acp_users | ||||
| * | [ticket/15307] Extensions may add modes to acp_users | javiexin | 2017-08-06 | 1 | -0/+16 |
| | | | | | | | | | | | | Includes both PHP and Template events. PHPBB3-15307 | ||||
* | | Merge pull request #4940 from Elsensee/ticket/15355 | Tristan Darricau | 2017-09-09 | 1 | -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 available | Oliver Schramm | 2017-09-09 | 1 | -1/+4 |
| | | | | | | | | | | | | PHPBB3-15355 | ||||
* | | | Merge pull request #4932 from Nicofuma/ticket/15351 | Máté Bartus | 2017-09-09 | 1 | -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 Darricau | 2017-09-08 | 1 | -3/+3 |
| | | | | | | | | | | | | PHPBB3-15351 | ||||
* | | | [ticket/7845] Ensure config script path is not empty | Marc Alexander | 2017-09-08 | 1 | -1/+1 |
|/ / | | | | | | | PHPBB3-7845 | ||||
* | | Merge pull request #4928 from Crizz0/ticket/15350 | Tristan Darricau | 2017-09-07 | 1 | -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/ | Crizzo | 2017-09-07 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-15350 | ||||
* | | | Merge pull request #4900 from rxu/ticket/15318 | Máté Bartus | 2017-09-07 | 1 | -0/+8 |
|\ \ \ | | | | | | | | | [ticket/15318] Make user option to disable word censoring effective again | ||||
| * | | | [ticket/15318] Make user option to disable word censoring effective again | rxu | 2017-08-12 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | PHPBB3-15318 | ||||
* | | | | Merge pull request #4903 from rxu/ticket/15323 | Máté Bartus | 2017-09-07 | 1 | -1/+4 |
|\ \ \ \ | |_|/ / |/| | | | [ticket/15323] Allow Twig syntax in bbcode.html | ||||
| * | | | [ticket/15323] Allow Twig syntax in bbcode.html | rxu | 2017-08-15 | 1 | -1/+4 |
| |/ / | | | | | | | | | | PHPBB3-15323 | ||||
* | | | Merge pull request #4905 from rxu/ticket/15324 | Máté Bartus | 2017-09-07 | 3 | -5/+49 |
|\ \ \ | | | | | | | | | [ticket/15324] Add more core and template events | ||||
| * | | | [ticket/15324] Add more core and template events | rxu | 2017-08-16 | 3 | -5/+49 |
| |/ / | | | | | | | | | | PHPBB3-15324 | ||||
* | | | [ticket/15328] Disable checkbox if notification method isn't supported | kasimi | 2017-08-24 | 1 | -3/+5 |
|/ / | | | | | | | PHPBB3-15328 | ||||
* | | Merge branch 'prep-release-3.2.1' into 3.2.x | Marc Alexander | 2017-07-16 | 2 | -0/+12 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'prep-release-3.1.11' into prep-release-3.2.1 | Marc Alexander | 2017-07-16 | 1 | -0/+7 |
| |\ | |||||
| | * | [prep-release-3.1.11] Update version numbers to 3.1.11 | Marc Alexander | 2017-07-16 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #32 from phpbb/ticket/security-203 | Marc Alexander | 2017-07-16 | 1 | -0/+5 |
| | |\ | | | | | | | | | | | | | [ticket/security-203] Fully validate version check data in version helper | ||||
| | * \ | Merge pull request #37 from phpbb/ticket/security/208 | Marc Alexander | 2017-07-16 | 1 | -0/+7 |
| | |\ \ | | | | | | | | | | | | | | | | [ticket/security/208] Add form key to password reset form | ||||
| | | * | | [ticket/security/208] Add form key to password reset form | Marc Alexander | 2017-06-18 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | SECURITY-208 | ||||
| | * | | | Merge branch '3.1.x' into prep-release-3.1.11 | Marc Alexander | 2017-06-25 | 1 | -5/+43 |
| | |\ \ \ | |||||
| | * | | | | [prep-release-3.1.11] Update version numbers to 3.1.11-RC1 | Marc Alexander | 2017-06-25 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | [prep-release-3.2.1] Update versions for 3.2.1 | Marc Alexander | 2017-07-16 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #35 from phpbb/ticket/security-203-rhea | Marc Alexander | 2017-07-16 | 1 | -0/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/security-203] Fully validate version check data in version helper -- Rhea | ||||
| | * \ \ \ \ | Merge branch 'ticket/security-203' into ticket/security-203-rhea | Marc Alexander | 2016-12-28 | 1 | -0/+5 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | [ticket/security-203] Fully validate version check data in version helper | Marc Alexander | 2016-12-26 | 1 | -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-dev | Marc Alexander | 2017-07-11 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | [prep-release-3.2.1] Update version numbers for 3.2.1-RC1 | Marc Alexander | 2017-06-25 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-06-25 | 1 | -5/+43 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge pull request #4804 from rxu/ticket/15186 | Marc Alexander | 2017-06-25 | 1 | -5/+43 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | [ticket/15186] Fully implement the force_delete_allowed feature | ||||
| | * | | | | [ticket/15186] Fully implement the force_delete_allowed feature | rxu | 2017-04-19 | 1 | -5/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15186 | ||||
* | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-06-25 | 1 | -1/+15 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | [ticket/15250] Add core event to MCP at the end of merge_posts | Daniel Sinn | 2017-06-20 | 1 | -1/+15 |
| | |_|_|/ | |/| | | | | | | | | | | | | | PHPBB3-15250 | ||||
* | | | | | Merge pull request #4794 from lr94/ticket/15176 | Marc Alexander | 2017-06-24 | 2 | -3/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/15176] Add setting for user activity display limit. | ||||
| * | | | | | [ticket/15176] Add setting for user activity display limit. | lr94 | 2017-04-16 | 2 | -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.x | Marc Alexander | 2017-06-05 | 2 | -2/+8 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #4840 from rmcgirr83/ticket_15237 | Marc Alexander | 2017-06-05 | 2 | -2/+8 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/15237] Fix unguarded includes to functions_user | ||||
| | * | | | | | [ticket/15237] Fix unguarded includes to functions_user | RMcGirr83 | 2017-05-24 | 2 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-15237 PHPBB3-15237 | ||||
* | | | | | | | Merge pull request #4833 from javiexin/ticket/15227 | Marc Alexander | 2017-06-05 | 1 | -78/+5 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15227] Check PHP version and remove old unused code | ||||
| * | | | | | | | [ticket/15227] Remove function deregister_globals, not needed | javiexin | 2017-05-21 | 1 | -58/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15227 | ||||
| * | | | | | | | [ticket/15227] Remove STRIP, as always false | javiexin | 2017-05-21 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15227 | ||||
| * | | | | | | | [ticket/15227] Check PHP version and remove old unused code | javiexin | 2017-05-12 | 1 | -21/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15227 | ||||
* | | | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-06-05 | 1 | -1/+31 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #4810 from rxu/ticket/15199 | Marc Alexander | 2017-06-05 | 1 | -1/+31 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15199] Add core event to the messenger send() function | ||||
| | * | | | | | | | [ticket/15199] Add core event to the messenger send() function | rxu | 2017-04-27 | 1 | -1/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15199 | ||||
* | | | | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-06-05 | 3 | -21/+63 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #4784 from rubencm/ticket/15150 | Marc Alexander | 2017-06-05 | 3 | -21/+63 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15150] Add Jabber SSL context configuration options | ||||
| | * | | | | | | | | [ticket/15150] Remove php4 constructor | Rubén Calvo | 2017-04-17 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB-15150 |