| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|
| |\
| | |
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/10037] Fix table in subsilver2
[ticket/10037] Apply attached patch with a few changes
|
| | |
| | |
| | |
| | | |
PHPBB3-10037
|
| | |
| | |
| | |
| | | |
PHPBB3-11700
|
|/ /
| |
| |
| | |
PHPBB3-11700
|
| |
| |
| |
| |
| |
| |
| |
| | |
This should fix some other bugs that may not have yet been recognized--some
areas only set to(), but sent according to user_notify_type, which is not
necessarily email.
PHPBB3-11454
|
| |
| |
| |
| | |
PHPBB3-10018
|
| |
| |
| |
| |
| |
| |
| | |
The phpbb_user object might be used for language variables and other
things.
PHPBB3-10018
|
| |
| |
| |
| |
| |
| |
| |
| | |
Remove the $request property from the phpbb_avatar_driver class and rather
pass it as function argument if it's needed in a function. Currently this
is only the case for the class methods prepare_form() and process_form().
PHPBB3-10018
|
| |
| |
| |
| | |
PHPBB3-10018
|
| |
| |
| |
| |
| |
| |
| |
| | |
Although get_user_avatar() is not new, the phpbb prefix was prepended. This
is due to the fact that it was entirely rewritten and is therefore more or
less a completely new function.
PHPBB3-10018
|
| |
| |
| |
| | |
PHPBB3-10018
|
| |
| |
| |
| | |
PHPBB3-10018
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
phpBB/install/database_update.php
|
| | |
| | |
| | |
| | |
| | |
| | | |
The setting is copied from "Can use signature"
PHPBB3-10679
|
| | |
| | |
| | |
| | | |
PHPBB3-10018
|
| | |
| | |
| | |
| | | |
PHPBB3-10018
|
| | |
| | |
| | |
| | | |
PHPBB3-10018
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This shouldn't be done in the avatar drivers. We need to force the
display all avatar drivers in the ACP or it won't be possible to enable
avatars after they have been disabled.
PHPBB3-10018
|
| | |
| | |
| | |
| | | |
PHPBB3-10018
|
| | |
| | |
| | |
| | | |
PHPBB3-10018
|
| | |
| | |
| | |
| | | |
PHPBB3-10018
|
| | |
| | |
| | |
| | | |
PHPBB3-10018
|
| | |
| | |
| | |
| | | |
PHPBB3-10018
|
| | |
| | |
| | |
| | | |
PHPBB3-10018
|
| | |
| | |
| | |
| | | |
PHPBB3-10018
|
| | |
| | |
| | |
| | |
| | |
| | | |
Previously this wasn't handled correctly if at all.
PHPBB3-10018
|
| | |
| | |
| | |
| | |
| | |
| | | |
Due to the changes to the avatar manager etc. these had to be updated.
PHPBB3-10018
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The name of the avatar input fields seem to have been copied from the local
avatar (gallery avatar). Since the input fields have different names in
the template files of the remote and gravatar avatars this will not
properly default to the entered values.
Additionally, the focused driver wasn't correctly filtered causing use to
always default to no avatar.
PHPBB3-10018
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The addition of "core_" that was used until now would require additional
avatar drivers (e.g. in extensions) to also include that in their class
name which would be incorrect.
PHPBB3-10018
|
| | |
| | |
| | |
| | | |
PHPBB3-10018
|
| | |
| | |
| | |
| | | |
PHPBB3-10018
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
feature/avatars
Conflicts:
phpBB/adm/style/acp_groups.html
phpBB/adm/style/acp_users_avatar.html
phpBB/includes/acp/acp_groups.php
phpBB/includes/acp/acp_users.php
phpBB/includes/functions_display.php
phpBB/install/database_update.php
phpBB/install/schemas/mssql_schema.sql
phpBB/styles/prosilver/template/ucp_avatar_options.html
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* Use full driver class name as avatar_type value
* Move avatar drivers to core namespace
* Make avatars installable through extensions
PHPBB3-10018
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* upstream/develop: (255 commits)
[ticket/10935] Limit number of PM rules per user to 5000
[ticket/10801] Fixed quickmod tools.
[ticket/9551] uncomment line and change length to 255
[ticket/10925] Clarify installation requirements for SQLite
[ticket/10938] Serve subforum listing on forumlist from template loop
[ticket/10640] Change subject length in mcp in subsilver
[ticket/10640] Change subject length in MCP
[ticket/10640] Do not change default value of truncate_string()
[ticket/10640] Change maximum subject length
[ticket/10936] remove PCRE and mbstring support check
[ticket/10936] fix language key
[ticket/10829] Delete T_STYLESHEET_NAME - no longer used.
[ticket/10829] $style_name -> $style_path in style class.
[ticket/10743] Renaming user->theme
[ticket/10743] Changing obtain_cfg_items
[ticket/10882] Fix test name - oops.
[ticket/10931] Apply strtolower() correctly, i.e. not on false.
[ticket/10931] Also test get_bytes() and get_string() with false.
[ticket/10931] Make to_numeric function globally available.
[ticket/10932] Use included composer.phar in build process
...
Conflicts:
phpBB/includes/mcp/mcp_warn.php
phpBB/install/database_update.php
phpBB/styles/prosilver/template/ucp_avatar_options.html
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10018
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10018
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10018
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10018
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Adding a cleaning function for data coming from the users/groups
tables so drivers only deal with clean data (ideally). Refactored
get_user_avatar() and get_group_avatar() to use an underlying
get_avatar() function.
PHPBB3-10018
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Updated ACP to match UCP with dropdown. Correctly determe which
avatar to focus on by checking if the form was submitted and
avatar_driver is set.
PHPBB3-10018
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Redesigning the UCP avatar page to use javascript to make use less
confusing. This design is also more easily transfered to the ACP for
group avatars, which will give better consistency in the long run.
PHPBB3-10018
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
List the avatar types more nicely, adding UCP modify user support
PHPBB3-10018
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fixing avatar deletion in the UCP and ACP, and stubbing the ACP
configuration page. I'll admit I kind of got caught carried away, so
this really should be a couple separate commits.
PHPBB3-10018
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Since it was performing two distinct operations, refactor handle_form
to separate functions that prepare and process forms.
PHPBB3-10018
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
As above, implement avatar uploads from local and remote sources in
the UCP.
PHPBB3-10018
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Implementing selection logic for gallery and remote avatars. Modified
some of the driver interfaces to make things work nicer also. Upload
functionality will be in the next commit.
PHPBB3-10018
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Various small changes based on feedback from nn-
* Renaming $php_ext to $phpEx
* Fixing copyright years
* Explain $ignore_config
* Explain Regex
* Copypasta package error
* rename get_singleton
PHPBB3-10018
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This stubs out the avatar form fields and how form processing will
occur. Form processing is not yet implemented, but shouldn't be too
hard. After this I will refactor/duplicate some of the logic for the
ACP.
PHPBB3-10018
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
A modularized avatar system that easily allows plugins to be created
for various avatar services, such as Gravatar.
This inital commit includes module support and is backwards
compatible with 3.0 avatars, but does notcontain ACP or UCP modules
for manipulating new avatars.
PHPBB3-10018
|