php-phpbb

mirror of https://github.com/phpbb/phpbb.git synced 2025-07-04 17:05:17 +02:00

Go to file

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

build

Merge branch 'develop-olympus' into develop

2011-08-25 22:57:56 -04:00

code_sniffer/phpbb

…

git-tools

Merge remote branch 'igorw/ticket/9806' into develop-olympus

2011-03-20 22:31:14 +01:00

phpBB

Merge remote-tracking branch 'VSEphpbb/ticket/10390' into develop

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