gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-12 12:41:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2023-01-20 10:58:57 +01:00
commit 21a787aa21
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -92,6 +92,6 @@ apidoc:
# into the original format by replacing all '|' by newline. # into the original format by replacing all '|' by newline.
# #
changelog: changelog:
@sgrep 'stag("DATE") .. etag("DATE") or ((stag("RELEASE") .. etag("RELEASE")) in (stag("VERSION") .. etag("VERSION"))) or inner(stag("NOTES") __ etag("NOTES"))' SeedDMS_Core/package.xml | sed -e 's#^ *<date>\([-0-9]*\)</date><release>\([0-9.]*\)</release>#\n\n\2 (\1)\n---------------------#' | awk -F'\n' -vRS='' -vOFS='|' '{$$1=$$1}1' | sort -V -r | sed 's/$$/\n/' | tr '|' '\n' @sgrep 'stag("DATE") .. etag("DATE") or ((stag("RELEASE") .. etag("RELEASE")) in (stag("VERSION") .. etag("VERSION"))) or inner(stag("NOTES") __ etag("NOTES"))' SeedDMS_Core/package.xml | sed -e 's#^ *<date>\([-0-9]*\)</date><release>\([0-9.preRC]*\)</release>#\n\n\2 (\1)\n---------------------#' | awk -F'\n' -vRS='' -vOFS='|' '{$$1=$$1}1' | sort -V -r | sed 's/$$/\n/' | tr '|' '\n'
.PHONY: doc webdav webapp repository changelog .PHONY: doc webdav webapp repository changelog

36
SeedDMS_Core/package.xml
View File

@ -699,21 +699,21 @@ no changes
</notes> </notes>
</release> </release>
<release> <release>
<date>2014-07-30</date> <date>2014-07-30</date>
<time>09:03:59</time> <time>09:03:59</time>
<version> <version>
<release>4.3.9</release> <release>4.3.9</release>
<api>4.3.9</api> <api>4.3.9</api>
</version> </version>
<stability> <stability>
<release>stable</release> <release>stable</release>
<api>stable</api> <api>stable</api>
</stability> </stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license> <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes> <notes>
- SeedDMS_Core_KeywordCategory::getKeywordLists() sorts keywords aphabetically - SeedDMS_Core_KeywordCategory::getKeywordLists() sorts keywords aphabetically
- SeedDMS_Core_DMS::addUser() doesn't throw an error if sql_mode is set to STRICT_TRANS_TABLES and pwdexpiration is not set to a valid date. - SeedDMS_Core_DMS::addUser() doesn't throw an error if sql_mode is set to STRICT_TRANS_TABLES and pwdexpiration is not set to a valid date.
</notes> </notes>
</release> </release>
<release> <release>
<date>2014-10-22</date> <date>2014-10-22</date>
@ -955,7 +955,7 @@ by a group or user right
<notes> <notes>
- new method SeedDMS_Core_DMS::createDump() - new method SeedDMS_Core_DMS::createDump()
- minor improvements int SeedDMS_Core_Document::getReadAccessList() - minor improvements int SeedDMS_Core_Document::getReadAccessList()
</notes> </notes>
</release> </release>
<release> <release>
<date>2016-01-22</date> <date>2016-01-22</date>
@ -979,7 +979,7 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
- SeedDMS_Core_DocumentCategory::getDocumentsByCategory() now returns the documents - SeedDMS_Core_DocumentCategory::getDocumentsByCategory() now returns the documents
- add SeedDMS_Core_Group::getWorkflowStatus() - add SeedDMS_Core_Group::getWorkflowStatus()
- SeedDMS_Core_User::getDocumentsLocked() sets locking user propperly - SeedDMS_Core_User::getDocumentsLocked() sets locking user propperly
</notes> </notes>
</release> </release>
<release> <release>
<date>2016-01-22</date> <date>2016-01-22</date>
@ -1054,7 +1054,7 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license> <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes> <notes>
- add more callbacks - add more callbacks
</notes> </notes>
</release> </release>
<release> <release>
<date>2016-04-26</date> <date>2016-04-26</date>
@ -1435,7 +1435,7 @@ do not sort some temporary tables anymore, because it causes an error in mysql i
<api>stable</api> <api>stable</api>
</stability> </stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license> <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes> <notes>
all sql statements can be logged to a file all sql statements can be logged to a file
do not sort some temporary tables anymore, because it causes an error in mysql if sql_mode=only_full_group_by is set do not sort some temporary tables anymore, because it causes an error in mysql if sql_mode=only_full_group_by is set
</notes> </notes>
@ -1906,7 +1906,7 @@ returns just users which are not disabled
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license> <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes> <notes>
- SeedDMS_Core_DMS::getTimeline() uses status log instead of document content - SeedDMS_Core_DMS::getTimeline() uses status log instead of document content
- add methods SeedDMS_Core_DocumentContent::getReviewers() and SeedDMS_Core_DocumentContent::getApprovers() - add methods SeedDMS_Core_DocumentContent::getReviewers() and SeedDMS_Core_DocumentContent::getApprovers()
- add methods SeedDMS_Core_DocumentContent::getApproveLog() and SeedDMS_Core_DocumentContent::getReviewLog() - add methods SeedDMS_Core_DocumentContent::getApproveLog() and SeedDMS_Core_DocumentContent::getReviewLog()
- better handling of document with an empty workflow state - better handling of document with an empty workflow state
- fix checking of email addresses by using filter_var instead of regex - fix checking of email addresses by using filter_var instead of regex