aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3395 from s9e/ticket/13595Marc Alexander2015-02-186-65/+3
|\ | | | | | | [ticket/13595] Remove unused instances of the bbcode class
| * [ticket/13595] Removed unused codeJoshyPHP2015-02-136-65/+3
| | | | | | | | PHPBB3-13595
* | Merge pull request #3420 from marc1706/ticket/13628Marc Alexander2015-02-185-0/+40
|\ \ | | | | | | | | | [ticket/13628] Allow ability for extension to add entries to user's profile
| * | [ticket/13628] Allow ability for extension to add entries to user's profileRMcGirr832015-02-185-0/+40
|/ / | | | | | | PHPBB3-13628
* | Merge pull request #3414 from rxu/ticket/13433Marc Alexander2015-02-182-1/+223
|\ \ | | | | | | | | | [ticket/13433] Fix parsing of email addresses
| * | [ticket/13433] Add make_clickable() test for emailsrxu2015-02-181-0/+222
| | | | | | | | | | | | PHPBB3-13433
| * | [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
* | | Merge pull request #3411 from Senky/ticket/13570Andreas Fischer2015-02-171-2/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13570] Mysqli extension supports persistent connection since PHP 5.3.0 * Senky/ticket/13570: [ticket/13570] Remove unnecessary ternary condition from mysqli driver
| * | | [ticket/13570] Remove unnecessary ternary condition from mysqli driverJakub Senko2015-02-161-2/+1
| |/ / | | | | | | | | | PHPBB3-13570
* | | Merge pull request #3412 from Senky/ticket/13618Marc Alexander2015-02-171-1/+1
|\ \ \ | |/ / |/| | | | | [ticket/13618] Small grammatical typo in the English FAQ
| * | [ticket/13618] Fix typo in English FAQJakub Senko2015-02-161-1/+1
|/ / | | | | | | PHPBB3-13618
* | Merge pull request #3403 from marc1706/ticket/13615Marc Alexander2015-02-151-3/+3
|\ \ | | | | | | | | | [ticket/13615] Correctly display images for gallery avatar in subsilver2
| * | [ticket/13615] Correctly display images for gallery avatar in subsilver2kamijoutouma2015-02-151-3/+3
|/ / | | | | | | | | | | | | | | Avatar Gallery shows categories but no images in subsilver2. The ID was not specified in the template. Also, the correct parent template loop is called avatar_local_row and not avatar_local_col. PHPBB3-13615
* | Merge branch 'develop-olympus' into develop-ascraeusMarc Alexander2015-02-130-0/+0
|\ \ | |/ |/| | | | | | | Conflicts: .travis.yml travis/phpunit-mysqli-travis.xml
| * Merge pull request #3393 from bantu/ticket/13599Marc Alexander2015-02-133-70/+2
| |\ | | | | | | | | | [ticket/13599] Remove Travis CI PHP 5.2 environment. No longer supported.
| | * [ticket/13599] Remove Travis CI PHP 5.2 environment. No longer supported.Andreas Fischer2015-02-123-70/+2
| |/ | | | | | | PHPBB3-13599
* | Merge pull request #3391 from marc1706/ticket/13597Andreas Fischer2015-02-117-14/+14
|\ \ | | | | | | | | | | | | | | | | | | [ticket/13597] Modify variable-variable syntax to be compatible with PHP7 * marc1706/ticket/13597: [ticket/13597] Modify variable-variable syntax to be compatible with PHP7
| * | [ticket/13597] Modify variable-variable syntax to be compatible with PHP7Marc Alexander2015-02-117-14/+14
|/ / | | | | | | PHPBB3-13597
* | Merge pull request #3379 from Crizz0/ticket/13588Joas Schilling2015-02-071-1/+1
|\ \ | | | | | | | | | [ticket/13588] Fixes wrong message in info fsockopen() disabled
| * | [ticket/13588] Fixes wrong message in info fsockopen() disabledCrizzo2015-02-071-1/+1
|/ / | | | | | | PHPBB3-13588
* | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-02-030-0/+0
|\ \ | |/ | | | | * develop-olympus:
| * Merge pull request #3365 from marc1706/ticket/13348-olympusAndreas Fischer2015-02-031-5/+7
| |\ | | | | | | | | | | | | | | | | | | | | | [ticket/13348] Use close method to free query result handle * marc1706/ticket/13348-olympus: [ticket/13348] Remove unnecessary global $cache [ticket/13348] Use close method to free query result handle
* | \ Merge pull request #3366 from marc1706/ticket/13348Andreas Fischer2015-02-031-5/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13348] Use close method to free feed query result handle * marc1706/ticket/13348: [ticket/13348] Remove unnecessary global $cache [ticket/13348] Use close method to free query result handle
| * \ \ Merge branch 'ticket/13348-olympus' into ticket/13348Marc Alexander2015-02-031-5/+6
| |\ \ \ |/ / / / | | | _ | | | | | | Conflicts: phpBB/feed.php
| * | [ticket/13348] Remove unnecessary global $cacheMarc Alexander2015-02-031-1/+1
| | | | | | | | | | | | | | | | | | $cache is not used in the method get_item(). PHPBB3-13348
| * | [ticket/13348] Use close method to free query result handleMarc Alexander2015-02-031-4/+6
| |/ | | | | | | PHPBB3-13348
* | Merge pull request #3328 from marc1706/ticket/13538Andreas Fischer2015-02-033-0/+72
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13538] Add tests for pagination in nested loops * marc1706/ticket/13538: [ticket/13538] Add tests for double nested pagination loop [ticket/13538] Fix tests for pagination in nested loop [ticket/13538] Add test for pagination in nested loop
| * | [ticket/13538] Add tests for double nested pagination loopMarc Alexander2015-01-242-0/+39
| | | | | | | | | | | | PHPBB3-13538
| * | [ticket/13538] Fix tests for pagination in nested loopMarc Alexander2015-01-242-2/+7
| | | | | | | | | | | | PHPBB3-13538
| * | [ticket/13538] Add test for pagination in nested loopMarc Alexander2015-01-232-0/+28
| | | | | | | | | | | | PHPBB3-13538
* | | Merge pull request #3361 from marc1706/ticket/13569Andreas Fischer2015-02-036-2/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [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-026-2/+7
| | | | | | | | | | | | | | | | PHPBB3-13569
* | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-02-031-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * develop-olympus: [ticket/13572] Update composer to version 1.0.0-alpha9
| * | | Merge pull request #3363 from Nicofuma/ticket/13572Andreas Fischer2015-02-031-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13572] Update composer to version 1.0.0-alpha9 * Nicofuma/ticket/13572: [ticket/13572] Update composer to version 1.0.0-alpha9
| | * | | [ticket/13572] Update composer to version 1.0.0-alpha9Nicofuma2015-02-031-0/+0
| |/ / / | | | | | | | | | | | | PHPBB3-13572
* | | | 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 pull request #3326 from Wolfsblvt-Test/ticket/13537Joas Schilling2015-02-021-5/+87
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Add core events on mcp_queue for approval and disapproval
| * | | | | [ticket/13537] Add core events on mcp_queue for approval and disapprovalWolfsblvt2015-01-231-5/+87
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Events added for the functions approve_posts(), approve_topics() and disapprove_posts() in mcp_queue.php, so that you can send notifications during approval and disapproval. PHPBB3-13537
* | | | | Merge pull request #3325 from rxu/ticket/13536Joas Schilling2015-02-022-1/+49
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13536] Add ACP/UCP core events to allow modifying user profile data on editing
| * | | | | [ticket/13536] Add core events to allow modifying user profile data on editingrxu2015-01-232-1/+49
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Event request: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=33744 PHPBB3-13536
* | | | | Merge pull request #3324 from rxu/ticket/13336Joas Schilling2015-02-021-1/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13336] Add core events to the function user_active_flip()
| * | | | | [ticket/13336] Add core events to the function user_active_flip()rxu2015-01-231-1/+31
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core events to the function user_active_flip() in includes/functions_user.php to allow checking/modifying data while activating/deactivating users. PHPBB3-13336
* | | | | Merge pull request #3323 from rxu/ticket/13535Joas Schilling2015-02-021-0/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13535] Add core event to allow modifying account settings on editing
| * | | | | [ticket/13535] Add core event to allow modifying account settings on editingrxu2015-01-221-0/+22
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Add ucp_profile.php core event to allow modifying account settings on editing. PHPBB3-13535
* | | | | Merge pull request #3317 from Wolfsblvt/ticket/13532Joas Schilling2015-02-021-0/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Add core event to get_unread_topics() in functions.php
| * | | | | [ticket/13532] Add core event to get_unread_topics() in functions.phpWolfsblvt2015-01-231-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding core event core.get_unread_topics_modify_sql to to funtion get_unread_topics() in functions.php, so that you now are able to modify the sql query that retrieves the unread topics. PHPBB3-13532