forked from joomla/joomla-cms
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[4.2] Improvements for the build/deleted_file_check.php script #30
Closed
richard67
wants to merge
225
commits into
4.2-dev
from
4.2-dev-deleted-file-check-improvements-2022-06
Closed
[4.2] Improvements for the build/deleted_file_check.php script #30
richard67
wants to merge
225
commits into
4.2-dev
from
4.2-dev-deleted-file-check-improvements-2022-06
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Jun 28, 2022
5dfc864
to
a5c294f
Compare
a5c294f
to
245da4e
Compare
245da4e
to
1bfbf0e
Compare
Updating 4.3-dev with changes from 4.2-dev
…ents models (joomla#38090) * Replace Factory::getUser() by $this->getCurrentUser()
1bfbf0e
to
e4d1ed0
Compare
# Conflicts: # administrator/language/en-GB/install.xml # administrator/language/en-GB/langmetadata.xml # administrator/manifests/files/joomla.xml # administrator/manifests/packages/pkg_en-GB.xml # api/language/en-GB/install.xml # api/language/en-GB/langmetadata.xml # installation/language/en-GB/langmetadata.xml # language/en-GB/install.xml # language/en-GB/langmetadata.xml # libraries/src/Version.php
Merge branch 4.2 into 4.3
e4d1ed0
to
903c5d4
Compare
903c5d4
to
581f307
Compare
# Conflicts: # .gitignore # administrator/language/en-GB/install.xml # administrator/language/en-GB/langmetadata.xml # administrator/manifests/files/joomla.xml # administrator/manifests/packages/pkg_en-GB.xml # api/language/en-GB/install.xml # api/language/en-GB/langmetadata.xml # installation/language/en-GB/langmetadata.xml # language/en-GB/install.xml # language/en-GB/langmetadata.xml # libraries/src/Version.php
Upmerge 2022 09 03
Updating 4.3-dev with changes from 4.2-dev
Updating 4.3-dev with changes from 4.2-dev
# Conflicts: # administrator/components/com_admin/script.php # administrator/components/com_categories/src/Model/CategoryModel.php # administrator/components/com_config/src/Model/ApplicationModel.php # administrator/components/com_config/src/Model/ComponentModel.php # administrator/components/com_fields/src/Model/FieldModel.php # administrator/components/com_fields/src/Model/GroupModel.php # administrator/components/com_finder/src/Indexer/Query.php # administrator/components/com_finder/src/Service/HTML/Filter.php # administrator/components/com_finder/src/Service/HTML/Query.php # administrator/components/com_joomlaupdate/src/Model/UpdateModel.php # administrator/components/com_languages/src/Model/StringsModel.php # administrator/components/com_menus/tmpl/items/modal.php # administrator/components/com_tags/src/Table/TagTable.php # administrator/components/com_users/src/Model/LevelsModel.php # administrator/components/com_users/src/Model/MailModel.php # administrator/components/com_users/src/Model/UserModel.php # administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php # components/com_config/src/Controller/ConfigController.php # components/com_content/src/Model/ArchiveModel.php # components/com_finder/src/Controller/SuggestionsController.php # components/com_tags/src/Model/TagModel.php # components/com_tags/src/Service/Router.php # components/com_tags/src/View/Tag/FeedView.php # components/com_tags/src/View/Tag/HtmlView.php # components/com_users/src/Controller/ProfileController.php # components/com_users/src/Controller/UserController.php # composer.lock # installation/src/Model/SetupModel.php # layouts/joomla/form/field/text.php # libraries/namespacemap.php # libraries/src/Component/Router/Rules/NomenuRules.php # libraries/src/Form/Field/TextField.php # libraries/src/Helper/ModuleHelper.php # libraries/src/MVC/Model/ListModel.php # libraries/src/Object/CMSObject.php # libraries/src/Table/ContentType.php # plugins/authentication/cookie/src/Extension/Cookie.php # plugins/behaviour/versionable/src/Extension/Versionable.php # plugins/editors/tinymce/src/Field/TinymcebuilderField.php # plugins/extension/namespacemap/src/Extension/NamespaceMap.php # plugins/quickicon/extensionupdate/src/Extension/Extensionupdate.php # plugins/quickicon/overridecheck/src/Extension/OverrideCheck.php # plugins/quickicon/privacycheck/privacycheck.php # plugins/user/joomla/joomla.php
re-introduce template support
elseif
8004bc0
to
f062059
Compare
f062059
to
219f7e6
Compare
Replaced by #33 . |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR here is just for me for preparing my real PR to the CMS repo.
Summary of Changes
with respect to excluded folders.
These lists can be used to check if files or folders should be removed from the lists of stuff to be deleted because the files or folders have been added back again by the new release.
Testing Instructions
Will be added.
Actual result BEFORE applying this Pull Request
Will be added.
Expected result AFTER applying this Pull Request
Will be added.
Documentation Changes Required
None.