aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | | Merge pull request #3305 from Wolfsblvt/ticket/13518Joas Schilling2015-02-021-1/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add core event to markread() in functions.php
| * | | | | | [ticket/13518] Add core event to markread() in functions.phpWolfsblvt2015-01-231-1/+34
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding core event core.markread_before to to funtion markread() in functions.php, so that you now are able to add additional stuff inside the markread process, for example notifications designed in extensions. PHPBB3-13518
* | | | | | Merge pull request #3302 from rxu/ticket/13512Joas Schilling2015-02-023-0/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13512] Add template events before/after the post details
| * | | | | | [ticket/13512] Add template events before/after the post detailsrxu2015-01-173-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add template events to viewtopic_body.html to allow extensions adding content before/after the post details. PHPBB3-13512
* | | | | | | Merge pull request #3282 from Elsensee/ticket/13313Joas Schilling2015-02-021-2/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13313] Add event core.acp_email_display
| * | | | | | | [ticket/13313] Update version in @since tag of eventOliver Schramm2015-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13313
| * | | | | | | [ticket/13313] Add event core.acp_email_displayOliver Schramm2015-01-111-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13313
* | | | | | | | Merge pull request #3334 from paul999/ticket/13542Marc Alexander2015-02-021-3/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | [ticket/13542] Update core.ucp_prefs_personal_data to include $error
| * | | | | | | [ticket/13542] Added sentenence of what is changed in the eventpaulsohier2015-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13542
| * | | | | | | [ticket/13542] Merge result of validation into existing $errorpaulsohier2015-01-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because extensions can set a entry in $error, the result of the validate needs to be merged into it. PHPBB3-13542
| * | | | | | | [ticket/13542] Update core.ucp_prefs_personal_data to include $errorpaulsohier2015-01-241-1/+3
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the event so extensions will be able to validate (and deny) changes. PHPBB3-13542
* | | | | | | Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-02-012-1/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| * | | | | | | [prep-release-3.1.3] Add migration for 3.1.3Joas Schilling2015-02-011-0/+31
| | | | | | | |
| * | | | | | | [prep-release-3.1.3] Update version to 3.1.3Joas Schilling2015-02-013-5/+5
| | | | | | | |
* | | | | | | | Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-01-315-5/+52
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | [prep-release-3.1.3] Add changelog for 3.1.3-RC2Joas Schilling2015-01-311-0/+15
| | | | | | | |
| * | | | | | | [prep-release-3.1.3] Add migration for 3.1.3-RC2Joas Schilling2015-01-311-0/+32
| | | | | | | |
| * | | | | | | [prep-release-3.1.3] Update version to 3.1.3-RC2Joas Schilling2015-01-313-5/+5
| | | | | | | |
* | | | | | | | Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-01-311-7/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'ticket/13553' into prep-release-3.1.3Joas Schilling2015-01-311-7/+9
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/13553] Use defined title value in page headers tooMatt Friedman2015-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13553
| | * | | | | | | [ticket/13553] Make title var accept a lang key varMatt Friedman2015-01-311-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13553
| | * | | | | | | [ticket/13553] Message helper should accept a lang key varMatt Friedman2015-01-311-5/+7
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13553