| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| | |
* prototech/ticket/11890:
[ticket/11890] Fix untranslated string when deleting posts through MCP.
|
| |
| |
| |
| | |
PHPBB3-11890
|
|/
|
|
| |
PHPBB3-11892
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* remotes/upstream/develop-olympus:
[ticket/11829] Use report_closed to determine status in MCP report_details
Conflicts:
phpBB/styles/prosilver/template/mcp_post.html
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Instead of using post_reported of the post or message_reported of the pm, use
report_closed of the report itself to reliably determine whether this
particular report is closed or not in the report_details view of the MCP.
This fixes a bug where the report_details view would not show that the report
shown was closed and display a "Close report" button that had no effect.
PHPBB3-11829
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/11775] Fix doc blocks syntax
[ticket/11775] Remove spaces at line ends
[ticket/11775] Split test into multiple steps
[ticket/11775] Add functional test for moving the last post
[ticket/11775] Backport moving of the posting functions to 3.0
[ticket/11775] Fix error when moving the last post to another topic
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
|
| | |
| | |
| | |
| | | |
PHPBB3-11775
|
| | |
| | |
| | |
| | | |
PHPBB3-11774
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* brunoais/ticket/11642:
[ticket/11642] Use $parse_flags
[ticket/11642] Fixed typo in the variable name.
[ticket/11642] generate_text_for_display on mcp/mcp_post.php
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11642
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11642
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11642
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* brunoais/ticket/11643:
[ticket/11643] Use $parse_flags
[ticket/11643] Fixed typo in the variable name.
[ticket/11643] generate_text_for_display on mcp/mcp_queue.php
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11643
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11643
|
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11643
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* brunoais/ticket/11641:
[ticket/11641] Use $parse_flags
[ticket/11641] generate_text_for_display on mcp/mcp_pm_reports.php
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11641
|
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11641
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* brunoais/ticket/11653:
[ticket/11653] Use $parse_flags
[ticket/11653] generate_text_for_display on mcp/mcp_topic.php
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11653
|
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11653
|
| |\ \ \
| | | | |
| | | | | |
[ticket/11654] generate_text_for_display on mcp/mcp_warn.php
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11654
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11654
|
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11654
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-11700
|
|/ / /
| | |
| | |
| | | |
PHPBB3-11700
|
| | |
| | |
| | |
| | | |
PHPBB3-9657
|
| | |
| | |
| | |
| | | |
PHPBB3-9657
|
| | |
| | |
| | |
| | | |
PHPBB3-9657
|
| | |
| | |
| | |
| | | |
PHPBB3-9657
|
| | |
| | |
| | |
| | | |
PHPBB3-9657
|
| | |
| | |
| | |
| | | |
PHPBB3-9657
|
| | |
| | |
| | |
| | | |
PHPBB3-9657
|
| | |
| | |
| | |
| | | |
PHPBB3-9657
|
| | |
| | |
| | |
| | | |
PHPBB3-9657
|
| | |
| | |
| | |
| | | |
PHPBB3-9657
|
| | |
| | |
| | |
| | | |
PHPBB3-9657
|
| | |
| | |
| | |
| | | |
PHPBB3-9657
|
| | |
| | |
| | |
| | | |
PHPBB3-9657
|
| | |
| | |
| | |
| | | |
PHPBB3-9657
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3: (234 commits)
[ticket/11398] Correctly call permission_set method in permission tool
[ticket/11394] Relax Migration Tools
[ticket/11386] Fix missing ;
[ticket/10714] Get log from container in install, update and download/file
[feature/avatars] Update module_auth of ucp module and fix small issues
[ticket/11396] Rename insert_migration to set_migration_state
[ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
[ticket/11393] Give more information on database updater
[ticket/11386] Send list of migrations instead of using load_migrations
[feature/avatars] Add migrations data file for avatars
[feature/avatars] Reduce module auth of ucp avatar settings
[ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/
[ticket/10714] Logs are disabled for this page call only
[ticket/10411] Fix call to function on non-object $db->...()
[ticket/10411] Remove ajax delete, so the page is refreshed
[feature/avatars] Auto-clear avatar dimensions when first changing avatars
[ticket/10411] Update schema file with new table and remove the column
[ticket/10411] Add unit tests for move() with values >1
[ticket/10411] Add migrations file for teampage table
[ticket/10411] Revert database_update.php changes from for easier update
...
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
phpBB/install/database_update.php
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
phpBB/config/services.yml
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| |\ \ \ \ |
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* develop: (201 commits)
[feature/new-tz-handling] Don't use global user but make it a parameter
[feature/new-tz-handling] Fix size of suggestion button in chrome
[feature/new-tz-handling] Fall back to UTC, if the timezone is invalid
[feature/new-tz-handling] Add previous selected value to validation if valid
[feature/new-tz-handling] Display suggestion when a different value is selected
[ticket/10998] Add border-radius to forum rules block - prosilver
[feature/new-tz-handling] Remove additional marking of selected items
[feature/new-tz-handling] Move update helper function to new class
[feature/new-tz-handling] Fix unit test
[feature/new-tz-handling] Delete old variable which is not used anymore
[feature/new-tz-handling] Rename $user->tz back to $user->timezone
[feature/pagination-as-list] New parameter for name of start var
[feature/pagination-as-list] Updates for nils comments
[feature/pagination-as-list] Rename and deprecate functions
[feature/pagination-as-list] Various fixes and improvements
[ticket/10968] Render pagination within the template
[feature/new-tz-handling] Remove "timezone might be numeric"
[feature/new-tz-handling] Add function to update the timezone
[feature/new-tz-handling] Correctly update user and board timezones on update
[ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
...
|