Oleg Pudeyev 83d71ecb88 Merge remote-tracking branch 'VSEphpbb/ticket/10390' into develop ...

* VSEphpbb/ticket/10390:
  [ticket/10390] Revert back to escaped script tags inside document.write
  [ticket/10390] Fix wording: fallback should be fall back
  [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP
  [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback
  [ticket/10390] Drop http protocol for Microsoft's CDN option
  [ticket/10390] Reword the language for jQuery host/server options
  [ticket/10390] Fix a type-o - captialize AJAX
  [ticket/10390] Improve the jQuery CDN url generation function
  [ticket/10390] Move jQuery version definition
  [ticket/10390] Allow option for jQuery to be hosted by a remote CDN

Conflicts:
	phpBB/install/database_update.php

2011-10-20 20:46:48 -04:00

..

acp_attachments.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_ban.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_bbcodes.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_board.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_bots.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_captcha.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_database.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_disallow.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_email.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_forums_copy_perm.html

…

acp_forums.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_groups_position.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_groups.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_icons.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_inactive.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_jabber.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_language.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_logs.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_main.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_modules.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_permission_roles.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_permissions.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_php_info.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_profile.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_prune_forums.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_prune_users.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_ranks.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_reasons.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_search.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_send_statistics.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_styles.html

Merge branch 'develop' of github.com:phpbb/phpbb3 into develop

2011-09-21 18:12:07 +02:00

acp_update.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_users_avatar.html

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_users_feedback.html

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_users_overview.html

[ticket/8138] Add autocomplete="off" to a user and forum ACP.

2011-06-03 18:59:24 +02:00

acp_users_prefs.html

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_users_profile.html

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_users_signature.html

Merge branch 'develop-olympus' into develop

2011-07-30 19:37:24 -04:00

acp_users_warnings.html

…

acp_users.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_words.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

admin.css

[ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping

2011-09-21 01:02:28 +02:00

captcha_default_acp_demo.html

…

captcha_gd_acp.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

captcha_qa_acp_demo.html

ACP usability

2010-01-26 10:57:00 +00:00

captcha_qa_acp.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

captcha_recaptcha_acp.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

captcha_recaptcha.html

[ticket/9939] Fix JavaScript error in admin recaptcha template

2010-12-05 14:35:19 +01:00

colour_swatch.html

[ticket/10258] Add HTML5 meta charset tag

2011-07-29 16:32:22 +02:00

confirm_bbcode.html

merge r10513 into 3.0 branch: propdel

2010-02-23 16:18:57 +00:00

confirm_body_prune.html

…

confirm_body.html

…

custom_profile_fields.html

…

editor.js

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

install_convert.html

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

install_error.html

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

install_footer.html

[ticket/10390] Revert back to escaped script tags inside document.write

2011-10-05 21:24:34 -07:00

install_header.html

[ticket/10258] Add HTML5 meta charset tag

2011-07-29 16:32:22 +02:00

install_install.html

…

install_main.html

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

install_update_diff.html

[ticket/10258] Add HTML5 meta charset tag

2011-07-29 16:32:22 +02:00

install_update.html

[ticket/9535] Also fix the margin in the install_update.html

2010-05-16 18:50:48 +02:00

message_body.html

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

overall_footer.html

[ticket/10390] Revert back to escaped script tags inside document.write

2011-10-05 21:24:34 -07:00

overall_header.html

[ticket/10258] Add HTML5 meta charset tag

2011-07-29 16:32:22 +02:00

permission_forum_copy.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

permission_mask.html

[ticket/9535] Fix some more rtl margin issues.

2010-05-16 18:50:25 +02:00

permission_roles_mask.html

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

permission_trace.html

…

permissions.js

…

progress_bar.html

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

simple_body.html

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

simple_footer.html

[ticket/10390] Revert back to escaped script tags inside document.write

2011-10-05 21:24:34 -07:00

simple_header.html

[ticket/10258] Add HTML5 meta charset tag

2011-07-29 16:32:22 +02:00

tooltip.js

…

viewsource.html

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00