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
..
adm	[feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth	2013-09-06 20:35:54 -04:00
assets/javascript	Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' into develop	2013-06-06 14:07:27 -05:00
cache
config	Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832	2013-09-13 09:15:23 -05:00
develop	[ticket/11825] Move schema_data.php into includes/ instead of phpbb/	2013-09-03 19:44:07 +05:30
docs	Merge branch 'develop-olympus' into develop	2013-09-10 02:53:33 +02:00
download	[ticket/11802] replace $browser with $user->browser	2013-08-20 04:14:20 +05:30
files
images
includes	Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832	2013-09-13 09:15:23 -05:00
install	Merge remote-tracking branch 'remotes/imkingdavid/ticket/11824' into ticket/11832	2013-09-12 12:45:17 -05:00
language	Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832	2013-09-13 09:15:23 -05:00
phpbb	Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832	2013-09-13 09:15:23 -05:00
store
styles	Merge pull request #1705 from EXreaction/ticket/11833	2013-09-12 21:17:22 -07:00
.htaccess	[ticket/11215] Remove unnecessary comment	2013-09-02 15:34:14 -07:00
app.php	[ticket/11215] Correct paths when path info is used for controller access	2013-07-06 23:20:21 -04:00
common.php	[ticket/11832] We must instantiate the $phpbb_filesystem in common	2013-09-12 11:05:14 -05:00
composer.json	[feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth	2013-09-06 20:35:54 -04:00
composer.lock	[feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth	2013-09-06 20:35:54 -04:00
cron.php	[ticket/11189] Replace DEBUG_EXTRA with DEBUG	2012-11-10 10:45:02 -06:00
faq.php
feed.php	[ticket/11481] Move prepended slash from calls into function	2013-06-06 20:35:38 +02:00
index.php	[ticket/11103] Instantiate $phpbb_notifications as needed	2012-12-13 19:19:40 -06:00
mcp.php	[ticket/9657] Use the service instead of the static class	2013-07-11 14:24:07 +02:00
memberlist.php	Merge remote-tracking branch 'brunoais/ticket/11656' into develop	2013-07-24 22:14:52 +02:00
posting.php	Merge branch 'develop-olympus' into develop	2013-09-02 12:31:27 +02:00
report.php	[ticket/11763] Add missing variable when reporting a PM to avoid SQL Error	2013-08-03 17:30:28 +02:00
search.php	Merge pull request #1640 from brunoais/ticket/11637	2013-09-12 19:30:43 -07:00
ucp.php	[feature/oauth] Forgot to have login_link be "in login" in ucp	2013-08-05 17:35:44 -04:00
viewforum.php	[ticket/11749] PHP Events for viewforum.php	2013-07-27 10:45:40 -07:00
viewonline.php	[ticket/11259] adm_relative_path -> phpbb_adm_relative_path	2012-12-09 19:29:51 -06:00
viewtopic.php	[ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php	2013-09-06 15:04:52 +02:00
web.config	[feature/controller] Remove URL rewriting by default	2012-11-16 17:06:02 -05:00