Skip to content
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

Update dev #10

Merged
merged 112 commits into from Jun 23, 2021
Merged

Update dev #10

merged 112 commits into from Jun 23, 2021

Conversation

bembelimen
Copy link
Contributor

Pull Request for Issue # .

Summary of Changes

Testing Instructions

Actual result BEFORE applying this Pull Request

Expected result AFTER applying this Pull Request

Documentation Changes Required

richard67 and others added 30 commits May 3, 2021 17:06
* Update download URL of composer for appveyor

* Fix file name in bat file, too
Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
Co-authored-by: Nicola Galgano <optimus4joomla@gmail.com>
* Fix composer github errors

* Update composer.json

Co-authored-by: Quy <quy@fluxbb.org>
* Added backported phpmailer to CMS repo

* remove static files

* revert array_values change

* added no-api flag to work around api limits

* update autoloader files

* update to latest version of backports

Co-authored-by: Harald Leithner <leithner@itronic.at>
* Smart Search: Fix indexing for Postgres

* Update administrator/components/com_finder/helpers/indexer/driver/postgresql.php

* Fixing indexing and searching of finder in Postgres

* Fixing suggestions query for Postgres

* Fixing unserialize() in Smart Search for Postgres

Co-authored-by: Quy <quy@fluxbb.org>
… (#32937)

* Make sure we follow the inline php cs rules for template files

* Update administrator/components/com_joomlaupdate/views/default/tmpl/default_preupdatecheck.php

Co-authored-by: Quy <quy@fluxbb.org>

* Update administrator/components/com_joomlaupdate/views/default/tmpl/default_preupdatecheck.php

Co-authored-by: Quy <quy@fluxbb.org>

* Update administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php

Co-authored-by: Quy <quy@fluxbb.org>

* Update administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php

Co-authored-by: Quy <quy@fluxbb.org>

* Update administrator/components/com_joomlaupdate/views/default/tmpl/default_preupdatecheck.php

Co-authored-by: Quy <quy@fluxbb.org>

* Update administrator/components/com_joomlaupdate/views/default/tmpl/default_preupdatecheck.php

Co-authored-by: Quy <quy@fluxbb.org>

* Update administrator/components/com_joomlaupdate/views/default/tmpl/default_preupdatecheck.php

Co-authored-by: Quy <quy@fluxbb.org>

* Update administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php

Co-authored-by: Quy <quy@fluxbb.org>

* Update administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php

Co-authored-by: Quy <quy@fluxbb.org>

* Apply suggestions from code review

* Apply suggestions from code review

* Remove space

Co-authored-by: Quy <quy@fluxbb.org>
Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
Co-authored-by: Brian Teeman <brian@teeman.net>
Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
Co-authored-by: Phil E. Taylor <phil@phil-taylor.com>
Co-authored-by: Harald Leithner <leithner@itronic.at>
Co-authored-by: Quy <quy@fluxbb.org>
Signed-off-by: Harald Leithner <leithner@itronic.at>
# Conflicts:
#	administrator/language/en-GB/en-GB.xml
#	administrator/language/en-GB/install.xml
#	administrator/manifests/files/joomla.xml
#	administrator/manifests/packages/pkg_en-GB.xml
#	installation/language/en-GB/en-GB.xml
#	language/en-GB/en-GB.xml
#	language/en-GB/install.xml
#	libraries/src/Version.php
* add getItemsCount function to return msg count

* define messagesCount in post install module

* replace messages with messagesCount in tmpl

* Fix badge count

* Update administrator/components/com_postinstall/src/Model/MessagesModel.php

Co-authored-by: Phil E. Taylor <phil@phil-taylor.com>

* Update administrator/components/com_postinstall/src/Model/MessagesModel.php

Co-authored-by: Quy <quy@fluxbb.org>

* set enabled filter to always 1

* conflict fix

Co-authored-by: Phil E. Taylor <phil@phil-taylor.com>
Co-authored-by: Quy <quy@fluxbb.org>
* [4.0] Expand all

Following the styleguide https://developer.joomla.org/en-gb-user-interface-text-guidelines/capitalisation.html this should be Expand All

* collapse
Fix obvious error in the code so that the sidebar is hidden when you create a new or edit an existing privacy request.
A string is attempted to be loaded to be used in the javascript of the plg_installer_urlinstaller

The string does not exist in the language file
The string is not called in the javascript

This PR removes the reference to the string

code review
This scss file only had one class and as the exact same class is already in BS5 (_tables.scss) there is no need for it
The drag and drop plugin for tinymce uses anon-existent language constant (JERROR)  it should be ERROR

To test enable the language debug in global configuration and navigate to any page that uses tinymce. In the list of untranslated strings you will see JERROR

Apply the PR and run npm ci
the error has gone
When this css was added the table headers of the template were not bold. Since they are now we don't need this extra css file.

Note that th in the header is still font-weight: 700 but the th in the body will be 500 - this is consistent with all other tables now.
This scss file only had one class and as the exact same class is already in BS5 (_tables.scss) there is no need for it

Co-authored-by: George Wilson <georgejameswilson@googlemail.com>
wilsonge and others added 25 commits June 14, 2021 08:11
Fix copyright date from Merge commit 'f1f10a2' into 4.0-dev
* Fix form validation error

* Thanks :)

Co-authored-by: Dimitris Grammatikogiannis <dg@dgrammatiko.dev>

* Fix typo

Co-authored-by: Dimitris Grammatikogiannis <dg@dgrammatiko.dev>
* Smart Search: Fix inserting tokens to DB

* Update administrator/components/com_finder/src/Indexer/Indexer.php

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
PR for #33860

This file is not used anywhere
It is User Actions Log not Actionlogs
Sync the string from admin to api
Add the string to site

Change all to match the style guide.

PR for #34543
Use font-weight: 500 for table headers
You can sort by clicking on the column headings but the ability to sort by selecting the Current Stage ot Target stage in the dropdown was missing
# Conflicts:
#	libraries/src/Version.php
#	modules/mod_breadcrumbs/tmpl/default.php
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet