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

..

profilefields

[ticket/12187] Add URL type for profile fields

2014-03-03 12:30:07 +01:00

acp_attachments.html

[ticket/10472] More clearing and white-space fixes

2014-09-15 14:53:04 +02:00

acp_avatar_options_gravatar.html

…

acp_avatar_options_local.html

[ticket/13799] Correctly urlencode category and show selected avatar

2015-05-30 11:54:54 +02:00

acp_avatar_options_remote.html

…

acp_avatar_options_upload.html

…

acp_ban.html

[ticket/14201] Add events.md descriptions, fix accidentally swapped events

2015-10-12 21:31:09 +07:00

acp_bbcodes.html

Merge pull request #1913 from prototech/ticket/12055

2013-12-30 10:44:30 -08:00

acp_board.html

[ticket/9388] Reopen <fieldset> after auth templates.

2014-05-08 08:35:38 -07:00

acp_bots.html

[ticket/12055] Alternate table row background colors using nth-child rule.

2013-12-04 14:53:07 -08:00

acp_captcha.html

[ticket/11971] Validate "Spambot countermeasures" settings before saving.

2015-10-14 03:31:34 -07:00

acp_contact.html

[ticket/10073] Deduplicate template variable names

2014-05-29 02:14:46 +02:00

acp_database.html

…

acp_disallow.html

…

acp_email.html

[ticket/14201] Add events.md descriptions, fix accidentally swapped events

2015-10-12 21:31:09 +07:00

acp_ext_delete_data.html

[ticket/12248] Use id instead of name attribute in a tags

2014-03-05 14:54:04 -08:00

acp_ext_details.html

[ticket/11366] Fix detailed view

2014-05-28 22:16:51 +02:00

acp_ext_disable.html

[ticket/12534] Do not use errorbox for multi steps

2014-05-12 11:35:59 +02:00

acp_ext_enable.html

[ticket/12534] Do not use errorbox for multi steps

2014-05-12 11:35:59 +02:00

acp_ext_list.html

Merge pull request #3893 from VSEphpbb/ticket/14155

2015-10-09 16:51:00 +02:00

acp_forums_copy_perm.html

…

acp_forums.html

[ticket/14201] Add events.md descriptions, fix accidentally swapped events

2015-10-12 21:31:09 +07:00

acp_groups_position.html

[ticket/14201] Add events.md descriptions, fix accidentally swapped events

2015-10-12 21:31:09 +07:00

acp_groups.html

[ticket/14253] Show group requests pending aproval at the ACP groups summary

2016-01-25 13:13:05 +01:00

acp_icons.html

[ticket/14157] Allow to set the alt/title attribute on post icons

2015-10-10 15:29:31 +02:00

acp_inactive.html

[ticket/14219] Add email to inactive user listing

2015-10-08 06:10:49 -04:00

acp_jabber.html

[ticket/13200] Disable autocomplete for sensitive input fields

2015-06-04 19:01:46 +02:00

acp_language.html

[ticket/13818] Add browse CDB links to ext style lang management

2015-06-06 10:30:09 -07:00

acp_logs.html

[ticket/14201] Add events.md descriptions, fix accidentally swapped events

2015-10-12 21:31:09 +07:00

acp_main.html

[ticket/14346] Do not turn version red if update status is unknown

2015-12-07 20:00:13 +01:00

acp_modules.html

[ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()

2014-04-07 21:42:30 +02:00

acp_permission_roles.html

[ticket/12038] AJAXify move up/down buttons in the permission roles page.

2013-12-05 23:43:16 -08:00

acp_permissions.html

Merge branch '3.1.x'

2015-11-10 17:40:41 +01:00

acp_php_info.html

…

acp_posting_buttons.html

[ticket/10073] Deduplicate posting buttons code in ACP

2014-05-29 02:14:43 +02:00

acp_profile.html

Merge pull request #3733 from javiexin/ticket/13934

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

acp_prune_forums.html

[ticket/14201] Add events.md descriptions, fix accidentally swapped events

2015-10-12 21:31:09 +07:00

acp_prune_users.html

[ticket/14201] Add events.md descriptions, fix accidentally swapped events

2015-10-12 21:31:09 +07:00

acp_ranks.html

[ticket/12838] Simplify special rank template conditional

2014-07-10 16:24:17 +02:00

acp_reasons.html

[ticket/12038] AJAXify move up/down buttons in report/denial reasons page.

2013-12-05 23:45:01 -08:00

acp_search.html

[ticket/9388] Use "togglable" instead of "toggable"

2014-05-09 13:49:41 -07:00

acp_send_statistics.html

[ticket/12372] Use admin.js $(document).ready for hiding questionnaire details

2014-04-11 11:27:13 +02:00

acp_styles.html

Merge pull request #3921 from Senky/ticket/14187

2015-10-12 11:23:10 +02:00

acp_update.html

[ticket/9871] Update version check file to use json format

2014-02-19 16:13:23 -06:00

acp_users_avatar.html

[ticket/12822] Remove "None" option from avatar select boxes

2014-08-07 17:28:21 +02:00

acp_users_feedback.html

[ticket/12055] Alternate table row background colors using nth-child rule.

2013-12-04 14:53:07 -08:00

acp_users_overview.html

[ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()

2014-04-07 21:42:30 +02:00

acp_users_prefs.html

[ticket/13180] Increase dateformat field size

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

acp_users_profile.html

[ticket/13934] Add enctype clause for profile fields

2015-06-30 14:35:01 +02:00

acp_users_signature.html

[ticket/10073] Deduplicate posting buttons code in ACP

2014-05-29 02:14:43 +02:00

acp_users_warnings.html

[ticket/12055] Alternate table row background colors using nth-child rule.

2013-12-04 14:53:07 -08:00

acp_users.html

[ticket/14201] Add events.md descriptions, fix accidentally swapped events

2015-10-12 21:31:09 +07:00

acp_words.html

[ticket/12055] Alternate table row background colors using nth-child rule.

2013-12-04 14:53:07 -08:00

admin.css

[ticket/14315] Add back roles select for disable javascript

2016-02-16 18:21:04 +01:00

admin.js

[ticket/12648] Fix and modernize ACP header tabs

2014-06-24 00:02:24 +02:00

ajax.js

[ticket/12982] Refactoring: made JS in adm nice

2014-08-13 22:53:28 +01:00

auth_provider_ldap.html

[ticket/12814] Replace email type with text type

2014-07-15 19:36:35 +02:00

auth_provider_oauth.html

[ticket/9388] Do not nest the <fieldset> tags in the OAuth settings.

2014-05-08 13:39:31 -07:00

captcha_default_acp_demo.html

…

captcha_gd_acp.html

…

captcha_qa_acp_demo.html

…

captcha_qa_acp.html

[ticket/12055] Alternate table row background colors using nth-child rule.

2013-12-04 14:53:07 -08:00

captcha_recaptcha_acp.html

…

captcha_recaptcha.html

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

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

confirm_bbcode.html

…

confirm_body_prune.html

…

confirm_body.html

…

installer_convert.html

[ticket/14262] Add error handling and small CS fixes

2016-02-02 16:09:40 +01:00

installer_footer.html

[ticket/14462] Make timeout error translateable

2016-02-14 16:16:33 +01:00

installer_form.html

[ticket/14039] Revamp updater

2015-10-17 23:05:57 +02:00

installer_header.html

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

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

installer_install.html

[ticket/14380] Maintain consistent template var paths in 3.2 installer

2015-12-22 21:52:05 +01:00

installer_main.html

[ticket/13740] Replace more spaces with tabs

2015-07-24 08:33:02 +02:00

installer_update_file_status.html

[ticket/14378] Use consistent template variable paths

2015-12-22 20:02:44 +01:00

installer_update.html

[ticket/14380] Maintain consistent template var paths in 3.2 installer

2015-12-22 21:52:05 +01:00

message_body.html

…

overall_footer.html

[ticket/14374] Update dynamic fallback jquery CDN script tag

2015-12-22 09:29:29 -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

[ticket/12613] Renamed jump-to to page-jump to prevent confusion

2014-06-05 09:59:35 +02:00

permission_forum_copy.html

[ticket/14201] Add events to acp_users.html, permission_forum_copy.html

2015-09-26 22:36:38 +07:00

permission_mask.html

[ticket/14315] Add functional tests for permission roles and fix non-js

2016-02-17 12:56:19 +01:00

permission_roles_mask.html

[ticket/11935] Replace obsolete table attributes in Admin with CSS

2013-10-19 08:59:08 -07:00

permission_trace.html

[ticket/11935] Replace obsolete table attributes in Admin with CSS

2013-10-19 08:59:08 -07:00

permissions.js

[ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()

2014-04-07 21:42:30 +02:00

progress_bar.html

…

simple_body.html

…

simple_footer.html

[ticket/14374] Update dynamic fallback jquery CDN script tag

2015-12-22 09:29:29 -08:00

simple_header.html

[ticket/14136] Add back X-UA-Compatible meta tag

2016-03-24 16:07:07 +01:00

timezone_option.html

[ticket/12858] Rename tz_ prefixed block variables to timezone_ prefix

2014-09-17 17:56:09 +02:00

timezone.js

…

tooltip.js

[ticket/14315] Add functional tests for permission roles and fix non-js

2016-02-17 12:56:19 +01:00