Commit graph

25837 commits

Author SHA1 Message Date
Marc Alexander
ccd1e1eebb Merge pull request #3803 from rxu/ticket/14064
[ticket/14064] Add template events to ucp_pm_history.html
2015-08-22 08:17:50 +02:00
Marc Alexander
c8db7ae7c4 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/overall_header.html
2015-08-22 08:14:18 +02:00
Marc Alexander
a959e5f4cc Merge pull request #3806 from rxu/ticket/14067
[ticket/14067] Add template events to overall_header.html around feeds
2015-08-22 08:13:39 +02:00
Marc Alexander
d30b5207b8 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/attachment.html
2015-08-22 08:11:15 +02:00
Marc Alexander
697ccd41c4 Merge pull request #3804 from rxu/ticket/14065
[ticket/14065] Add template events to attachment.html
2015-08-22 08:10:27 +02:00
Mate Bartus
dd1b777ca7 [ticket/14097] Remove auto refresh on install failure
PHPBB3-14097
2015-08-21 18:03:36 +02:00
Tristan Darricau
b802732167 Merge branch 'ticket/14099' into 3.1.x
* 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
2015-08-21 09:34:26 +02:00
Marc Alexander
942705e6c6 Merge branch '3.1.x' 2015-08-20 15:48:18 +02:00
Marc Alexander
6c98b01ad1 Merge pull request #3849 from marc1706/ticket/14037
[ticket/14037] Allows adapting memberlist profile fields headline
2015-08-20 15:48:12 +02:00
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
897b9f333b [ticket/14037] Minor coding style improvements to event
PHPBB3-14037
2015-08-20 10:14:07 +02:00
javiexin
cf0170d5e3 [ticket/14037] Allows adapting memberlist profile fields headline
Adds an event to allow modifying the profile fields headline in line
with modifications to profile fields data.

PHPBB3-14037
2015-08-20 10:12:59 +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
Michael Miday
53ef8815b1 [ticket/12719] Fix hamburger menu icon 2015-08-20 02:36:16 +02:00
Michael Miday
6105f98219 [ticket/12719] Fix pagination 2015-08-20 02:36:16 +02:00
Michael Miday
922f631a46 [ticket/12719] Fix Buttons 2015-08-20 02:36:15 +02:00
Michael Miday
4fac568d5e [ticket/12719] Add normalize & base
phpbb3-12719
2015-08-20 02:35:56 +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
Tristan Darricau
5f905f67ee [ticket/14099] Fix the assets
PHPBB3-14099
2015-08-18 21:03:03 +02: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
Mate Bartus
f4f0ff0eec [ticket/14097] Improve error and failure handling in the installer
PHPBB3-14097
2015-08-17 18:38:07 +02: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
rxu
ec032733de [ticket/14106] Fix topics sorting in MCP for topics merging.
The "bug" in the deleted code comment is non-existent now.
The PR is for 3.1 only.

PHPBB3-14106
2015-08-16 19:55:00 +07:00
brunoais
81b4293cc5 [ticket/14104] Fix missing variables from previous commit
Fixing variables wrongly attributed in PHPBB3-13691

PHPBB3-14104
2015-08-15 22:04:51 +01:00
rxu
6b0f235cc9 [ticket/14102] Add core event to the mcp_topic.php
PHPBB3-14102
2015-08-15 18:38:25 +07:00
cyberalien
d89c952955 [ticket/14103] Reset text-decoration in abbr element
PHPBB3-14103
2015-08-15 13:57:48 +03:00
rxu
e22dbbc7e8 [ticket/14101] Add core event to the download/file.php
PHPBB3-14101
2015-08-15 16:34:30 +07:00
Tristan Darricau
a83bcaa8ac [ticket/14099] Fix tests
PHPBB3-14099
2015-08-14 15:52:35 +02:00
Tristan Darricau
a24f9a7ad7 [ticket/14099] Update twig/twig to 1.20.0
PHPBB3-14099
2015-08-14 15:52:24 +02: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
146c4b1624 [ticket/14091] Add mcp_topic_subject_* template events
Add some options (field, checkbox, ...) before/after the subject
field when split a subject

PHPBB3-14091
2015-08-11 20:15:39 +02: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