Nathan Guse e8ab8fe0bc Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323 ... # By Joas Schilling (613) and others # Via Andreas Fischer (214) and others * 'develop' of github.com:phpbb/phpbb3: (2494 commits) [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ [ticket/11215] Remove unnecessary comment [ticket/11755] MySQL upgrader out of date [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. [ticket/11823] Set up nginx server to match PHP files with characters after .php [ticket/11812] Fix empty define [ticket/11818] Update Symfony dependencies to 2.3.* [ticket/11791] Load adm/ events from styles/adm/event/ [ticket/11215] Fix helper_url_test.php tests [ticket/11215] Add newline back to .htaccess, fix wording [ticket/11215] Update comment in .htaccess [ticket/11215] Uncomment rewrite rules in .htaccess [ticket/11215] Make controller helper url() method use correct format [ticket/11215] Add commented-out URL rewrite capability to .htaccess [ticket/11821] Fix comma usage next to "You are receiving this notification". [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11215] Use new URL structure for controllers [ticket/11215] Everything appears to be working... ... Conflicts: phpBB/includes/functions_privmsgs.php		2013-09-05 13:56:57 -05:00
..
info	[feature/avatars] Reduce module auth of ucp avatar settings	2013-03-04 00:25:38 +01:00
ucp_activate.php	[ticket/11454] Use set_addresses in other applicable areas	2013-04-24 15:34:12 -05:00
ucp_attachments.php	[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968	2012-10-17 23:34:37 +02:00
ucp_confirm.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
ucp_groups.php	Merge branch 'develop-olympus' into develop	2013-07-12 00:11:18 +02:00
ucp_main.php	[ticket/9657] Use the service instead of the static class	2013-07-11 14:24:07 +02:00
ucp_notifications.php	[ticket/11533] Columns counter for notification settings	2013-05-11 23:30:44 +03:00
ucp_pm.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
ucp_pm_compose.php	Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323	2013-09-05 13:56:57 -05:00
ucp_pm_options.php	Merge branch 'develop-olympus' into develop	2012-06-21 10:31:08 +02:00
ucp_pm_viewfolder.php	[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968	2012-10-17 23:34:37 +02:00
ucp_pm_viewmessage.php	[ticket/11653] Use $parse_flags	2013-08-01 10:14:34 +01:00
ucp_prefs.php	[ticket/11747] ucp_prefs_post core events	2013-07-26 18:33:27 -07:00
ucp_profile.php	Merge branch 'develop-olympus' into develop	2013-07-31 23:40:35 +02:00
ucp_register.php	[ticket/11723] Correctly redirect user to agreement page and let him leave	2013-07-22 22:20:55 +02:00
ucp_remind.php	Merge branch 'develop-olympus' into develop	2013-08-26 16:57:46 +02:00
ucp_resend.php	[ticket/11454] Use set_addresses in other applicable areas	2013-04-24 15:34:12 -05:00
ucp_zebra.php	[feature/php-events] Fix naming and doc of core.ucp_add_zebra	2012-08-04 17:50:16 +02:00