makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/includes
History
Nils Adermann f039a3308a Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 
* github-phpbb/develop:
  [ticket/11832] Correct paths in tests
  [ticket/11832] Correct ROOT_PATH variable
  [ticket/11832] get_url() from phpbb_template_asset should return web path
  [ticket/11832] Fix INCLUDE(JS/CSS)
  [ticket/11832] Fix constructions of phpbb_filesystem
  [ticket/11832] Fix smiley paths
  [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request
  [ticket/11832] Fix build_url and the S_LOGIN_ACTION
  [ticket/11832] Changing comments to say app.php rather than index.php
  [ticket/11832] We must instantiate the $phpbb_filesystem in common
  [ticket/11832] Fix the web path corrections
  [ticket/11832] More extensive testing
  [ticket/11832] Use dirname(__FILE__)
  [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid
  Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework"
  [ticket/11832] Make $phpbb_container a global initiated by the framework
  [ticket/11832] Fix log tests
  [ticket/11832] update_web_root_path helper and tests
  [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)

Conflicts:
	phpBB/common.php
	phpBB/config/services.yml
	phpBB/includes/bbcode.php
	phpBB/includes/functions.php
	phpBB/includes/functions_messenger.php
	phpBB/install/index.php
	phpBB/phpbb/filesystem.php
	phpBB/phpbb/template/twig/environment.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/dbal/migrator_test.php
	tests/extension/manager_test.php
	tests/extension/metadata_manager_test.php
	tests/filesystem/clean_path_test.php
	tests/mock/extension_manager.php
	tests/template/template_events_test.php
	tests/template/template_test_case.php
	tests/template/template_test_case_with_tree.php
	tests/test_framework/phpbb_functional_test_case.php
2013-09-17 16:56:50 +02:00
..
acp [ticket/11700] Correctly load extensions with nonprefixed namespaces 2013-09-17 16:15:44 +02:00
captcha Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-16 01:24:05 +02:00
db Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth 2013-09-10 16:19:39 -04:00
diff [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
hooks [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
mcp Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-16 01:24:05 +02:00
questionnaire Merge remote-tracking branch 'upstream/develop' into ticket/11015 2012-12-06 21:49:24 -05:00
ucp Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-16 01:24:05 +02:00
utf [ticket/10847] fixing all misspelled "dependant" to "dependent" 2012-04-30 21:55:24 +02:00
.htaccess
bbcode.php Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-17 16:56:50 +02:00
constants.php [prep-release-3.0.12] Bumping version number for 3.0.12-RC2. 2013-08-01 17:26:34 +02:00
functions.php Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-17 16:56:50 +02:00
functions_acp.php [ticket/10999] Fix assets_version in ACP 2013-07-13 13:30:33 -04:00
functions_admin.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
functions_compatibility.php [feature/avatars] Use deprecated for compatibility function 2013-02-03 23:06:30 +01:00
functions_compress.php [ticket/11159] Static public is the currently approved order. 2012-11-06 16:43:48 -05:00
functions_container.php Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-16 01:24:05 +02:00
functions_content.php [ticket/11832] Fix smiley paths 2013-09-13 09:56:00 -05:00
functions_convert.php [feature/soft-delete] Lay the groundwork for a soft-delete feature 2012-08-29 17:49:37 +02:00
functions_database_helper.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
functions_display.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
functions_download.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
functions_install.php [ticket/11700] Get the installer to run with namespaces 2013-09-16 00:41:38 +02:00
functions_jabber.php Merge branch 'develop-olympus' into develop 2013-07-12 10:37:52 -05:00
functions_messenger.php Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-17 16:56:50 +02:00
functions_module.php [ticket/11791] Load adm/ events from styles/adm/event/ 2013-09-02 15:51:20 -05:00
functions_posting.php Merge branch 'develop-olympus' into develop 2013-09-02 12:31:27 +02:00
functions_privmsgs.php Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-16 01:24:05 +02:00
functions_profile_fields.php [ticket/11010] dealing with dimensions problem, removing extra code 2013-05-20 18:42:06 +02:00
functions_transfer.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
functions_upload.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
functions_url_matcher.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
functions_user.php Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-16 01:24:05 +02:00
index.htm
message_parser.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
sphinxapi.php [ticket/11248] Convert line endings to LF - develop edition. 2012-12-07 21:57:33 -05:00
startup.php [ticket/10893] Update the usage of Composer 2012-05-13 13:05:20 -04:00