Nils Adermann 0e772afb9d Merge branch 'prep-release-3.1.1' into develop-ascraeus ... * prep-release-3.1.1: [ticket/13271] Disable CC sender feature for anonymous users [prep-release-3.1.1] Add 3.1.1 CHANGELOG [prep-release-3.1.1] Add 3.1.1 migration file [ticket/13263] Make sure default style exists and clean up code [ticket/13263] Only install/set prosilver if no style available [ticket/13263] Use prosilver as default style if user's style doesn't exist [ticket/security-164] Correctly format page_name [ticket/security-164] Sanitize all global variables in symfony_request class [ticket/13248] Use functional framework login method in tests [ticket/13248] Correctly pass provider name [ticket/13248] Always use provider collection for getting provider [ticket/13248] Allow specifying different auth provider in provider collection [ticket/13248] Use auth provider collection for getting provider [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1 [ticket/13267] Update Automatic Update instructions to include vendor directory [ticket/13268] Properly append ternary result in get_existing_indexes() [prep-release-3.1.1] Update version number to 3.1.1 Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql		2014-11-02 01:25:51 +01:00
..
acp	Merge pull request #3 from phpbb/ticket/security-161	2014-10-23 01:38:12 +02:00
diff	[ticket/12557] Fix pass by reference doc blocks	2014-08-07 11:39:04 +03:00
hooks	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
mcp	Merge pull request #3053 from Senky/ticket/13194	2014-10-21 18:57:43 -05:00
questionnaire	[ticket/12775] Remove useless includes of config.php	2014-07-07 01:02:42 +02:00
ucp	Merge branch 'prep-release-3.1.1' into develop-ascraeus	2014-11-02 01:25:51 +01:00
utf	[ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy ruleset	2014-06-16 19:05:09 +02:00
.htaccess	[ticket/9698] Add .htaccess to the includes subdirectory.	2010-10-15 16:47:21 +02:00
bbcode.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
compatibility_globals.php	[ticket/13061] Replace the service event.subscriber_loader by a compiler pass	2014-09-13 14:34:18 +02:00
constants.php	Merge branch 'prep-release-3.1.1' into develop-ascraeus	2014-11-02 01:25:51 +01:00
functions.php	[ticket/13232] Use a cache var with _ to force TTL and shuffle cron tasks	2014-10-27 15:42:26 -07:00
functions_acp.php	[ticket/13045] Remove Pragma headers	2014-09-17 20:10:01 +02:00
functions_admin.php	Merge pull request #2894 from Nicofuma/ticket/12999	2014-08-21 13:44:10 +02:00
functions_compatibility.php	[ticket/13230] Add missing globals and missing request object for path helper	2014-10-27 14:54:17 +01:00
functions_compress.php	[ticket/13045] Remove Pragma headers	2014-09-17 20:10:01 +02:00
functions_content.php	[ticket/13108] Add core event to the parse_attachments() function	2014-10-01 21:00:37 +08:00
functions_convert.php	[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts	2014-06-26 21:09:19 +02:00
functions_database_helper.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
functions_display.php	[ticket/13229] Fix overloading memberlist with redundant SQL queries	2014-10-27 17:01:29 -07:00
functions_download.php	[ticket/13125] $user->browser to $browser	2014-10-02 15:34:56 +02:00
functions_install.php	Merge branch 'develop-olympus' into develop-ascraeus	2014-07-30 15:01:16 +02:00
functions_jabber.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
functions_mcp.php	[ticket/12966] Sort by post_time and post_id where applicable	2014-08-23 16:36:39 +02:00
functions_messenger.php	[ticket/12931] Fix general error on user registration	2014-08-10 21:31:08 +08:00
functions_module.php	[ticket/12919] Use the modules basename as identifier for extension modules	2014-08-07 14:06:45 +02:00
functions_posting.php	[ticket/13164] Fix syntax error	2014-10-11 17:58:41 +02:00
functions_privmsgs.php	[ticket/13205] Explicitly cast ids to integers and reformat SQL	2014-10-22 18:35:07 -04:00
functions_transfer.php	[ticket/12999] Remove @author tags	2014-08-19 22:54:45 +02:00
functions_upload.php	[ticket/13031] Guess with all mimetype guessers and pick best guess	2014-09-05 10:56:06 +02:00
functions_url_matcher.php	[ticket/12557] Fix php file description	2014-08-07 13:19:49 +03:00
functions_user.php	[ticket/13207] Move default user notifications settings to user_add()	2014-10-25 14:57:01 -07:00
index.htm	Add blank indexes to stop nosey people being, erm, nosey	2001-11-21 13:06:56 +00:00
message_parser.php	Merge remote-tracking branch 'github-marc1706/ticket/11148' into develop-ascraeus	2014-08-07 12:06:33 +02:00
sphinxapi.php	[ticket/12721] Update rules descriptions	2014-06-16 23:07:28 +02:00
startup.php	[ticket/11266] Better message for when composer dependencies are missing.	2014-05-29 16:13:29 +02:00