1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 04:52:36 +01:00

11 Commits

Author SHA1 Message Date
Andreas Fischer
7aa8f6461f [task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.
PHPBB3-11980
2013-10-30 13:05:28 +01:00
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
Nils Adermann
b95fdacdd3 [ticket/11700] Move all recent code to namespaces
PHPBB3-11700
2013-09-16 00:25:27 +02:00
Nathaniel Guse
8795a354fe [ticket/11628] Remove the one usage of get_style_path()
Makes the code easier to follow

PHPBB3-11628
2013-07-24 13:31:09 -05:00
Nathaniel Guse
12c2258506 [ticket/11628] Remove template_path option on set_custom_style
This was set to default 'template/' to append template/ to all the paths,
but every location was actually just setting it to '' to not append anything.
So removed the option entirely (additional paths can be appended to the paths
being sent to the function already)

PHPBB3-11628
2013-07-24 13:25:20 -05:00
Nathaniel Guse
863592a8be [ticket/11628] Remove set_style_names function, moved to set_custom_style
PHPBB3-11628
2013-07-24 13:19:20 -05:00
Nathaniel Guse
67627f3336 [ticket/11628] Change set_custom_style $template path to default to string
Rather than default to false and compare === false ? 'template/' : value just
assign this default in the arguments

PHPBB3-11628
2013-07-24 13:01:30 -05:00
Nathaniel Guse
4b761f6575 [ticket/11628] Remove third parameter ($names) from set_custom_style
This was basically duplicating functionality. $names would be used if not
empty, else array($name) would be used. Merged functionality into the first
argument

PHPBB3-11628
2013-07-24 12:56:39 -05:00
Nathaniel Guse
bfbc7aa742 [ticket/11628] Return $this from set_style, set_custom_style
PHPBB3-11628
2013-07-24 12:45:35 -05:00
Nathaniel Guse
5d1afb4532 [ticket/11628] Remove phpbb_style (move methods to phpbb_template)
PHPBB3-11628
2013-07-24 12:24:35 -05:00
Nils Adermann
7030578bbe [ticket/11698] Moving all autoloadable files to phpbb/
PHPBB3-11698
2013-07-14 01:32:34 -04:00