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/ucp
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 [feature/oauth] Default auth_link into UCP_PROFILE not UCP_MAIN 2013-08-09 04:39:06 -04:00
ucp_activate.php [ticket/11454] Use set_addresses in other applicable areas 2013-04-24 15:34:12 -05:00
ucp_attachments.php [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 2012-10-17 23:34:37 +02:00
ucp_auth_link.php [feature/oauth] Fix bug on ucp_auth_link related to error display 2013-09-02 16:54:30 -04:00
ucp_confirm.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
ucp_groups.php Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-16 01:24:05 +02:00
ucp_login_link.php [feature/oauth] More minor changes from review 2013-09-02 16:47:53 -04:00
ucp_main.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
ucp_notifications.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
ucp_pm.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
ucp_pm_compose.php Merge branch 'develop-olympus' into develop 2013-05-06 22:11:33 +02:00
ucp_pm_options.php Merge branch 'develop-olympus' into develop 2012-06-21 10:31:08 +02:00
ucp_pm_viewfolder.php [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 2012-10-17 23:34:37 +02:00
ucp_pm_viewmessage.php [ticket/11653] Use $parse_flags 2013-08-01 10:14:34 +01:00
ucp_prefs.php [ticket/11747] ucp_prefs_post core events 2013-07-26 18:33:27 -07:00
ucp_profile.php Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-16 01:24:05 +02:00
ucp_register.php [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth 2013-09-06 20:35:54 -04:00
ucp_remind.php Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-16 01:24:05 +02:00
ucp_resend.php [ticket/11454] Use set_addresses in other applicable areas 2013-04-24 15:34:12 -05:00
ucp_zebra.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00