Skip to content

Joomla 3.9.0 Part 7#24410

Merged
wilsonge merged 71 commits intojoomla:4.0-devfrom
wilsonge:390-merge7
Mar 29, 2019
Merged

Joomla 3.9.0 Part 7#24410
wilsonge merged 71 commits intojoomla:4.0-devfrom
wilsonge:390-merge7

Conversation

@wilsonge
Copy link
Copy Markdown
Contributor

As always merge with a merge commit, not a squash/rebase.

laoneo and others added 30 commits June 28, 2018 20:43
* Deprecate editor form field save function

* Revert invalid change

* Blank
* Add link to edit categories and show parent category

* Check for ROOT category earlier

* Fix wrong variable

* Put the query into the model

* Check if category is the root or not

* Check Permissions to edit category or parent category

* Fix wrong article title

* Add suggested change for the queries

* Fix Code Style

* Fix Check for ROOT Category

* Add category level check

* Add Check for Parent Category Level

* Consider rtl languages

* Code Style

* Use html entities

* Fix Code Style

* Code Style
Add Feature to Featured Articles Manager

* Code Style

* Use another method
* initial commit

* Add back showlabel for the render options
Remove label class for render options

* Moved field to the right position
Language String changed

* Add back label output class (first commit)

* Fix Codestyle

* Add label render class in contact

* Change Field type to note
Remove strong tag from language string

* Add missing intent

* Alphabetize keys
Typo in Azure installation file
thanks @SharkyKZ
* Log failed login action

* Add login failed language item

* Fix typo
* Make links in action logs notification email clickable

* Fix $linkMode
* Fix IP filtering
Fix CSV export
Improve list layout

* Renaming addLogsToDb to addLog

* Fixing language string
Do not allow a different email address for an authenticated user
Michael Babker and others added 26 commits July 11, 2018 17:31
* [export] - content, contact and related fields

* export com_messages

* move in their own plugins

* lang files

* own plugins

* mysql install

* postgresql install

* mssql install

* mysql update

* postgresql update

* mssql update

* behaviour

* behaviour

* behaviour

* disabled as default

* disabled as defualt

* disabled as default

* allow export from email too

* and not or

* enabled

* enabled

* enabled

* 3nabled

* enabled

* enabled

* oops
* Log user registration action

* Add language item
* Changed icon of Privacy Dashboard

* Changed icon of Privacy Dashboard

* Changed icon of Privacy Dashboard

* Changed icon of Privacy Dashboard

* Changed icon of Privacy Dashboard
…as plugin (joomla#185)

* make sure the language of com_privacy is loaded as it is not running as plugin

* Update helper.php

* Update actionlogs.php
…oomla#221)

* Changing order of calls to load translation files.

* Adding ActionlogsHelper::loadTranslationFiles and removing translateExtensionName
* Adding consent to terms & conditions to actionlog

* Language string style
* Adding Actionlog Privacy plugin

* Fixing SQL default timestamps
* Adding logging for global configuration

* Updating table name and adding onApplicationBeforeSave event
* Adding UTC timezone to filename for export

* Forceing FS friendly formatting
@wilsonge wilsonge merged commit 2cd52ea into joomla:4.0-dev Mar 29, 2019
@wilsonge wilsonge deleted the 390-merge7 branch March 29, 2019 15:55
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.