Commit graph

3097 commits

Author SHA1 Message Date
Marc Alexander
5330ea0f09 Merge pull request #4324 from Senky/ticket/14516
[ticket/14516] Add memberlist_email_before event
2016-08-03 22:20:48 +02:00
kasimi
da7c41f167 [ticket/14715] Add template events in posting_topic_review & mcp_topic
The events will allow adding content before and after the post details
in topic review and topic moderation.

PHPBB3-14715
2016-07-21 17:48:42 +02:00
Jakub Senko
775df0eb8a [ticket/14516] Add memberlist_email_before event
PHPBB3-14516
2016-07-17 20:43:40 +02:00
Marc Alexander
019e85d064 Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/styles/subsilver2/template/mcp_move.html
2016-07-16 21:25:17 +02:00
Marc Alexander
b54aa81cdd Merge pull request #4337 from Senky/ticket/14506
Add mcp_move_before template event
2016-07-16 21:24:33 +02:00
Tristan Darricau
dbf02b4514
Merge remote-tracking branch 'upstream/prep-release-3.2.0-RC1' into 3.2.x
* upstream/prep-release-3.2.0-RC1:
  [prep-release-3.2.0-RC1] Update changelog
  [prep-release-3.2.0-RC1] Add migration
  [prep-release-3.2.0-RC1] Update schema.json
  [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1
2016-06-27 21:54:41 +02:00
David King
e4336de68d [ticket/14695] Add posting_editor_subject_prepend/append template events
PHPBB3-14695
2016-06-25 21:16:54 +01:00
Marc Alexander
450e5b36b8 Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
	phpBB/styles/subsilver2/template/mcp_forum.html
	phpBB/styles/subsilver2/template/search_results.html
	phpBB/styles/subsilver2/template/viewforum_body.html
2016-06-19 18:07:29 +02:00
Tristan Darricau
2eb8a97f47
[prep-release-3.2.0-RC1] Update version to 3.2.0-RC1 2016-06-19 17:51:51 +02:00
Richard McGirr
e9cbb45435 [ticket/14672] Change event name add to events.md
PHPBB3-14672
2016-06-13 06:26:55 -04:00
Richard McGirr
2a53831124 [ticket/14672] Add template event after topic title
PHPBB3-14672
2016-06-12 10:37:49 -04:00
Jakub Senko
6350798e97 [ticket/14506] Add mcp_move_before template event
PHPBB3-14506
2016-05-29 11:41:54 +02:00
cyberalien
877188c114 [ticket/14612] Fix incorrect class for fieldset in mcp_approve.html
PHPBB3-14612
2016-04-23 22:46:52 +03:00
Joas Schilling
15e22af266 [prep-release-3.1.9] Update version to 3.1.9-RC1 2016-04-09 08:09:08 +02:00
Marc Alexander
83b56f7855 [ticket/14495] Specify correct version numbers in 3.2.x
DO NOT apply these changes into master when merging it. This means that
you'll have to checkout the latest files from upstream after merging this
into master (possibly while resolving likely merge conflicts).

PHPBB3-14495
2016-04-02 10:06:59 +02:00
Tristan Darricau
2bfbc07b7d Merge pull request #4021 from marc1706/ticket/14272
[ticket/14272] Use html5 valid input elements

* marc1706/ticket/14272:
  [ticket/14272] Allow input of floats for filesize
  [ticket/14272] Use input type number instead of text in avatars
  [ticket/14272] Assign min and max values for avatar driver settings
  [ticket/14272] Define min and max values for avatar width and height
  [ticket/14272] Disable not toggled form elements
  [ticket/14272] Make sure phpbb_avatar_manager was defined
  [ticket/14272] Remove useless check
  [ticket/14272] Fix invalid or missing min/max settings
  [ticket/14272] Assign min/max for all allowed types
  [ticket/14272] Only use maxlength and size for allowed input elements
2016-03-27 13:34:17 +02:00
Marc Alexander
1600d82b77 Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x
Conflicts:
	phpBB/adm/style/acp_icons.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_acp.php
	phpBB/includes/ucp/ucp_groups.php
	phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
	phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
	phpBB/styles/subsilver2/template/mcp_topic.html
	phpBB/styles/subsilver2/template/posting_attach_body.html
	phpBB/styles/subsilver2/template/posting_body.html
	phpBB/styles/subsilver2/template/posting_poll_body.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
2016-03-27 09:59:25 +02:00
Tristan Darricau
f6cc30cbfe Merge pull request #4245 from JoshyPHP/ticket/14381
[ticket/14381] Set the mode in message parser to "reparse"

* JoshyPHP/ticket/14381:
  [ticket/14381] Set the mode in message parser to "reparse"
  [ticket/14495] Updates the version to 3.3.0-a1-dev
2016-03-25 11:03:27 +01:00
Marc Alexander
2e3f89444a Merge branch 'ticket/14136' into ticket/14136-3.2.x
Conflicts:
	phpBB/adm/style/install_update_diff.html
	phpBB/adm/style/installer_header.html
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/styles/subsilver2/template/overall_header.html
	phpBB/styles/subsilver2/template/simple_header.html
	phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
	phpBB/styles/subsilver2/template/viewtopic_print.html
2016-03-24 16:12:56 +01:00
Marc Alexander
244d171cb0 [ticket/14136] Add back X-UA-Compatible meta tag
This was previously removed without needing to. Adding it back to force
users to not emulate the page for previous versions of IE. The
imagetoolbar http-equiv tag was not restored as IE does not contain that
anymore since IE7. Also, the chome=1 has been removed from the
X-UA-Compatible content as ChromeFrame does not receive any further
updates since 2014 and is potentially broken.

PHPBB3-14136
2016-03-24 16:07:07 +01:00
Tristan Darricau
365c99a787 Merge branch '3.2.x'
* 3.2.x:
  [ticket/14528] Add back itemprop definitions to breadcrumbs
  [ticket/14528] Update navbar_header.html for valid microdata
2016-03-14 06:54:25 +01:00
Marc Alexander
04fbbbe1ed [ticket/14528] Add back itemprop definitions to breadcrumbs
PHPBB3-14528
2016-03-13 22:50:15 +01:00
C1n
36d2ed3121 [ticket/14528] Update navbar_header.html for valid microdata
PHPBB3-14528
2016-03-13 22:50:01 +01:00
Marc Alexander
47f70a4cfd Merge branch '3.2.x' 2016-02-27 10:55:17 +01:00
Marc Alexander
a937e38bd5 Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/docs/events.md
	phpBB/styles/subsilver2/template/memberlist_view.html
2016-02-27 10:54:48 +01:00
Marc Alexander
34389df1ae Merge pull request #4049 from rxu/ticket/14316
[ticket/14316] Add events before/after the custom/zebra fields in pfile view
2016-02-27 10:52:09 +01:00
rxu
673acc7313 [ticket/14316] Add events before/after the custom/zebra fields in profile view
PHPBB3-14316
2016-02-27 11:53:19 +07:00
Tristan Darricau
294f926bfc [ticket/14495] Updates the version to 3.3.0-a1-dev
PHPBB3-14495
2016-02-24 22:25:41 +01:00
Marc Alexander
1007dea154 Merge pull request #4127 from RMcGirr83/ticket_14416
[ticket/14416] footer nav links have incorrect tooltip styling applied
2016-02-18 16:18:29 +01:00
Tristan Darricau
00d71d854c Merge pull request #4157 from VSEphpbb/ticket/14447
[ticket/14447] Remove trailing white spaces in Prosilver

* VSEphpbb/ticket/14447:
  [ticket/14447] Remove trailing white spaces in Prosilver
2016-02-15 23:08:08 +01:00
Joas Schilling
3e8a62f309 [prep-release-3.1.8] Update version to 3.1.8-RC1 2016-02-13 14:52:57 +01:00
Tristan Darricau
f80ec7e786 [prep-release-3.2.0-b1] Update version to 3.2.0-b1 2016-02-03 21:41:22 +01:00
Richard McGirr
b9df08e97f [ticket/14416] Revert changes and use twig spaceless
PHPBB3-14416
2016-02-03 06:29:21 -05:00
Matt Friedman
93a25893d5 [ticket/14447] Remove trailing white spaces in Prosilver
PHPBB3-14447
2016-02-02 08:42:53 -08:00
Marc Alexander
3a4dae369d Merge branch '3.1.x' 2016-01-27 14:31:29 +01:00
Marc Alexander
3c4f150859 Merge pull request #4029 from RMcGirr83/ticket_14289
[ticket/14289] Add events to navbar header
2016-01-27 14:29:14 +01:00
Crizzo
ca9560fc7a [ticket/14418] Wrong language variable in viewtopic_topic_tools.html fixed
In viewtopic_topic_tools.html was used the language variable L_PM_TOOLS it
had to be changed to L_TOPIC_TOOLS to display the right title in the
moderation wrench in viewtopic.php

PHPBB3-14418
2016-01-24 12:10:03 +01:00
Matt Friedman
98467d2ea5 [ticket/14420] Fix up search results topic lists
PHPBB3-14420
2016-01-18 17:55:31 -08:00
Richard McGirr
8d8f5783c6 [ticket/14416] footer nav links have incorrect tooltip styling applied
PHPBB3-14416
2016-01-17 07:03:21 -05:00
Richard McGirr
469b975f94 [ticket/14289] Change to 3.1.8-RC1 and rename event
PHPBB3-14289
2016-01-10 07:17:43 -05:00
Marc Alexander
0028ed3e95 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
2016-01-08 16:39:33 +01:00
Saeed Hubaishan
678ca5dcdc [ticket/13180] Increase dateformat field size
[ticket/13180] Increase dateformat field size

change field size to 64 in these files
add new migration file to update the database schema

PHPBB3-13180
2016-01-07 17:36:02 +01:00
Marc Alexander
d3ca327f2c Merge branch '3.1.x'
Conflicts:
	phpBB/styles/prosilver/template/viewtopic_body.html
	phpBB/styles/subsilver2/template/viewtopic_body.html
2016-01-07 16:28:44 +01:00
Marc Alexander
a7058d968f Merge pull request #4079 from rxu/ticket/14356
[ticket/14356] Add template events to viewtopic around back2top link
2016-01-07 16:26:16 +01:00
Marc Alexander
c9541e0795 [ticket/14272] Use input type number instead of text in avatars
PHPBB3-14272
2016-01-01 17:26:14 +01:00
Marc Alexander
805b084607 [ticket/14272] Define min and max values for avatar width and height
PHPBB3-14272
2015-12-27 08:39:07 +01:00
Melvin García
5e8105a1cd [ticket/14371] Small fix for the quick links alignment
PHPBB3-14371
2015-12-24 14:00:34 +01:00
Marc Alexander
6a4e296c43 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_im.html
2015-12-23 13:32:44 +01:00
Marc Alexander
84ed888cb9 Merge pull request #4084 from exussum12/ticket/14046
[ticket/14046] Jabber message incorrect
2015-12-23 13:32:23 +01:00
Marc Alexander
d033597c5d Merge branch '3.1.x'
Conflicts:
	phpBB/adm/style/installer_footer.html
2015-12-22 19:51:21 +01:00