gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-16 13:02:37 +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-08-22 11:24:34 +02:00
commit 52b43ba8c6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -24,7 +24,7 @@ dist:
rm -rf tmp rm -rf tmp
quickstart: quickstart:
vendor/bin/phing -Dversion=$(VERSION) package php7.4 vendor/bin/phing -Dversion=$(VERSION) package
unittest: unittest:
vendor/bin/phing -Dversion=$(VERSION) phpunitfast vendor/bin/phing -Dversion=$(VERSION) phpunitfast

2
inc/inc.ClassSettings.php
View File

@ -157,7 +157,7 @@ class Settings { /* {{{ */
// default date format // default date format
var $_dateformat = "Y-m-d"; var $_dateformat = "Y-m-d";
// default date/time format // default date/time format
var $_datetimformat = "Y-m-d H:i:s"; var $_datetimeformat = "Y-m-d H:i:s";
// users are notified about document-changes that took place within the last $_updateNotifyTime seconds // users are notified about document-changes that took place within the last $_updateNotifyTime seconds
var $_updateNotifyTime = 86400; var $_updateNotifyTime = 86400;
// files with one of the following endings can be viewed online // files with one of the following endings can be viewed online