mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-03 04:55:36 +02:00
Code Issues Releases Wiki Activity
26,626 Commits 18 Branches 192 Tags
Commit Graph

22614 Commits

Author SHA1 Message Date
Marc Alexander
648389af6f Merge branch '3.1.x' 
Conflicts:
	phpBB/docs/events.md
	phpBB/styles/subsilver2/template/mcp_forum.html
 2015-08-20 10:23:56 +02:00
Marc Alexander
ffe72e500c Merge pull request #3797 from RMcGirr83/ticket/13863 
[ticket/13863] Add topic_row_append/prepend to mcp_forum.html
 2015-08-20 10:22:42 +02:00
Marc Alexander
7cdaa03e20 Merge branch '3.1.x' 2015-08-20 10:17:50 +02:00
Marc Alexander
6f1d848087 Merge pull request #3783 from Zoddo/ticket/14041 
[ticket/14041] Add viewtopic_dropdown_*_custom template event
 2015-08-20 10:17:45 +02:00
Marc Alexander
5ae821ee28 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/mcp_topic.html
 2015-08-20 10:08:47 +02:00
Marc Alexander
00aab15f7c Merge pull request #3769 from Zoddo/ticket/14023 
[ticket/14090] Add mcp_topic_topic_title_* template events
 2015-08-20 10:08:06 +02:00
Marc Alexander
aaa13be1ec Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/breadcrumbs.html
 2015-08-20 08:56:45 +02:00
Marc Alexander
11a0516739 Merge pull request #3846 from rxu/ticket/14115 
[ticket/14115] Fix breadcrumbs microdata to make it valid
 2015-08-20 08:51:42 +02:00
Andreas Fischer
0a5f7d2e51 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14116] sql_affectedrows method has no arguments
 2015-08-20 03:52:34 +02:00
Andreas Fischer
ef3de412b7 Merge pull request #3848 from VSEphpbb/ticket/14116 
[ticket/14116] sql_affectedrows method has no arguments

* VSEphpbb/ticket/14116:
  [ticket/14116] sql_affectedrows method has no arguments
 2015-08-20 03:52:34 +02:00
Matt Friedman
50a7167c9a [ticket/14116] sql_affectedrows method has no arguments 
PHPBB3-14116
 2015-08-19 16:12:01 -07:00
rxu
51eaa8917f [ticket/14115] Fix breadcrumbs microdata to make it valid 
PHPBB3-14115
 2015-08-20 01:12:12 +07:00
Andreas Fischer
35a48279a7 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14077] Fall back to 1 as focusOffset if length is unsupported
 2015-08-18 10:47:40 -04:00
Andreas Fischer
19267242e3 Merge pull request #3818 from marc1706/ticket/14077 
[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
 2015-08-18 10:47:40 -04:00
Marc Alexander
452b3b4890 [ticket/14077] Fall back to 1 as focusOffset if length is unsupported 
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
 2015-08-17 15:25:13 +02:00
Marc Alexander
dce1c5d4c9 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/theme/stylesheet.css
 2015-08-17 09:39:16 +02:00
cyberalien
d89c952955 [ticket/14103] Reset text-decoration in abbr element 
PHPBB3-14103
 2015-08-15 13:57:48 +03:00
Marc Alexander
a2e19e4ea8 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
 2015-08-14 13:38:09 +02:00
Marc Alexander
e466318dc2 Merge pull request #3761 from Zoddo/ticket/13997 
[ticket/13997] Add posting_editor_submit_buttons template event
 2015-08-14 13:36:22 +02:00
Marc Alexander
dc55863cad Merge branch '3.1.x' 2015-08-13 07:52:36 +02:00
Zoddo
9d4228291c [ticket/13968] Add core.user_setup_after event 
It allows to execute code at the end of user setup.
It can replace the phpbb_user_session_handler hook.

PHPBB3-13968
 2015-08-12 22:26:06 +02:00
Tristan Darricau
cd37b32b3d [ticket/14096] Update Symfony 
PHPBB3-14096
 2015-08-12 14:48:06 +02:00
Tristan Darricau
4773742881 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14093] Hardcoded language in ucp_pm_viewfolder.html
 2015-08-12 13:59:16 +02:00
rxu
2cd2cf2b39 [ticket/14093] Hardcoded language in ucp_pm_viewfolder.html 
PHPBB3-14093
 2015-08-12 14:41:48 +07:00
Zoddo
4bab984dac [ticket/14090] Add mcp_topic_topic_title_* template events 
Allows to add some information before/after the topic title

PHPBB3-14090
 2015-08-11 20:10:45 +02:00
Marc Alexander
81e045628d Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/mcp_forum.html
 2015-08-11 09:14:23 +02:00
Zoddo
40666dd96f [ticket/14086] Add mcp_forum_topic_title_* template events 
Allows to add some information before/after the topic title

PHPBB3-14086
 2015-08-10 22:27:19 +02:00
Andreas Fischer
92b23df864 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration
 2015-08-10 13:20:04 +02:00
Andreas Fischer
3bd5fe6be8 Merge pull request #3811 from marcovo/ticket/14069 
[ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration

* marcovo/ticket/14069:
  [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration
 2015-08-10 13:20:03 +02:00
Marc Alexander
32c3267295 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
 2015-08-09 20:59:14 +02:00
Zoddo
9a2c74a68c [ticket/14019] Add posting_topic_title_before template event 
Allows to add some information on the left of the topic title
in the posting form

PHPBB3-14019
 2015-08-09 13:42:34 +02:00
Zoddo
166e0b5961 [ticket/13997] Add posting_editor_submit_buttons template event 
PHPBB3-13997
 2015-08-09 11:36:49 +02:00
Marc Alexander
1956bd4bba Merge branch '3.1.x' 2015-08-09 10:31:43 +02:00
Marc Alexander
668defcf57 Merge pull request #3784 from Senky/ticket/14043 
[ticket/14043] Add core.get_avatar_after php event
 2015-08-09 10:31:37 +02:00
Marc Alexander
03c64d3384 Merge branch '3.1.x' 
Conflicts:
	phpBB/includes/mcp/mcp_forum.php
 2015-08-09 10:15:02 +02:00
Marc Alexander
5f4943c183 Merge pull request #3760 from Zoddo/ticket/14014 
[ticket/14014] Add core.mcp_forum_view_before event
 2015-08-09 10:13:24 +02:00
Marc Alexander
7b8f8d7d90 Merge branch '3.1.x' 2015-08-09 10:08:06 +02:00
Marc Alexander
9e38f412ea Merge pull request #3756 from rxu/ticket/14005 
[ticket/14005] Allow extensions control post buttons displaying
 2015-08-09 10:08:00 +02:00
Marc Alexander
b1d8f8a22c Merge branch '3.1.x' 2015-08-09 10:00:34 +02:00
Marc Alexander
8d54f06d19 Merge pull request #3822 from brunoais/ticket/14083 
[ticket/14083] Fix wrong variables from previous commit
 2015-08-09 10:00:29 +02:00
Marc Alexander
994b9c2c77 Merge branch '3.1.x' 2015-08-09 09:56:40 +02:00
brunoais
7a2f72df75 [ticket/14083] Fix wrong variables from previous commit 
Fixing variables wrongly attributed in PHPBB3-13693

PHPBB3-14083
 2015-08-08 22:45:38 +01:00
brunoais
84a40b6ad1 [ticket/14082] Fix wrong variables from previous commit 
Fixing variables wrongly attributed in PHPBB3-13686

PHPBB3-14082
 2015-08-08 22:23:17 +01:00
Marc Alexander
e41fcab3de Merge branch '3.1.x' 2015-08-08 22:40:40 +02:00
Marc Alexander
8e80425c82 Merge pull request #3759 from Zoddo/ticket/14013 
[ticket/14013] Add acp_forums_custom_settings event
 2015-08-08 22:40:35 +02:00
Marc Alexander
47b32f1da9 Merge branch '3.1.x' 
Conflicts:
	phpBB/phpbb/avatar/driver/upload.php
	tests/avatar/manager_test.php
 2015-08-08 22:23:03 +02:00
Marc Alexander
b7e4d0b0a5 Merge pull request #3738 from javiexin/ticket/13981 
[ticket/13981] Add events to capture avatar deletion or overwriting
 2015-08-08 22:21:11 +02:00
Marc Alexander
46ffafd0c6 Merge branch '3.1.x' 2015-08-08 22:17:29 +02:00
Marc Alexander
3dcba7000b Merge pull request #3757 from Zoddo/ticket/14006 
[ticket/14006] Add core.ucp_register_agreement event
 2015-08-08 22:17:21 +02:00
Tristan Darricau
05d583bba7 [ticket/14079] Correctly mark notifications as read 
PHPBB3-14079
 2015-08-08 19:18:18 +02:00