Nathan Guse a194e6ce7a Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832 ... # By Nathan Guse (22) and others # Via Nathan Guse (10) and others * 'develop' of github.com:phpbb/phpbb3: (39 commits) [ticket/11843] Added newlines and included numbers in the DEFINE vars test [ticket/11843] Add checking DEFINE variables with underscores to template_test [ticket/11843] The twig lexer fixes DEFINE variables with underscores again [ticket/11727] Fix indentation [ticket/11727] Fix indentation [ticket/11745] Correct language, coding guidelines [ticket/11828] Fix greedy operators in lexer [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE [ticket/11833] Fix bad template loop [ticket/11816] !$DOESNT_EXIST test [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php [ticket/11829] Use report_closed to determine status in MCP report_details [ticket/11816] Test !$DEFINITION [ticket/11822] Use namespace lookup order for asset loading [ticket/11727] Template loader support for safe directories to load files from [ticket/11816] Fix define/loop checks in IF statements containing parenthesis [ticket/11373] Use inheritdoc [ticket/11637] generate_text_for_display on search.php [ticket/11744] Cast to int [ticket/11744] Inheritdoc ...		2013-09-13 09:15:23 -05:00
..
info	[ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION	2013-02-23 14:20:56 -05:00
acp_attachments.php	[ticket/11010] validation to match type	2013-05-20 18:42:02 +02:00
acp_ban.php	[ticket/11099] Mark acp_ban::display_ban_options() as static.	2012-10-30 18:43:00 -04:00
acp_bbcodes.php	Merge branch 'ticket/8319' into ticket/8319-develop2	2013-07-10 17:24:49 +02:00
acp_board.php	Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832	2013-09-13 09:15:23 -05:00
acp_bots.php	[ticket/10990] Changes for develop	2012-07-22 14:48:39 -05:00
acp_captcha.php	Merge branch 'develop-olympus' into develop	2013-07-03 04:03:39 +02:00
acp_database.php	[ticket/11696] Rename db_tools.php so it can be autoloaded	2013-07-14 10:10:05 -04:00
acp_disallow.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
acp_email.php	[ticket/10990] Do not use comma separator when storing it as a log.	2012-07-22 14:39:10 -05:00
acp_extensions.php	Merge remote-tracking branch 'EXreaction/ticket/11415' into develop	2013-05-18 11:20:47 -04:00
acp_forums.php	Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission	2013-03-03 20:06:52 +01:00
acp_groups.php	Merge branch 'develop-olympus' into develop	2013-07-12 20:09:22 +02:00
acp_icons.php	[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968	2012-10-17 23:34:37 +02:00
acp_inactive.php	[ticket/11454] Use set_addresses in other applicable areas	2013-04-24 15:34:12 -05:00
acp_jabber.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
acp_language.php	[ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.	2012-09-08 14:42:38 +02:00
acp_logs.php	[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968	2012-10-17 23:34:37 +02:00
acp_main.php	Merge pull request #1543 from nickvergessen/ticket/11685	2013-07-13 10:37:43 -07:00
acp_modules.php	[ticket/11713] Do not remove module if it couldn't be deleted	2013-07-18 22:41:23 +02:00
acp_permission_roles.php	[ticket/11582] Move global declaration to beginning of block	2013-07-22 20:06:30 +02:00
acp_permissions.php	[ticket/11582] Use member isntead of a new variable everytime	2013-07-14 11:51:37 -04:00
acp_php_info.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
acp_profile.php	[feature/php-events] Remove event core.acp_profile_field_edit	2012-08-05 14:50:33 +02:00
acp_prune.php	Merge PR #1371 branch 'EXreaction/ticket/11236' into develop	2013-04-26 22:35:13 -04:00
acp_ranks.php	[ticket/11259] htmlspecialchars($phpbb_admin_path)	2012-12-10 21:16:08 -06:00
acp_reasons.php	[ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate	2012-07-22 14:32:03 -05:00
acp_search.php	[ticket/11698] Moving all autoloadable files to phpbb/	2013-07-14 01:32:34 -04:00
acp_send_statistics.php	Merge branch 'develop-olympus' into develop	2013-07-13 13:16:58 -04:00
acp_styles.php	[ticket/11310] Add hashes to action links to prevent CSRF attacks	2013-03-12 17:19:30 +01:00
acp_update.php	Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop	2013-05-20 11:55:33 -05:00
acp_users.php	Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission	2013-07-11 11:41:48 +02:00
acp_words.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
auth.php	[ticket/11582] Remove left over calls to lang['acl_*']	2013-07-14 11:51:39 -04:00