Merge upstream/4.0-dev into brianteeman/messages #95

richard67 · 2020-02-04T19:50:39Z

Pull Request for joomla#27096.

Summary of Changes

This PR is the complete merge of the 4.0-dev base branch into your messages branch.

To verify if this PR is correct, compare the branch of this PR (= my messages branch) with the 4.0-dev branch of the CMS. It should show only the changes from your PR (if no update in the 4.0-dev branch since I wrote this, but if so, ping me, and I update my branch to base so it is again like I said), except of the lft and rgt values in the menus table, see ATTENTION section below.

If you don't want to merge this PR because you want to do it differently, or if GitHub shows that it can't be merged due to conflicts, then update your messages branch to the base branch yourself and just pick the two joomla.sql files from this PR here and mark the conflicts as resolved, and then ping me when I shall close this PR.

ATTENTION: The lft and rgt values in the menus table are not corrected yet, this PR just solves the merge conflict. But parent_ids values are set correctly. Do you use a tool to calculate lft and rgt (Nicola uses a tool normally)? Or do you do it manually? And could you do that yourself, or shall I help with that too? Let me know if I should help, then we can correct this PR here, or you just pick the two joomla.sql files into your PR and then we correct the lft and rgt values after that in your PR.

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

* image * css * Update administrator/templates/atum/scss/vendor/bootstrap/_custom-forms.scss Co-Authored-By: Quy <quy@fluxbb.org> * Update administrator/templates/atum/scss/vendor/bootstrap/_custom-forms.scss Co-Authored-By: Quy <quy@fluxbb.org> * Update _custom-forms.scss Co-authored-by: Quy <quy@fluxbb.org> Co-authored-by: infograf768 <infografjms@gmail.com>

Now that the code has been fixed with joomla#27412 I can update the strings to be more meaningful. The strings for Screen Readers are now "Show Password" and "Hide Password"

* [4.0] Fix RTL toolbar and searchtools css see screenshots for changes Beeds an expert to check this as its not really my area * namespace * [4.0] Select dropdown RTL * Revert "[4.0] Select dropdown RTL" This reverts commit 400d79e. * revert * Update administrator/templates/atum/scss/blocks/_toolbar.scss Co-Authored-By: Quy <quy@fluxbb.org> * cs Co-authored-by: Quy <quy@fluxbb.org> Co-authored-by: infograf768 <infografjms@gmail.com>

Mobile and touch devices will load a different keyboard depending on the inputmode. This is already implemented for several fields eg url and email This PR enables it for search fields As search fields are not a separate field type but type="text" we either have to create a new field type or it has to be added via the form xml. Support for the xml option was (surprisingly) already implemented so I just had to add the inputmode=search to the xml. To test this you will need either a mobile device or a touch enabled computer with a virtual keyboard. When you enter the search field you will see a slightly different keyboard than normal - the actual layout of which is dependent on your device. On my touch screen it looks like this

* [4.0] Toggle Password Visibility - Installer The strings for Screen Readers are now "Show Password" and "Hide Password" NOTE: Before these recent PR the Text was untranslated * i cant spell Co-authored-by: Quy <quy@fluxbb.org>

…oomla#27266)

* [4.0] Language manifest After the language files were renamed the xml needs to be updated as well. (I still don't see why we have the files in here anyway but thats another topic) * i think so

Co-Authored-By: SharkyKZ <sharkykz@gmail.com> Co-Authored-By: Quy <quy@fluxbb.org> Co-authored-by: George Wilson <georgejameswilson@googlemail.com>

The title is "Release news from the Joomla! Project" but because of the positioning of the link a screen reader announces the unhelpful "the Joomla! Project". This pr moves the link to the correct place so that the screen reader will announce ""Release news"

…27284)

…ements (joomla#27351)

…omla#27439) * Fix session hash changing mid-installation * Ensure the file handler is consistent in the db Co-authored-by: infograf768 <infografjms@gmail.com>

The code to display the toggle toolbar button on a mobile view has the incorrect aria-controls value It is a simple copy paste error and fixed by this PR

Kill the descriptions as they are not needed and tweak the labels

Clarifies the title text for this link. It's not a preview as that implies it is something not generally available yet. This link is present in the top right of the admin login screen and every admin page ### Before Preview <sitename> ### After Open frontend of <sitename> in a new window.

(there may be a better way to do this but I couldnt find it) ### Before ### After

@mbabker

Thanks @mbabker for the pointer

…ation - 2nd version (joomla#27348)

When you create a custom admin menu there is the possibility to add translations for each menu item using the language override system. The actual text that will be displayed for the menu item is displayed in a read only field. This PR gives it some styling love and care

Co-authored-by: Robert Deutz <rdeutz@googlemail.com>

* Use namespaced class * Move _JEXEC check

@rolandd

My ide is telling me that it is bad to have an empty catch statement and if there is one then it should have a comment. Following the example of @rolandd @mbabker and others I added a comment Co-authored-by: Quy <quy@fluxbb.org> Co-authored-by: Robert Deutz <rdeutz@googlemail.com>

* circle * ellipsis * Revert "ellipsis" This reverts commit 8212d77 * "ellipsis" * exclamation * exclamation * bulk replace * vue * sql * scss changes for .fa { * adding .fas & .far to .fa, .fab * ran npm ci * fixed font size issue * updated -eye and -eye-slash * Revert "updated -eye and -eye-slash" This reverts commit beb3771 * change fa-css-prefix to fas issue joomla#27333 * quickicons * Update administrator/templates/atum/scss/_variables.scss revert as it refers to the icon content itself not the calling class Co-Authored-By: Quy <quy@fluxbb.org> * Revert "ran npm ci" to remove package-lock.json This reverts commit 217f924 * revert _header.scss * revert conflict * reapply fas fix * reapply fas fix for _header.scss * media folder icons * media folder icon in toolbar * open eye * open eye * Add missing fas class for quickicons * Add missing fas and fab classes to inactive tables * remove .fa and .far * remove more .fa and .far * resolve conflict * accidently removed lines * try again Co-authored-by: Quy <quy@fluxbb.org> Co-authored-by: Richard Fath <richard67@users.noreply.github.com>

* Query cleanup * Parameterized queries * Query cleanup * Parameterized queries * Parameterized queries * Parameterized queries * Parameterized queries * CS * Move columns out of list.select state

* Fix routing not working in com_banners * Update manifest * CS * Update banners.xml just doing the change to trigger a build Co-authored-by: Robert Deutz <rdeutz@googlemail.com>

This PR removes the class `Table` and `TD` from the markup in the error backtrace. Code review only needed as the class doesn't exist in the css. Or enable debug mode and then in the frontend force an error eg go to `index.php?option=com_wilson` other than the removal of the classes that will be seen in the source there will be no other change

Drone failed to clone a repository „refusing to merge unrelated histories“

brianteeman · 2020-02-04T19:56:54Z

This branch cannot be rebased due to conflicts

richard67 · 2020-02-04T19:58:09Z

How do you normally update your branches to 4.0-dev? Do you use the button on GH, or do you do it locally on your clone on your PC or laptop?

richard67 · 2020-02-04T20:00:38Z

P.S. Is not a real rebase we need to do. Is just a "merge upstream/4.0-dev into your messages branch" we have to do. After that your tool will show you that there are conflicts in the 2 joomla.sql files. Then you just pick those 2 files from this PR, then you tell your tool that conflicts are resolved and commit my 2 files. If you use GitHub Desktop I can advise more detailled.

brianteeman · 2020-02-04T20:00:53Z

Weird
Mobile says it can be merged

richard67 · 2020-02-04T20:02:21Z

Of course we can chat here too for advise and so on, so no need for glip. Only in your CMS PR I don't wanna discuss too much, in order not to blow it up.

richard67 · 2020-02-04T20:03:03Z

after that we have to fix lft and rgt

richard67 · 2020-02-04T20:04:49Z

On desktop here GitHub sais it can be merged when i compare my branch of this PR with your messages branch, and it also sais it can be merged when i compary my branch with 4.0-dev of the cms, so i think you can just merge this one. But if you wanna be safe, do it in the careful way: merge upstream/4.0-dev into your branch locally, then use my joomla.sql files.

brianteeman · 2020-02-04T20:05:31Z

wait I jjust realised that its the restyled tool i have running

brianteeman · 2020-02-04T20:08:30Z

can you just push a small change so that it can be rechecked and the now removed tool will stop preventing the merge

richard67 · 2020-02-04T20:13:20Z

Done.

brianteeman · 2020-02-04T20:13:55Z

didnt - work - it still thinks there are issues - I will do it manually.

richard67 · 2020-02-04T20:15:02Z

Ok, am available for a while. Let me know when questions or done. Don't forget, lft and rgt need to be fixed after that. You can do that, or shall we ask Nicola or whomever else?

brianteeman · 2020-02-04T20:15:59Z

merged

richard67 · 2020-02-04T20:17:29Z

Great. Don't forget lft and rgt ;-) (in ceterum censio ... )

brianteeman and others added 30 commits January 6, 2020 23:29

[4.0] MOD_LATESTACTION strings (joomla#27423)

7cc8864

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

[4.0] Move Searchtools styling to template (joomla#27416)

5d03525

[com_categories] - convert to prepared statement (joomla#27205)

1557ec2

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

[4.0] Site Modules language alphasort (joomla#27424)

698d113

[4.0] Admin Modules language alphasort (joomla#27421)

9b967b9

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

[4.0] Password view toggle fixes (joomla#27412)

decc9f1

Load webcomponents with asset manager (joomla#27418)

5964578

[4.0] Toggle Password Visibility (joomla#27425)

00c613e

Now that the code has been fixed with joomla#27412 I can update the strings to be more meaningful. The strings for Screen Readers are now "Show Password" and "Hide Password"

Fix switcher and validate asset to be overridable (joomla#27417)

cae0a2d

[4.0] [RTL] [Cassiopea] Correcting article info and logo/description (j…

c80de1d

…oomla#27266)

[4.0] com_media toolbar buttons (joomla#27251)

22ab629

[4.0] Language manifest (joomla#27430)

1472eba

* [4.0] Language manifest After the language files were renamed the xml needs to be updated as well. (I still don't see why we have the files in here anyway but thats another topic) * i think so

[4.0][com_fields] convert to prepared sql (joomla#25657)

08d91bd

Co-Authored-By: SharkyKZ <sharkykz@gmail.com> Co-Authored-By: Quy <quy@fluxbb.org> Co-authored-by: George Wilson <georgejameswilson@googlemail.com>

[4.0] [com_config] Fix when saving configuration in frontend (joomla#…

d3cf0cb

…27284)

[4.0] TLS encryption for database connections: Corrections and enhanc…

9c5e876

…ements (joomla#27351)

J Installation: loss of session when getting to the "remove" view (jo…

2924002

…omla#27439) * Fix session hash changing mid-installation * Ensure the file handler is consistent in the db Co-authored-by: infograf768 <infografjms@gmail.com>

[4.0] Aria-controls [a11y] (joomla#27454)

03f9059

The code to display the toggle toolbar button on a mobile view has the incorrect aria-controls value It is a simple copy paste error and fixed by this PR

[4.0] Action Log options (joomla#27457)

e0bf41b

Kill the descriptions as they are not needed and tweak the labels

[4.0] TinyMCE builder pluigin (joomla#27466)

e52d662

(there may be a better way to do this but I couldnt find it) ### Before ### After

[4.0] Searchtools mobile display (joomla#27443)

0b41a3d

Fix namespace

af56631

Make the session name a bit more unique between sites

7afd673

Thanks @mbabker for the pointer

[4.0] Add TLS transfer encryption for database connections at install…

889ddfc

…ation - 2nd version (joomla#27348)

SharkyKZ and others added 11 commits February 3, 2020 22:27

Bump deprecation to 5.0 (joomla#27719)

36361d7

Co-authored-by: Robert Deutz <rdeutz@googlemail.com>

[4.0] [plg_fields_subfields] Use namespaced class (joomla#27718)

a37e8f5

* Use namespaced class * Move _JEXEC check

Routing not working in com_contact (joomla#27693)

36f9c01

[4.0] Backend articles model parameterized queries (joomla#27689)

cf9f0fd

* Query cleanup * Parameterized queries * Query cleanup * Parameterized queries * Parameterized queries * Parameterized queries * Parameterized queries * CS * Move columns out of list.select state

[4.0] Routing not working in com_banners (joomla#27703)

7a0cf7f

* Fix routing not working in com_banners * Update manifest * CS * Update banners.xml just doing the change to trigger a build Co-authored-by: Robert Deutz <rdeutz@googlemail.com>

Ensure array keys are reset for any values removed (joomla#27797)

9638a22

removed the depth limit because

9d0b9f6

Drone failed to clone a repository „refusing to merge unrelated histories“

Merge remote-tracking branch 'upstream/4.0-dev' into messages

96ef0a1

richard67 mentioned this pull request Feb 4, 2020

[4.0] Move Private Messages to Users joomla/joomla-cms#27096

Merged

richard67 added 2 commits February 4, 2020 21:11

Dummy change to be removed later

a95058e

Undo dummy change

505c8c9

brianteeman merged commit 505c8c9 into brianteeman:messages Feb 4, 2020

richard67 deleted the messages branch February 4, 2020 20:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge upstream/4.0-dev into brianteeman/messages #95

Merge upstream/4.0-dev into brianteeman/messages #95

richard67 commented Feb 4, 2020 •

edited

Loading

brianteeman commented Feb 4, 2020

richard67 commented Feb 4, 2020 •

edited

Loading

richard67 commented Feb 4, 2020

brianteeman commented Feb 4, 2020

richard67 commented Feb 4, 2020

richard67 commented Feb 4, 2020

richard67 commented Feb 4, 2020

brianteeman commented Feb 4, 2020

brianteeman commented Feb 4, 2020

richard67 commented Feb 4, 2020

brianteeman commented Feb 4, 2020

richard67 commented Feb 4, 2020

brianteeman commented Feb 4, 2020

richard67 commented Feb 4, 2020

Merge upstream/4.0-dev into brianteeman/messages #95

Merge upstream/4.0-dev into brianteeman/messages #95

Conversation

richard67 commented Feb 4, 2020 • edited Loading

Summary of Changes

brianteeman commented Feb 4, 2020

richard67 commented Feb 4, 2020 • edited Loading

richard67 commented Feb 4, 2020

brianteeman commented Feb 4, 2020

richard67 commented Feb 4, 2020

richard67 commented Feb 4, 2020

richard67 commented Feb 4, 2020

brianteeman commented Feb 4, 2020

brianteeman commented Feb 4, 2020

richard67 commented Feb 4, 2020

brianteeman commented Feb 4, 2020

richard67 commented Feb 4, 2020

brianteeman commented Feb 4, 2020

richard67 commented Feb 4, 2020

richard67 commented Feb 4, 2020 •

edited

Loading

richard67 commented Feb 4, 2020 •

edited

Loading