aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/13139] Update Twig to 1.8.0Nicofuma2015-02-031-7/+7
| | | | PHPBB3-13139
* [ticket/13139] Update Twig to 1.16.2Tristan Darricau2015-02-032-9/+14
| | | | PHPBB3-13139
* Merge branch 'develop-ascraeus' into developAndreas Fischer2015-02-031-0/+0
|\ | | | | | | | | * develop-ascraeus: [ticket/13572] Update composer to version 1.0.0-alpha9
| * 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 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
| * | | 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 branch 'develop-ascraeus' into developJoas Schilling2015-02-022-1/+49
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: phpBB/includes/ucp/ucp_profile.php
| * | | | 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 branch 'develop-ascraeus' into developJoas Schilling2015-02-021-1/+31
|\ \ \ \ \ | |/ / / /
| * | | | 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 branch 'develop-ascraeus' into developJoas Schilling2015-02-021-0/+22
|\ \ \ \ \ | |/ / / /
| * | | | 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 branch 'develop-ascraeus' into developJoas Schilling2015-02-021-0/+19
|\ \ \ \ \ | |/ / / /
| * | | | 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 branch 'develop-ascraeus' into developJoas Schilling2015-02-021-1/+34
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 branch 'develop-ascraeus' into developJoas Schilling2015-02-022-0/+16
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/viewtopic_body.html
| * | | | | 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 branch 'develop-ascraeus' into developJoas Schilling2015-02-021-2/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 branch 'develop-ascraeus' into developMarc Alexander2015-02-021-3/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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 pull request #3280 from MGaetan89/ticket/13494Andreas Fischer2015-02-0245-183/+177
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13494] Change set_config() calls with $config->set() * MGaetan89/ticket/13494: [ticket/13494] Update calls to `set_config()`
| * | | | | | | | [ticket/13494] Update calls to `set_config()`Gaëtan Muller2015-02-0245-183/+177
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13494
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-02-012-1/+32
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml
| * | | | | | | 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 pull request #3352 from VSEphpbb/ticket/10388Marc Alexander2015-01-315-7/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/10388 Use Twig's JS escape filter instead of addslashes on LA_ keys
| * | | | | | | | | [ticket/10388] Update deprecation commentMatt Friedman2015-01-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10388