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

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

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

auth

Merge branch 'develop-olympus' into develop

2011-10-14 03:56:55 +02:00

cache

Merge branch 'develop-olympus' into develop

2011-06-11 12:06:29 +02:00

captcha

Merge branch 'develop' into feature/request-class

2011-08-18 22:31:25 +02:00

config

[ticket/10139] Make signatures of set_atomic() consistent by using $new_value.

2011-04-19 10:17:18 +02:00

cron

[ticket/10156] Fix new cron on windows.

2011-05-19 22:34:18 -04:00

db

Merge branch 'develop-olympus' into develop

2011-10-14 17:50:53 +02:00

diff

…

hooks

…

lock

…

mcp

Merge branch 'develop-olympus' into develop

2011-10-14 17:56:46 +02:00

questionnaire

[feature/request-class] Adjust code base to do html decoding manually

2011-08-18 23:44:30 +02:00

request

[feature/request-class] Remove $html_encode arg, force manual decoding

2011-08-18 23:19:48 +02:00

search

[ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function.

2011-08-21 14:34:34 +02:00

template

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

2011-09-27 20:24:16 +02:00

ucp

Merge branch 'develop-olympus' into develop

2011-10-13 17:07:39 +02:00

utf

[ticket/9608] Revert changes to normalizer

2011-08-08 08:58:52 +02:00

.htaccess

…

auth.php

Merge branch 'develop-olympus' into develop

2011-07-16 22:11:32 -04:00

bbcode.php

Merge remote-tracking branch 'github-p/feature/template-engine' into develop

2011-08-13 23:59:15 -04:00

class_loader.php

…

constants.php

[ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP

2011-09-27 11:12:11 -07:00

error_collector.php

[ticket/10369] Rename filter_errfile() to filter_root_path().

2011-09-18 22:32:25 +02:00

functions_acp.php

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

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

functions_admin.php

Merge branch 'develop-olympus' into develop

2011-10-14 02:49:15 +02:00

functions_compress.php

…

functions_content.php

Merge branch 'develop-olympus' into develop

2011-08-21 14:26:37 +02:00

functions_convert.php

…

functions_display.php

Merge branch 'develop-olympus' into develop

2011-10-13 14:46:16 +02:00

functions_download.php

[feature/request-class] Adjust code base to do html decoding manually

2011-08-18 23:44:30 +02:00

functions_install.php

Merge branch 'develop-olympus' into develop

2011-10-14 17:48:15 +02:00

functions_jabber.php

…

functions_messenger.php

Merge branch 'develop-olympus' into develop

2011-09-18 23:25:57 +02:00

functions_module.php

…

functions_posting.php

[ticket/9608] Remove use of references in topic_review

2011-08-14 20:22:28 +02:00

functions_privmsgs.php

[ticket/9661] Remove eval() from functions_privmsgs.php

2011-09-25 23:04:18 -07:00

functions_profile_fields.php

Merge branch 'develop-olympus' into develop

2011-06-09 12:47:27 +02:00

functions_transfer.php

Merge branch 'develop-olympus' into develop

2011-08-14 15:52:11 -04:00

functions_upload.php

…

functions_user.php

[ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function.

2011-08-21 14:34:34 +02:00

functions.php

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

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

group_positions.php

…

index.htm

…

message_parser.php

Merge branch 'develop-olympus' into develop

2011-06-09 22:40:26 +02:00

session.php

[feature/remove-db-styles] Remove DB theme handling code from session.

2011-09-20 21:06:52 +01:00

startup.php

[ticket/7729] Prevent date/time functions from throwing E_WARNING on PHP 5.3.

2011-06-25 17:42:52 +02:00