1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

16544 Commits

Author SHA1 Message Date
Nils Adermann
9d8ac2b0ce [ticket/11700] Fix unit tests after develop merge
PHPBB3-11700
2013-09-17 17:12:41 +02:00
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
Nils Adermann
13ba981fc3 [ticket/11700] Add back accidently deleted file in cache dir
PHPBB3-11700
2013-09-17 16:18:04 +02:00
Nils Adermann
c4b53490ad [ticket/11700] Correctly load extensions with nonprefixed namespaces
PHPBB3-11700
2013-09-17 16:15:44 +02:00
Joas Schilling
6ba2fb6d62 Merge remote-tracking branch 'EXreaction/ticket/11832' into develop
* EXreaction/ticket/11832:
  [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)
2013-09-16 21:33:52 +02:00
Nils Adermann
d12f358855 [ticket/11700] Correctly convert old acm type to namespaced class name
PHPBB3-11700
2013-09-16 17:33:56 +02:00
Nils Adermann
77ffd5c6ba [ticket/11700] Use underscores in avatar driver template file names
PHPBB3-11700
2013-09-16 06:44:16 +02:00
Nils Adermann
570b83b046 [ticket/11700] namespacify phpbb_permissions class
PHPBB3-11700
2013-09-16 06:30:50 +02:00
Nils Adermann
3634ff14a0 [ticket/11700] Correct service definitions with namespaces
PHPBB3-11700
2013-09-16 06:16:53 +02:00
Nils Adermann
6e6681fa59 [ticket/11700] Load avatar explanations correctly from namespaces
PHPBB3-11700
2013-09-16 05:58:40 +02:00
Nils Adermann
fcd36ddd1f [ticket/11700] Correctly generate lang key from avatar driver class
PHPBB3-11700
2013-09-16 05:36:21 +02:00
Nils Adermann
d905358e2b [ticket/11700] Fix leftover backslashes in comments
PHPBB3-11700
2013-09-16 05:20:27 +02:00
Nils Adermann
390dc86344 [ticket/11700] And some last comments with backslashes
PHPBB3-11700
2013-09-16 05:00:18 +02:00
Nils Adermann
d626ebaf1e [ticket/11700] Fix a few more comments
PHPBB3-11700
2013-09-16 04:45:58 +02:00
Nils Adermann
acea8f5c0a [ticket/11700] The word "them" in a comment is not a class
PHPBB3-11700
2013-09-16 03:51:42 +02:00
Nils Adermann
3860b37741 [ticket/11700] Actually "one" in comments is not a class
PHPBB3-11700
2013-09-16 03:50:47 +02:00
Nils Adermann
1fa673bded [ticket/11700] Fix authentication acp after develop merge
PHPBB3-11700
2013-09-16 03:22:13 +02:00
Nils Adermann
09cfa01d58 [ticket/11700] Fix installation after develop merge
PHPBB3-11700
2013-09-16 03:14:39 +02:00
Nils Adermann
2472271bc0 [ticket/11700] Fix tests after merging new develop code
PHPBB3-11700
2013-09-16 02:41:03 +02: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
d297eb4aec [ticket/11700] Get the installer to run with namespaces
PHPBB3-11700
2013-09-16 00:41:38 +02:00
Nils Adermann
dc2f4a3663 [ticket/11700] Avoid \t in double quoted strings for template code
PHPBB3-11700
2013-09-16 00:39:38 +02:00
Nils Adermann
2a1207b14f [ticket/11700] Correclty use namespaces in notifications
PHPBB3-11700
2013-09-16 00:39:34 +02:00
Nils Adermann
ee735685ac [ticket/11700] Fix number class names in 3.0.x migrations
PHPBB3-11700
2013-09-16 00:29:04 +02:00
Nils Adermann
e1239b455f [ticket/11700] Namespaces and class names should not start with digits
PHPBB3-11700
2013-09-16 00:29:00 +02:00
Nils Adermann
b95fdacdd3 [ticket/11700] Move all recent code to namespaces
PHPBB3-11700
2013-09-16 00:25:27 +02:00
Nils Adermann
196e1813cd [ticket/11700] Add develop scripts to use namespaces and rename interfaces
PHPBB3-11700
2013-09-16 00:25:21 +02:00
Nathan Guse
8e02f9bd7d [ticket/11832] Correct ROOT_PATH variable
PHPBB3-11832
2013-09-15 16:44:09 -05:00
Nathan Guse
9e8babbf6e [ticket/11832] get_url() from phpbb_template_asset should return web path
PHPBB3-11832
2013-09-15 16:42:02 -05:00
Dhruv
a3b0590f68 [ticket/11735] Display disabled checkbox in subsilver for read notifications
PHPBB3-11735
2013-09-16 00:34:22 +05:30
Vjacheslav Trushkin
7c5675942b [ticket/11846] Replace empty p with margin-top
PHPBB3-11846
2013-09-15 21:22:06 +03:00
Dhruv
41282c5065 [ticket/11735] Display disabled checkbox when notification is already read
PHPBB3-11735
2013-09-15 20:29:45 +05:30
Dhruv
6ce5a72c55 Merge remote-tracking branch 'Prosk8er/ticket/11844' into develop
# By Prosk8er
# Via Prosk8er
* Prosk8er/ticket/11844:
  [ticket/11844] update acp/authentication language var
2013-09-15 11:18:01 +05:30
Prosk8er
30a26f23a4 [ticket/11844] update acp/authentication language var
the language var ACP_AUTH_SETTINGS_EXPLAIN in language/en/acp/board.php

PHPBB3-11844
2013-09-14 15:28:04 -04:00
Vjacheslav Trushkin
d27bc857f3 [ticket/11795] Remove PM popup
PHPBB3-11795
2013-09-14 10:10:45 +03:00
Vjacheslav Trushkin
973f4bc887 [ticket/11795] Remove outdated comment from forum_fn.js
This comment is no longer relevant because function was rewritten

PHPBB3-11795
2013-09-14 10:10:44 +03:00
Vjacheslav Trushkin
e6d87c5bc0 [ticket/11795] Move find user JS to forum_fn
Move JavaScript from user search results to forum_fn.js

PHPBB3-11795
2013-09-14 10:10:44 +03:00
Vjacheslav Trushkin
0a9ba5415c [ticket/11795] Replace TWIG with phpBB syntax in ACP
PHPBB3-11795
2013-09-14 10:10:44 +03:00
Vjacheslav Trushkin
4b27ec441a [ticket/11795] Move MSN scripts to forum_fn.js
Move MSN scripts to forum_fn.js
Rewrite MSN scripts to remove duplicate code

PHPBB3-11795
2013-09-14 10:10:44 +03:00
Vjacheslav Trushkin
e4874c180a [ticket/11795] Use phpBB template syntax instead of TWIG
PHPBB3-11795
2013-09-14 10:10:44 +03:00
Vjacheslav Trushkin
22c8df5403 [ticket/11795] Move PM popup JS to forum_fn.js
Move PM popup JavaScript from overall_header to forum_fn.js
Use TWIG to escape PM popup URL

PHPBB3-11795
2013-09-14 10:10:43 +03:00
Vjacheslav Trushkin
4c2aad4ca9 [ticket/11795] Get rid of pagination JS variables
Move pagination variables to data attributes
Replace A_BASE_URL with BASE_URL and use TWIG to escape it

PHPBB3-11795
2013-09-14 10:10:43 +03:00
Vjacheslav Trushkin
253890520d [ticket/11795] Get rid of onload_functions
Get rid of onload_functions and onunload_functions
Scripts should use $(document).ready() instead

PHPBB-11795
2013-09-14 10:10:42 +03:00
Vjacheslav Trushkin
a92a3cfeb9 [ticket/11795] Use data-reset-on-edit attr to reset elements
Use data-reset-on-edit attribute to reset other inputs
when editing input with data.

Do not unbind event (old code unbound it after one use for
no reason)

PHPBB3-11795
2013-09-14 10:10:42 +03:00
Vjacheslav Trushkin
605cd0cafb [ticket/11795] Redo form elements auto-focus
Use data-focus attribute for forms to focus elements
when document is loaded instead of adding JavaScript

PHPBB3-11795
2013-09-14 10:10:42 +03:00
Nathan Guse
235e3f5595 Merge pull request #1710 from Hardolaf/ticket/11837
[ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED
2013-09-13 15:18:38 -07:00
Vjacheslav Trushkin
f3bbca4fa0 Merge branch 'ticket/11811' into ticket/develop-2/11811
* ticket/11811:
  [ticket/11811] Remove outline on :focus

Conflicts:
	phpBB/adm/style/admin.css
	phpBB/styles/prosilver/theme/forms.css
2013-09-14 00:19:48 +03:00
Nathan Guse
b8bb16f8e7 Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
* remotes/upstream/develop-olympus:
  [ticket/11831] getAttribute was replaced with attr
  [ticket/11831] Update fabpot/goutte to 1.0.*

Conflicts:
	phpBB/composer.lock
2013-09-13 15:56:28 -05:00
Vjacheslav Trushkin
3cd445d055 [ticket/11811] Remove outline on :focus
PHPBB3-11811
2013-09-13 23:41:07 +03:00
Joseph Warner
c8bd2288d1 [ticket/11836] Fix subsilver fatal error
PHPBB3-11836
2013-09-13 16:34:52 -04:00