makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 06:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/includes/acp
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
..
info [ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION 2013-02-23 14:20:56 -05:00
acp_attachments.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +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 [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
acp_board.php Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-16 01:24:05 +02:00
acp_bots.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
acp_captcha.php Merge branch 'develop-olympus' into develop 2013-07-03 04:03:39 +02:00
acp_database.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02: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 [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
acp_forums.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
acp_groups.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
acp_icons.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +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/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
acp_logs.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
acp_main.php Merge pull request #1543 from nickvergessen/ticket/11685 2013-07-13 10:37:43 -07:00
acp_modules.php Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-16 01:24:05 +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 Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-16 01:24:05 +02: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 [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +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/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02: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 [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
acp_words.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
auth.php Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-16 01:24:05 +02:00