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

..

profilefields

…

ajax.js

[ticket/14294]Fix removal of wanted icons

2015-11-16 19:02:28 +01:00

attachment.html

[ticket/12505] Remove outdated media handling from prosilver

2015-08-24 00:40:26 +03:00

bbcode.html

…

captcha_default.html

…

captcha_qa.html

…

captcha_recaptcha.html

[ticket/13789] Upgrade reCaptcha plugin to 2.0 API.

2015-10-14 19:05:27 -07:00

confirm_body.html

…

confirm_delete_body.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

display_options.html

[ticket/12649] Restore missing css and fix html file

2015-11-04 13:11:15 -05:00

drafts.html

…

faq_body.html

[ticket/14199]Add aria-hidden to all icons

2015-10-01 20:21:38 +02:00

forum_fn.js

Merge branch '3.1.x'

2015-10-12 11:52:18 +02:00

forumlist_body.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

index_body.html

…

index.htm

…

jumpbox.html

Merge pull request #3927 from hanakin/ticket/14199

2015-10-07 12:05:38 +02:00

login_body_oauth.html

…

login_body.html

…

login_forum.html

…

mcp_approve.html

[ticket/14612] Fix incorrect class for fieldset in mcp_approve.html

2016-04-23 22:46:52 +03:00

mcp_ban.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

mcp_footer.html

…

mcp_forum.html

Merge branch '3.1.x' into 3.2.x

2016-06-19 18:07:29 +02:00

mcp_front.html

[ticket/14199]Add aria-hidden to all icons

2015-10-01 20:21:38 +02:00

mcp_header.html

[ticket/14165] Fix Tab Layout

2015-09-15 16:02:47 +02:00

mcp_logs.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

mcp_message.html

…

mcp_move.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

mcp_notes_front.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

mcp_notes_user.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

mcp_post.html

[ticket/14295]fix report icon as well

2015-11-24 18:49:45 +01:00

mcp_queue.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

mcp_reports.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

mcp_topic.html

Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x

2016-03-27 09:59:25 +02:00

mcp_warn_front.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

mcp_warn_list.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

mcp_warn_post.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

mcp_warn_user.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

mcp_whois.html

[ticket/14199]Add aria-hidden to all icons

2015-10-01 20:21:38 +02:00

memberlist_body.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

memberlist_email.html

…

memberlist_im.html

[ticket/14046] Jabber message incorrect

2015-12-16 22:15:29 +00:00

memberlist_search.html

…

memberlist_team.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

memberlist_view.html

[ticket/14316] Add events before/after the custom/zebra fields in profile view

2016-02-27 11:53:19 +07:00

message_body.html

[ticket/14199]Add aria-hidden to all icons

2015-10-01 20:21:38 +02:00

navbar_footer.html

[ticket/14416] Revert changes and use twig spaceless

2016-02-03 06:29:21 -05:00

navbar_header.html

[ticket/14528] Add back itemprop definitions to breadcrumbs

2016-03-13 22:50:15 +01:00

notification_dropdown.html

[ticket/14199]Add aria-hidden to all icons

2015-10-01 20:21:38 +02:00

overall_footer.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

overall_header.html

Merge branch 'ticket/14136' into ticket/14136-3.2.x

2016-03-24 16:12:56 +01:00

pagination.html

Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x

2016-03-27 09:59:25 +02:00

plupload.html

…

posting_attach_body.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

posting_body.html

…

posting_buttons.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

posting_editor.html

Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x

2016-03-27 09:59:25 +02:00

posting_layout.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

posting_pm_header.html

…

posting_pm_layout.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

posting_poll_body.html

[ticket/14272] Only use maxlength and size for allowed input elements

2015-11-06 10:20:05 +01:00

posting_preview.html

[ticket/14075] Add template event after poll preview panel

2015-08-22 08:57:26 +02:00

posting_review.html

[ticket/14199]Add aria-hidden to all icons

2015-10-01 20:21:38 +02:00

posting_smilies.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

posting_topic_review.html

Merge pull request #3927 from hanakin/ticket/14199

2015-10-07 12:05:38 +02:00

quickreply_editor.html

Merge branch '3.1.x'

2015-10-12 12:05:07 +02:00

report_body.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

search_body.html

[ticket/14066] Add template events to search_body.html

2015-11-12 20:53:35 +07:00

search_results.html

Merge branch '3.1.x' into 3.2.x

2016-06-19 18:07:29 +02:00

simple_footer.html

Merge branch '3.1.x'

2015-12-22 19:51:21 +01:00

simple_header.html

Merge branch 'ticket/14136' into ticket/14136-3.2.x

2016-03-24 16:12:56 +01:00

timezone_option.html

[ticket/14139] Add class of IDs to html tags

2015-09-14 16:25:36 +02:00

timezone.js

…

ucp_agreement.html

…

ucp_attachments.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

ucp_auth_link_oauth.html

…

ucp_auth_link.html

…

ucp_avatar_options_gravatar.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

ucp_avatar_options_local.html

Merge branch '3.1.x'

2015-10-19 14:40:07 +02:00

ucp_avatar_options_remote.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

ucp_avatar_options_upload.html

…

ucp_avatar_options.html

…

ucp_footer.html

…

ucp_groups_manage.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

ucp_groups_membership.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

ucp_header.html

[ticket/14165] Fix Tab Layout

2015-09-15 16:02:47 +02:00

ucp_login_link.html

…

ucp_main_bookmarks.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

ucp_main_drafts.html

…

ucp_main_front.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

ucp_main_subscribed.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

ucp_notifications.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

ucp_pm_history.html

Merge pull request #3927 from hanakin/ticket/14199

2015-10-07 12:05:38 +02:00

ucp_pm_message_footer.html

…

ucp_pm_message_header.html

Merge pull request #3927 from hanakin/ticket/14199

2015-10-07 12:05:38 +02:00

ucp_pm_options.html

…

ucp_pm_viewfolder.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

ucp_pm_viewmessage_print.html

Merge branch 'ticket/14136' into ticket/14136-3.2.x

2016-03-24 16:12:56 +01:00

ucp_pm_viewmessage.html

Merge pull request #3927 from hanakin/ticket/14199

2015-10-07 12:05:38 +02:00

ucp_prefs_personal.html

[ticket/13180] Increase dateformat field size

2016-01-07 17:36:02 +01:00

ucp_prefs_post.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

ucp_prefs_view.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

ucp_profile_autologin_keys.html

…

ucp_profile_avatar.html

…

ucp_profile_profile_info.html

…

ucp_profile_reg_details.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

ucp_profile_signature.html

…

ucp_register.html

Merge pull request #3733 from javiexin/ticket/13934

2015-10-08 15:45:34 +02:00

ucp_remind.html

…

ucp_resend.html

…

ucp_zebra_foes.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

ucp_zebra_friends.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

viewforum_body.html

Merge branch '3.1.x' into 3.2.x

2016-06-19 18:07:29 +02:00

viewonline_body.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

viewonline_whois.html

…

viewtopic_body.html

[ticket/14447] Remove trailing white spaces in Prosilver

2016-02-02 08:42:53 -08:00

viewtopic_print.html

Merge branch 'ticket/14136' into ticket/14136-3.2.x

2016-03-24 16:12:56 +01:00

viewtopic_topic_tools.html

[ticket/14418] Wrong language variable in viewtopic_topic_tools.html fixed

2016-01-24 12:10:03 +01:00