gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge errors

Browse Source
This commit is contained in:
Uwe Steinmann 2022-04-29 07:04:52 +02:00
parent 2014eae334
commit b854d64757
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CHANGELOG
View File

@ -1,5 +1,9 @@
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
<<<<<<< HEAD Changes in version 6.0.19
--------------------------------------------------------------------------------
- merge changes up to 5.1.26
--------------------------------------------------------------------------------
Changes in version 6.0.18 Changes in version 6.0.18
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
- finish op/op.Cron.php, returns json - finish op/op.Cron.php, returns json
@ -7,7 +11,7 @@
- fix sending trigger workflow notification (Closes: #522) - fix sending trigger workflow notification (Closes: #522)
- fix updating und deleting items in document lists - fix updating und deleting items in document lists
- call hook 'filenameDownloadItem' in search export and transmittal download - call hook 'filenameDownloadItem' in search export and transmittal download
- fix possible xss attack in UsrMgr - fix possible xss attack in UsrMgr (CVE-2022-28479)
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 6.0.17 Changes in version 6.0.17
@ -217,10 +221,10 @@
- add access controll list for many functions - add access controll list for many functions
- add document list which can be exported as an archive - add document list which can be exported as an archive
- search results can be exported - search results can be exported
=======
--------------------------------------------------------------------------------
Changes in version 5.1.26 Changes in version 5.1.26
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
>>>>>>> seeddms-5.1.x
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.25 Changes in version 5.1.25