aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Joas Schilling2015-02-261-1/+1
|\ | | | | | | | | Conflicts: phpBB/includes/functions_mcp.php
| * [ticket/13652] Added $phpbb_dispatcher from global to phpbb_mcp_sorting()brunoais2015-02-251-1/+1
| | | | | | | | PHPBB3-13652
* | Merge branch '3.1.x'Joas Schilling2015-02-241-6/+52
|\ \ | |/
| * Merge pull request #3381 from rxu/ticket/13591Joas Schilling2015-02-241-6/+52
| |\ | | | | | | | | | [ticket/13591] Add core events to the function obtain_users_online_string()
| | * [ticket/13591] Add core events to the function obtain_users_online_string()rxu2015-02-081-6/+52
| | | | | | | | | | | | | | | | | | | | | Add functions.php core events to the function obtain_users_online_string() to allow extensions adding/modifying online users data. PHPBB3-13591
* | | Merge branch '3.1.x'Joas Schilling2015-02-241-1/+13
|\ \ \ | |/ /
| * | Merge pull request #3436 from RMcGirr83/ticket/13650Joas Schilling2015-02-241-1/+13
| |\ \ | | | | | | | | | | | | [ticket/13650] Validate ucp profile data changes
| | * | [ticket/13650] Validate ucp profile data changesRichard McGirr2015-02-231-1/+13
| | | | | | | | | | | | | | | | PHPBB3-13650
* | | | Merge branch '3.1.x'Joas Schilling2015-02-241-2/+2
|\ \ \ \ | |/ / /
| * | | [ticket/13587] SQL syntax errors in get_prune_users()RMcGirr832015-02-241-2/+2
| |/ / | | | | | | | | | PHPBB3-13587
* | | Merge branch '3.1.x'Joas Schilling2015-02-221-1/+41
|\ \ \ | |/ /
| * | Merge pull request #3415 from RMcGirr83/ticket/13578Joas Schilling2015-02-221-1/+41
| |\ \ | | | | | | | | | | | | [ticket/13578] Add ucp_register.php core events
| | * | [ticket/13578] Add ucp_register.php core eventsRMcGirr832015-02-221-1/+41
| | | | | | | | | | | | | | | | PHPBB3-13578
* | | | Merge branch '3.1.x'Joas Schilling2015-02-201-1/+2
|\ \ \ \ | |/ / /
| * | | Merge pull request #3423 from RMcGirr83/ticket/13635Joas Schilling2015-02-201-1/+2
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13635] Add sql_ary to ucp profile event
| | * | | [ticket/13635] Add sql_ary to ucp profile eventRMcGirr832015-02-191-1/+2
| | |/ / | | | | | | | | | | | | PHPBB3-13635
* | | | Merge branch '3.1.x'Joas Schilling2015-02-201-1/+4
|\ \ \ \ | |/ / /
| * | | Merge pull request #3277 from dhruvgoel92/ticket/13472Joas Schilling2015-02-201-1/+4
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13472] Delete admin activation notification when deleting user
| | * | | [ticket/13472] Delete admin activation notification when deleting userDhruv2015-01-111-1/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-13472
* | | | | Merge branch '3.1.x'Joas Schilling2015-02-201-0/+22
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3197 from brunoais/ticket/13142Joas Schilling2015-02-201-0/+22
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13142] Before query to list unapproved and deleted posts
| | * | | | [ticket/13142] BUMPed versionbrunoais2015-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13142
| | * | | | [ticket/13142] Fix typo: unaproved -> unapprovedbrunoais2014-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13142
| | * | | | [ticket/13142] BUMPing versionbrunoais2014-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13142
| | * | | | [ticket/13142] Adding core.mcp_sorting_unapproved_deleted_posts_query_beforebrunoais2014-11-281-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13142
* | | | | | Merge branch '3.1.x'Marc Alexander2015-02-184-40/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3395 from s9e/ticket/13595Marc Alexander2015-02-184-40/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13595] Remove unused instances of the bbcode class
| | * | | | | [ticket/13595] Removed unused codeJoshyPHP2015-02-134-40/+2
| | | |_|/ / | | |/| | | | | | | | | | | | | | | PHPBB3-13595
* | | | | | Merge branch '3.1.x'Marc Alexander2015-02-181-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/13433] Fix parsing of email addressesrxu2015-02-171-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently email addresses are parsed incorrectly due to the regex structure. Namely, if localpart consists of several dot separated parts, only the last part with the trailing dot will be captured. The patch change this behavior to capture the whole localpart. PHPBB3-13433
* | | | | [ticket/10748] Fix class type hintingJoas Schilling2015-02-151-3/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10748
* | | | | [ticket/13497] Update calls to `get_tables()`Gaëtan Muller2015-02-112-14/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-13497
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-02-115-11/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13597] Modify variable-variable syntax to be compatible with PHP7
| * | | | [ticket/13597] Modify variable-variable syntax to be compatible with PHP7Marc Alexander2015-02-115-11/+11
| | |_|/ | |/| | | | | | | | | | PHPBB3-13597
* | | | [ticket/10748] Replace direct creations of tools();Joas Schilling2015-02-072-4/+5
| | | | | | | | | | | | | | | | PHPBB3-10748
* | | | [ticket/13455] Remove `request_var()` references from commentsGaëtan Muller2015-02-033-5/+5
| | | | | | | | | | | | | | | | PHPBB3-13455
* | | | [ticket/13455] Remove unnecessary calls to `utf8_normalize_nfc()`Gaëtan Muller2015-02-0329-77/+77
| | | | | | | | | | | | | | | | PHPBB3-13455
* | | | [ticket/13455] Update calls to `request_var()`Gaëtan Muller2015-02-0363-789/+783
| | | | | | | | | | | | | | | | PHPBB3-13455
* | | | Merge pull request #3281 from MGaetan89/ticket/13496Andreas Fischer2015-02-0310-50/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13496] Change set_config_count() calls with $config->increment() * MGaetan89/ticket/13496: [ticket/13496] Update calls to `set_config_count()`
| * | | | [ticket/13496] Update calls to `set_config_count()`Gaëtan Muller2015-02-0210-50/+46
| | | | | | | | | | | | | | | | | | | | PHPBB3-13496
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-02-032-0/+3
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * develop-ascraeus: [ticket/13569] Add missing sql_freeresults and remove unneeded results
| * | | | Merge pull request #3361 from marc1706/ticket/13569Andreas Fischer2015-02-032-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13569] Add missing sql_freeresults and remove unneeded results * marc1706/ticket/13569: [ticket/13569] Add missing sql_freeresults and remove unneeded results
| | * | | | [ticket/13569] Add missing sql_freeresults and remove unneeded resultsMarc Alexander2015-02-022-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13569
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-02-022-6/+64
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3330 from kasimi/ticket/13540Joas Schilling2015-02-022-6/+64
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13540] Add core event for modifying topic review block data
| | * | | | | [ticket/13540] Added var row to both eventskasimi2015-01-252-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13540
| | * | | | | [ticket/13540] Add core event for MCP topic review block datakasimi2015-01-241-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to the previous event, this event triggers for each post in the MCP topic review. PHPBB3-13540
| | * | | | | [ticket/13540] Updated @since version to 3.4.1-RC1, fixed @var indentationskasimi2015-01-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13540
| | * | | | | [ticket/13540] Add core event for modifying topic review block datakasimi2015-01-241-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added event core.topic_review_modify_row in function topic_review() in functions_posting for modifying template data blocks for topic reviews. PHPBB3-13540
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-02-021-5/+87
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/mcp/mcp_queue.php