Skip to content

[4.0] 3.9.7 and 3.9.8 merge#26101

Merged
wilsonge merged 59 commits intojoomla:4.0-devfrom
wilsonge:398-merge
Aug 31, 2019
Merged

[4.0] 3.9.7 and 3.9.8 merge#26101
wilsonge merged 59 commits intojoomla:4.0-devfrom
wilsonge:398-merge

Conversation

@wilsonge
Copy link
Copy Markdown
Contributor

@wilsonge wilsonge commented Aug 31, 2019 •
edited
Loading

  • Merge with a merge commit
  • Also fixes the stub generator because I deleted my joomla local repo when i was on holiday and needed to regenerate it
  • Instead of upgrading to the latest of Tiny 4 upgraded to the latest of Tiny 5

HLeithner and others added 30 commits May 6, 2019 22:59
@HLeithner
Reset to dev
0946ccb
@hardik-codes @SniperSister
Add label tag to com_search search field (joomla#24482)
1dfc4d8 
* Added label tag to com_search search field

Co-Authored-By: hardik-codes <hardik06agarwal@gmail.com>
@infograf768 @SniperSister
RTL Text align right for select Modules list (joomla#24722)
9b7ff76
@alikon @SniperSister
Remove ordering column from con_content history watcher (joomla#24731)
14edbc9
@J0WI @HLeithner
Add PHP 7.2 and 7.3 to AppVeyor (joomla#24512)
dc7c6f6
@J0WI @SniperSister
Reorganize Travis PHP environment variables (joomla#24510)
1f3fcc5
Updated fa-IR installation language files
d933837
@okonomiyaki3000 @HLeithner
Make media field initialize itself when a new subform row is added (j…
2fc9049 
…oomla#20230)
@OctavianC @HLeithner
Check if the correct layout is used (joomla#19485)
91ebd57
@alikon @HLeithner
use the index for session table (joomla#23650)
1c5551a
@HLeithner
Revise Blog Data to Reflect the No. of Links to 2 (joomla#19357)
5edb605 
* Revise Blog Data to Reflect the No. of Links to 2

* Update postgresql sample_blog

* Update sqlazure sample_blog

* Update text
@n9iels @HLeithner
Add mandatory fourth argument for the onContentBeforeDisplay and onCo…
4d7afdc 
…ntentAfterDisplay events (joomla#17133)
@SharkyKZ @HLeithner
Revert joomla#19977: Plugins field behavior (joomla#20293)
3faf9a7
@okonomiyaki3000 @HLeithner
Make squeezebox initialize itself when a new subform row is added (jo…
b12056e 
…omla#20232)
@kofaysi @SniperSister
Update to default.php: removed nowrap class to allow wrapping title… (j…
f6efc5a 
…oomla#24712)
@alikon @HLeithner
batch copy permission on module (joomla#24737)
c8d1f4f
@alikon @HLeithner
copy rules too (joomla#24730)
91d6dba
@SharkyKZ @HLeithner
Fix 0 value in range field (joomla#24939)
7a4f97f
@tgv604 @HLeithner
The fix for Joomla progressive cache causing multiple duplicate javas…
014bf30 
…cript declarations (joomla#20310)
@Hackwar @HLeithner
Cleaning up drone.yml (joomla#24960)
4b13a4c
@okonomiyaki3000 @HLeithner
Subforms within subform rows will initialize themselves when new rows…
f7dd5eb 
… are added. (joomla#24919)
@infograf768 @HLeithner
Customizing Tags placeholder select field (joomla#24963)
1cc5425
@zero-24 @SniperSister
Move SECURITY.md to the .github folder (joomla#24994)
654cc87
@wojsmol @zero-24
remove SECURITY.md from $doNotPackage array (joomla#24995)
aa8fdeb
@alikon @HLeithner
com_fields vs cli finder indexer (joomla#24630)
9c2f288
@okonomiyaki3000 @HLeithner
Make user field initialize itself when a new subform row is added (jo…
37d3df8 
…omla#20231)
@alikon @HLeithner
Custom Fields - no duplicate fields (joomla#24516)
1b47638
@HLeithner
Changed the default value to type double (joomla#24971)
f5cc764
@ReLater @wilsonge
Code style. Remove space. (joomla#25079)
71266bd
@infograf768 @HLeithner
[3.x] RTL: adapting display of Joomla versions (joomla#23107)
6af8343
AndySDH and others added 19 commits June 5, 2019 17:37
@AndySDH @HLeithner
Fixing a mistake made with PR joomla#24397 + fixing setting descripti…
690cf18 
…on for clarity (joomla#25062)

* Undoing PR joomla#24397 which was a mistake

The PR was adding a check to display the custom field on the frontend based on a parameter that was meant to be a check for the edit form
@HLeithner
Tinymce doesn't need remove the images basepath (joomla#25037)
d6439d5
@brianteeman @HLeithner
[staging] Remove chosen from com_tags (joomla#24627)
93dbe71 
Chosen is not accessible so we shouldnt use it unless it offers something useful.

In the tags component in the front end it is used for display #

This doesnt require or benefit from chosen so this simple PR returns it to regular and accessible list
@softarius @HLeithner
Pg schema (joomla#24999)
4db621f
@brianteeman @HLeithner
[staging] Update TinyMCE (joomla#24978)
1777496 
This PR updates tinymce to version 4.5.11 - this is the highest version we can include in Joomla 3 due to browser support

Version 4.5.11 (2019-05-16)
  Fixed bug where the editor would scroll to the top of the editable area if a dialog was closed in inline mode. #TINY-1073
Version 4.5.10 (2018-10-19)
  Changed the contextual toolbar shortcut to Ctrl+F9 since an Edge shortcut interfered with the previous one.

Updated references to website and company name

* Update plugins/editors/tinymce/tinymce.xml

Co-Authored-By: Quy <quy@fluxbb.org>
@Fedik @HLeithner
Move a subform template out of the form scope, for IE compatibility. (j…
6a4c879 
…oomla#24947)
@asika32764 @HLeithner
If plugins return false when login, should mark as failure. (joomla#2…
f60f63a 
…2936)
@HLeithner
Document loadmoduleid in plugin description (joomla#25076)
fb088b2
@HLeithner
Prepare 3.9.7-rc
83c87ac 
Signed-off-by: Harald Leithner <leithner@itronic.at>
@HLeithner
Reset to dev
e59426f 
Signed-off-by: Harald Leithner <leithner@itronic.at>
@brianteeman @HLeithner
Update SECURITY.md (joomla#25138)
ae5c879 
Minor changes to the English, mainly to remove two identical sentences
@SharkyKZ @SniperSister
Correct archived article links in search results (joomla#24990)
3066d7a
@HLeithner
Prepare 3.9.7 release
b06019e
@HLeithner
Reset to dev
a4d7dec
@mbabker @HLeithner
Fix doc block to use correct element order (joomla#25175)
ce3cf03
@HLeithner
Fix user params after Joomla 3.9.7 with selected french help site (jo…
941631d 
…omla#25177)
@HLeithner
Prepare 3.9.8 release
bbc22b9
@wilsonge
Merge commit 'f6efc5a' into 4.0-dev
178d454
@wilsonge
Merge tag '3.9.8' into 4.0-dev
d67fe4d 
Joomla! 3.9.8 release
@wilsonge wilsonge merged commit 5fff3b8 into joomla:4.0-dev Aug 31, 2019
@wilsonge wilsonge deleted the 398-merge branch August 31, 2019 18:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rdeutz rdeutz Awaiting requested review from rdeutz

@zero-24 zero-24 Awaiting requested review from zero-24

Assignees

No one assigned

Labels

Unit/System Tests

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.