makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 21:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/includes
History
Nils Adermann 21bbb58503 Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 
* github-phpbb/develop: (586 commits)
  [ticket/11735] Display disabled checkbox in subsilver for read notifications
  [ticket/11735] Display disabled checkbox when notification is already read
  [ticket/11844] update acp/authentication language var
  [ticket/11795] Remove PM popup
  [ticket/11795] Remove outdated comment from forum_fn.js
  [ticket/11795] Move find user JS to forum_fn
  [ticket/11795] Replace TWIG with phpBB syntax in ACP
  [ticket/11795] Move MSN scripts to forum_fn.js
  [ticket/11795] Use phpBB template syntax instead of TWIG
  [ticket/11795] Move PM popup JS to forum_fn.js
  [ticket/11795] Get rid of pagination JS variables
  [ticket/11795] Get rid of onload_functions
  [ticket/11795] Use data-reset-on-edit attr to reset elements
  [ticket/11795] Redo form elements auto-focus
  [ticket/11811] Remove outline on :focus
  [ticket/11836] Fix subsilver fatal error
  [ticket/11837] Replace escaped single quote with utf-8 single quote
  [ticket/11836] Fix fatal error on unsupported provider for auth link
  [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED
  [ticket/11809] Ensure code.js is first script included after jQuery
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/develop/create_schema_files.php
	phpBB/develop/mysql_upgrader.php
	phpBB/download/file.php
	phpBB/includes/bbcode.php
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/phpbb/controller/helper.php
	phpBB/phpbb/controller/resolver.php
	phpBB/phpbb/request/request_interface.php
	phpBB/phpbb/session.php
	phpBB/phpbb/style/extension_path_provider.php
	phpBB/phpbb/style/path_provider.php
	phpBB/phpbb/style/path_provider_interface.php
	phpBB/phpbb/style/resource_locator.php
	phpBB/phpbb/style/style.php
	phpBB/phpbb/template/locator.php
	phpBB/phpbb/template/template.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/node/includecss.php
	phpBB/phpbb/template/twig/node/includejs.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/di/create_container_test.php
	tests/extension/style_path_provider_test.php
	tests/notification/notification_test.php
	tests/session/continue_test.php
	tests/session/creation_test.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-16 01:24:05 +02:00
..
acp Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-16 01:24:05 +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 [ticket/9698] Add .htaccess to the includes subdirectory. 2010-10-15 16:47:21 +02:00
bbcode.php Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-16 01:24:05 +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-16 01:24:05 +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/11824] Revert changes to functions_content.php 2013-09-12 09:18:18 -07: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-16 01:24:05 +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