1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

26799 Commits

Author SHA1 Message Date
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
Tristan Darricau
5b534369d1 [ticket/14099] Make composer.phar executable again
PHPBB3-14099
2015-08-17 10:27:21 +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
Marc Alexander
dcf12cad26 Merge pull request #3832 from cyberalien/ticket/14103
[ticket/14103] Reset text-decoration in abbr element
2015-08-17 09:38:15 +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
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
Tristan Darricau
dbfea6d0fa [ticket/14099] Update composer.phar
PHPBB3-14099
2015-08-14 15:52:13 +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
Marc Alexander
57ba51c529 Merge pull request #3763 from Zoddo/ticket/13968
[ticket/13968] Add core.user_setup_after event
2015-08-13 07:52:30 +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
Máté Bartus
b541ee5a2b Merge pull request #3827 from Nicofuma/ticket/14096
[ticket/14096] Update Symfony
2015-08-12 15:43:39 +02:00
Máté Bartus
951e9bb3c5 Merge pull request #3826 from rxu/ticket/14094
[ticket/14094] Fix segmentation fault error on PHP 7 tests
2015-08-12 15:42: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
Tristan Darricau
dead984f54 Merge pull request #3825 from rxu/ticket/14093
[ticket/14093] Hardcoded language in ucp_pm_viewfolder.html

* rxu/ticket/14093:
  [ticket/14093] Hardcoded language in ucp_pm_viewfolder.html
2015-08-12 13:58:12 +02:00
rxu
df334b1da8 [ticket/14094] Fix segmentation fault error on PHP 7 tests
PHPBB3-14094
2015-08-12 17:13:51 +07: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
Marc Alexander
972f04ec6a Merge pull request #3768 from Zoddo/ticket/14021
[ticket/14086] Add mcp_forum_topic_title_* template events
2015-08-11 09:13:34 +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
lavigor
1b1fc6ed24 [ticket/14087] Add an event to ucp_activate.php.
PHPBB3-14087
2015-08-09 23:35:06 +03: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
Marc Alexander
edeeff597f Merge pull request #3766 from Zoddo/ticket/14019
[ticket/14019] Add posting_topic_title_before template event
2015-08-09 20:58:17 +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