aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3854 from Nicofuma/ticket/14099-masterJoas Schilling2015-08-231-8/+8
|\ | | | | | | [ticket/14099] Update twig/twig to 1.20.0 - master version
| * Merge branch '3.1.x'Tristan Darricau2015-08-231-8/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14099] Fix the assets [ticket/14099] Make composer.phar executable again [ticket/14099] Fix tests [ticket/14099] Update twig/twig to 1.20.0 [ticket/14099] Update composer.phar
| | * Merge branch 'ticket/14099' into 3.1.xTristan Darricau2015-08-213-21/+48
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/14099: [ticket/14099] Fix the assets [ticket/14099] Make composer.phar executable again [ticket/14099] Fix tests [ticket/14099] Update twig/twig to 1.20.0 [ticket/14099] Update composer.phar
| | | * [ticket/14099] Fix the assetsTristan Darricau2015-08-181-3/+14
| | | | | | | | | | | | | | | | PHPBB3-14099
| | | * [ticket/14099] Fix testsTristan Darricau2015-08-141-0/+8
| | | | | | | | | | | | | | | | PHPBB3-14099
| | | * [ticket/14099] Update twig/twig to 1.20.0Tristan Darricau2015-08-142-21/+29
| | | | | | | | | | | | | | | | PHPBB3-14099
* | | | Merge branch '3.1.x'Marc Alexander2015-08-221-1/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/ucp/ucp_activate.php
| * \ \ \ Merge pull request #3823 from lavigor/ticket/14087Marc Alexander2015-08-221-1/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14087] Add an event to ucp_activate.php.
| | * | | | [ticket/14087] Add an event to ucp_activate.php.lavigor2015-08-091-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14087
* | | | | | Merge branch '3.1.x'Marc Alexander2015-08-221-0/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3834 from brunoais/ticket/14104Marc Alexander2015-08-221-0/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14104] Fix missing variables from previous commit
| | * | | | | [ticket/14104] Fix missing variables from previous commitbrunoais2015-08-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing variables wrongly attributed in PHPBB3-13691 PHPBB3-14104
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-221-0/+24
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3831 from rxu/ticket/14101Marc Alexander2015-08-221-0/+24
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14101] Add core event to the download/file.php
| | * | | | | | [ticket/14101] Add core event to the download/file.phprxu2015-08-151-0/+24
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-14101
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-222-0/+18
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/viewtopic_body.html
| * | | | | | Merge pull request #3852 from marc1706/ticket/14068Marc Alexander2015-08-223-0/+22
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14068] Add template events before and after poll panel in viewtopic
| | * | | | | | [ticket/14068] Add template events before and after poll paneljaviexin2015-08-223-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In viewtopic. PHPBB3-14068
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-222-2/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/mcp_topic.html
| * | | | | | | Merge pull request #3771 from Zoddo/ticket/14025Marc Alexander2015-08-223-2/+22
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14091] Add mcp_topic_subject_* template events Conflicts: phpBB/docs/events.md
| | * | | | | | | [ticket/14091] Add mcp_topic_subject_* template eventsZoddo2015-08-113-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some options (field, checkbox, ...) before/after the subject field when split a subject PHPBB3-14091
* | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-221-0/+23
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/message_parser.php
| * | | | | | | | Merge pull request #3813 from rxu/ticket/14072Marc Alexander2015-08-221-0/+23
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | [ticket/14072] Add core event to the function format_display()
| | * | | | | | | [ticket/14072] Add core event to the function format_display()rxu2015-08-061-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14072
* | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-222-1/+56
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/ucp_pm_history.html
| * | | | | | | | Merge pull request #3803 from rxu/ticket/14064Marc Alexander2015-08-223-2/+74
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14064] Add template events to ucp_pm_history.html
| | * | | | | | | | [ticket/14064] Add template events to ucp_pm_history.htmlrxu2015-08-033-2/+74
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14064
* | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-222-0/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/overall_header.html
| * | | | | | | | Merge pull request #3806 from rxu/ticket/14067Marc Alexander2015-08-223-0/+10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14067] Add template events to overall_header.html around feeds
| | * | | | | | | | [ticket/14067] Add template events to overall_header.html around feedsrxu2015-08-053-0/+10
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14067
* | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-222-3/+32
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | | Conflicts: phpBB/styles/subsilver2/template/attachment.html
| * | | | | | | Merge pull request #3804 from rxu/ticket/14065Marc Alexander2015-08-223-3/+40
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | [ticket/14065] Add template events to attachment.html
| | * | | | | | [ticket/14065] Add template events to attachment.htmlrxu2015-08-033-3/+40
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally remove some unnecessary empty lines. PHPBB3-14065
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-201-0/+20
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3849 from marc1706/ticket/14037Marc Alexander2015-08-201-0/+20
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14037] Allows adapting memberlist profile fields headline
| | * | | | | | [ticket/14037] Minor coding style improvements to eventMarc Alexander2015-08-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14037
| | * | | | | | [ticket/14037] Allows adapting memberlist profile fields headlinejaviexin2015-08-201-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an event to allow modifying the profile fields headline in line with modifications to profile fields data. PHPBB3-14037
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-202-6/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/docs/events.md phpBB/styles/subsilver2/template/mcp_forum.html
| * | | | | | | Merge pull request #3797 from RMcGirr83/ticket/13863Marc Alexander2015-08-203-6/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13863] Add topic_row_append/prepend to mcp_forum.html
| | * | | | | | | [ticket/13863] Spaces not tabsRMcGirr832015-07-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13863
| | * | | | | | | [ticket/13863] Add topic_row_append/prepend to mcp_forum.htmlRichard McGirr2015-07-283-6/+14
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | PHPBB3-13863
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-202-0/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3783 from Zoddo/ticket/14041Marc Alexander2015-08-202-0/+17
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | [ticket/14041] Add viewtopic_dropdown_*_custom template event
| | * | | | | | [ticket/14041] Add viewtopic_dropdown_*_custom template eventZoddo2015-07-212-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows an extension to create a custom dropdown menu. PHPBB3-14041 PHPBB3-14042
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-202-1/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/mcp_topic.html
| * | | | | | | Merge pull request #3769 from Zoddo/ticket/14023Marc Alexander2015-08-203-2/+18
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14090] Add mcp_topic_topic_title_* template events
| | * | | | | | | [ticket/14090] Add mcp_topic_topic_title_* template eventsZoddo2015-08-113-2/+18
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows to add some information before/after the topic title PHPBB3-14090
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-201-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/breadcrumbs.html
| * | | | | | | Merge pull request #3846 from rxu/ticket/14115Marc Alexander2015-08-202-4/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14115] Fix breadcrumbs microdata to make it valid
| | * | | | | | | [ticket/14115] Fix breadcrumbs microdata to make it validrxu2015-08-202-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14115
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-11 18:21:32 +0000