aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | [ticket/14019] Add posting_topic_title_before template eventZoddo2015-08-093-2/+10
| |/ / | | | | | | | | | | | | | | | | | | Allows to add some information on the left of the topic title in the posting form PHPBB3-14019
* | | Merge branch '3.1.x'Marc Alexander2015-08-091-1/+15
|\ \ \ | |/ /
| * | Merge pull request #3784 from Senky/ticket/14043Marc Alexander2015-08-091-1/+15
| |\ \ | | | | | | | | | | | | [ticket/14043] Add core.get_avatar_after php event
| | * | [ticket/14043] Add more parameters to the eventJakub Senko2015-08-021-2/+6
| | | | | | | | | | | | | | | | PHPBB3-14043
| | * | [ticket/14043] Add dispatcher to globals, change @since valueJakub Senko2015-07-221-2/+2
| | | | | | | | | | | | | | | | PHPBB3-14043
| | * | [ticket/14043] Add core.get_avatar_after php eventJakub Senko2015-07-211-1/+11
| | | | | | | | | | | | | | | | PHPBB3-14043
* | | | Merge branch '3.1.x'Marc Alexander2015-08-091-0/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/includes/mcp/mcp_forum.php
| * | | Merge pull request #3760 from Zoddo/ticket/14014Marc Alexander2015-08-091-0/+24
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14014] Add core.mcp_forum_view_before event
| | * | | [ticket/14014] Add core.mcp_forum_view_before eventZoddo2015-07-151-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This event can be used to get some data in order to execute other actions. PHPBB3-14014
* | | | | Merge branch '3.1.x'Marc Alexander2015-08-093-2/+22
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3756 from rxu/ticket/14005Marc Alexander2015-08-093-2/+22
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14005] Allow extensions control post buttons displaying
| | * | | | [ticket/14005] Allow extensions control post buttons displaying for PMrxu2015-07-172-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14005
| | * | | | [ticket/14005] Allow extensions control post buttons displayingrxu2015-07-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14005
* | | | | | Merge branch '3.1.x'Marc Alexander2015-08-091-0/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3822 from brunoais/ticket/14083Marc Alexander2015-08-091-0/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14083] Fix wrong variables from previous commit
| | * | | | | [ticket/14083] Fix wrong variables from previous commitbrunoais2015-08-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing variables wrongly attributed in PHPBB3-13693 PHPBB3-14083
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-091-5/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3821 from brunoais/ticket/14082Marc Alexander2015-08-091-5/+7
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | [ticket/14082] Fix wrong variables from previous commit
| | * | | | | [ticket/14082] Fix wrong variables from previous commitbrunoais2015-08-081-5/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing variables wrongly attributed in PHPBB3-13686 PHPBB3-14082
* | | | | | Merge branch '3.1.x'Marc Alexander2015-08-082-0/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3759 from Zoddo/ticket/14013Marc Alexander2015-08-082-0/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14013] Add acp_forums_custom_settings event
| | * | | | | [ticket/14013] Add documentation for acp_forums_custom_settingsZoddo2015-07-151-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14013
| | * | | | | [ticket/14013] Add acp_forums_custom_settings eventZoddo2015-07-151-0/+2
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-14013
* | | | | | Merge branch '3.1.x'Marc Alexander2015-08-083-8/+71
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/phpbb/avatar/driver/upload.php tests/avatar/manager_test.php
| * | | | | Merge pull request #3738 from javiexin/ticket/13981Marc Alexander2015-08-083-8/+71
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13981] Add events to capture avatar deletion or overwriting
| | * | | | | [ticket/13981] Add events to capture avatar deletion or overwritingjaviexin2015-07-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An event to capture new avatar moving in place (and maybe overwriting existing avatar), and another to capture deletion. Includes better error processing. Rename event. PHPBB3-13981
| | * | | | | [ticket/13981] Add events to capture avatar deletion or overwritingjaviexin2015-07-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An event to capture overwriting, and another to capture deletion. Includes better error processing. Replaced global by dependency injection. Fix Travis tests. PHPBB3-13981
| | * | | | | [ticket/13981] Add events to capture avatar deletion or overwritingjaviexin2015-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An event to capture overwriting, and another to capture deletion. Includes better error processing. Replaced global by dependency injection. Fix typo. PHPBB3-13981
| | * | | | | [ticket/13981] Add events to capture avatar deletion or overwritingjaviexin2015-07-172-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An event to capture overwriting, and another to capture deletion. Includes better error processing. Replaced global by dependency injection. PHPBB3-13981
| | * | | | | [ticket/13981] Add events to capture avatar deletion or overwritingjaviexin2015-07-091-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An event to capture overwriting, and another to capture deletion. Includes better error processing. PHPBB3-13981
| | * | | | | [ticket/13981] Add events to capture avatar deletion or overwritingjaviexin2015-07-031-6/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13981
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-081-0/+10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3757 from Zoddo/ticket/14006Marc Alexander2015-08-081-0/+10
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | [ticket/14006] Add core.ucp_register_agreement event
| | * | | | | [ticket/14006] Add core.ucp_register_agreement eventZoddo2015-07-121-0/+10
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | It allows to execute code before the agreements are displayed. PHPBB3-14006
* | | | | | Merge pull request #3819 from Nicofuma/ticket/14079Máté Bartus2015-08-083-10/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/14079] Correctly mark notifications as read
| * | | | | | [ticket/14079] Correctly mark notifications as readTristan Darricau2015-08-083-10/+17
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-14079
* | | | | | Merge pull request #3817 from Nicofuma/ticket/14076Máté Bartus2015-08-071-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/14076] Fix notification settings
| * | | | | | [ticket/14076] Fix notification settingsTristan Darricau2015-08-071-5/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-14076
* | | | | | Merge pull request #3816 from Nicofuma/ticket/14074Máté Bartus2015-08-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/14074] Fix mark notifications as read in the ucp
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-04 21:09:35 +0000