aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-08-202-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14116] sql_affectedrows method has no arguments
| * | | | | Merge pull request #3848 from VSEphpbb/ticket/14116Andreas Fischer2015-08-202-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14116] sql_affectedrows method has no arguments * VSEphpbb/ticket/14116: [ticket/14116] sql_affectedrows method has no arguments
| | * | | | | [ticket/14116] sql_affectedrows method has no argumentsMatt Friedman2015-08-192-3/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-14116
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-08-181-1/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14077] Fall back to 1 as focusOffset if length is unsupported
| * | | | | Merge pull request #3818 from marc1706/ticket/14077Andreas Fischer2015-08-181-1/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14077] Fall back to 1 as focusOffset if length is unsupported * marc1706/ticket/14077: [ticket/14077] Fall back to 1 as focusOffset if length is unsupported
| | * | | | | [ticket/14077] Fall back to 1 as focusOffset if length is unsupportedMarc Alexander2015-08-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The setBaseAndExtent() in Microsoft's Edge browser is incompatible with the one Webkit browsers use. As a result of that, we have to fall back to setting the focusOffset to 1 instead of the text length. PHPBB3-14077
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-172-0/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/theme/stylesheet.css
| * | | | | | Merge pull request #3832 from cyberalien/ticket/14103Marc Alexander2015-08-173-0/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14103] Reset text-decoration in abbr element
| | * | | | | | [ticket/14103] Reset text-decoration in abbr elementcyberalien2015-08-153-0/+11
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-14103
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-142-0/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/posting_body.html
| * | | | | | Merge pull request #3761 from Zoddo/ticket/13997Marc Alexander2015-08-143-0/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13997] Add posting_editor_submit_buttons template event
| | * | | | | | [ticket/13997] Add posting_editor_submit_buttons template eventZoddo2015-08-093-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13997
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-131-0/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3763 from Zoddo/ticket/13968Marc Alexander2015-08-131-0/+8
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | [ticket/13968] Add core.user_setup_after event
| | * | | | | | [ticket/13968] Add core.user_setup_after eventZoddo2015-08-121-0/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It allows to execute code at the end of user setup. It can replace the phpbb_user_session_handler hook. PHPBB3-13968
* | | | | | | Merge pull request #3827 from Nicofuma/ticket/14096Máté Bartus2015-08-121-112/+67
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/14096] Update Symfony
| * | | | | | | [ticket/14096] Update SymfonyTristan Darricau2015-08-121-112/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14096
* | | | | | | | Merge pull request #3826 from rxu/ticket/14094Máté Bartus2015-08-121-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | [ticket/14094] Fix segmentation fault error on PHP 7 tests
| * | | | | | | [ticket/14094] Fix segmentation fault error on PHP 7 testsrxu2015-08-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14094
* | | | | | | | Merge branch '3.1.x'Tristan Darricau2015-08-121-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | | | | | | | * 3.1.x: [ticket/14093] Hardcoded language in ucp_pm_viewfolder.html
| * | | | | | Merge pull request #3825 from rxu/ticket/14093Tristan Darricau2015-08-122-2/+2
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14093] Hardcoded language in ucp_pm_viewfolder.html * rxu/ticket/14093: [ticket/14093] Hardcoded language in ucp_pm_viewfolder.html
| | * | | | | [ticket/14093] Hardcoded language in ucp_pm_viewfolder.htmlrxu2015-08-122-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-14093
* | | | | | Merge branch '3.1.x'Marc Alexander2015-08-112-0/+16
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/mcp_forum.html
| * | | | | Merge pull request #3768 from Zoddo/ticket/14021Marc Alexander2015-08-113-1/+19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14086] Add mcp_forum_topic_title_* template events
| | * | | | | [ticket/14086] Add mcp_forum_topic_title_* template eventsZoddo2015-08-103-1/+19
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows to add some information before/after the topic title PHPBB3-14086
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-08-101-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration
| * | | | | Merge pull request #3811 from marcovo/ticket/14069Andreas Fischer2015-08-101-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration * marcovo/ticket/14069: [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration
| | * | | | | [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migrationMarco Kubuntu2015-08-051-1/+1
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the sql_fetchfield() call to comply to the function definition. PHPBB3-14069
* | | | | | Merge branch '3.1.x'Marc Alexander2015-08-092-1/+8
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/posting_body.html
| * | | | | Merge pull request #3766 from Zoddo/ticket/14019Marc Alexander2015-08-093-2/+10
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | [ticket/14019] Add posting_topic_title_before template event