Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

qfq
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

a5fa36d9

Commit a5fa36d9 authored 2 years ago by enured

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into F14320_Allow_specific_HTML_Tags_TinyMCE

parents 4fae6326 b7eb523e

2 merge requests!495New version 22.12.0,!480F14320: Implemented htmlAllow parameter for tinyMce as clientside check and...

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/Report.rst 2 additions, 2 deletions

Documentation/Report.rst
extension/Classes/Core/Constants.php 1 addition, 0 deletions

extension/Classes/Core/Constants.php
extension/Classes/Core/Database/Database.php 1 addition, 0 deletions

extension/Classes/Core/Database/Database.php
extension/Classes/Core/Helper/EncryptDecrypt.php 11 additions, 11 deletions

extension/Classes/Core/Helper/EncryptDecrypt.php
extension/Classes/Core/QuickFormQuery.php 5 additions, 2 deletions

extension/Classes/Core/QuickFormQuery.php
extension/Classes/Core/Report/Report.php 12 additions, 16 deletions

extension/Classes/Core/Report/Report.php
extension/Classes/Core/Save.php 9 additions, 12 deletions

extension/Classes/Core/Save.php
javascript/src/Element/NameSpaceFunctions.js 29 additions, 1 deletion

javascript/src/Element/NameSpaceFunctions.js
javascript/src/QfqForm.js 41 additions, 21 deletions

javascript/src/QfqForm.js

with 111 additions and 65 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment