Commit Graph

98 Commits

Author SHA1 Message Date
Uwe Steinmann
5351bd9596 create checkout filename from id, version and name 2015-11-30 20:47:19 +01:00
Uwe Steinmann
031129a31c Merge branch 'seeddms-5.0.x' into develop 2015-10-20 18:21:47 +02:00
Uwe Steinmann
2f9e015856 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-20 18:20:24 +02:00
Uwe Steinmann
54b2e8a881 add statusid and fileid in entry of timeline 2015-10-19 13:12:35 +02:00
Uwe Steinmann
37f9771b97 Merge branch 'seeddms-5.0.x' into develop 2015-09-23 17:21:26 +02:00
Uwe Steinmann
42dbb30e22 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 16:03:15 +02:00
Uwe Steinmann
3f82cb1957 do not add item to timeline if date is empty 2015-09-23 15:47:46 +02:00
Uwe Steinmann
b0edf297a2 Merge branch 'seeddms-5.0.x' into develop 2015-09-22 16:01:09 +02:00
Uwe Steinmann
58731cfdde Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-22 15:59:47 +02:00
Uwe Steinmann
083e323721 take out creation of content from timeline
it will be added by the status log anyway
2015-09-22 09:24:06 +02:00
Uwe Steinmann
e8b99cea70 replace all CURRENT_TIMESTAMP by $db->getCurrentTimestamp() 2015-09-22 09:01:18 +02:00
Uwe Steinmann
fcbb5f68fe Merge branch 'seeddms-5.0.x' into develop 2015-09-22 08:51:59 +02:00
Uwe Steinmann
c3296e476b Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-22 07:57:54 +02:00
Uwe Steinmann
daa72a9ca3 user getCurrentTimestamp() and getCurrentDatetime() 2015-09-22 07:50:36 +02:00
Uwe Steinmann
272d9a43ee Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-21 18:10:07 +02:00
Uwe Steinmann
8295cde1e7 add getCurrentTimestamp() to database driver
will return datetime('now', 'localtime') for sqlite because otherwise
it will return GMT
2015-09-21 18:08:05 +02:00
Uwe Steinmann
6be0d179fc Merge branch 'seeddms-5.0.x' into develop 2015-09-21 16:58:25 +02:00
Uwe Steinmann
229d976113 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-21 16:58:14 +02:00
Uwe Steinmann
c385d86a60 add timeline over all documents 2015-09-21 16:46:17 +02:00
Uwe Steinmann
d54172d366 Merge branch 'seeddms-5.0.x' into develop 2015-09-18 08:00:06 +02:00
Uwe Steinmann
8ab6dda490 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-18 07:59:15 +02:00
Uwe Steinmann
753733d153 set type and params in list of timeline actions 2015-09-18 07:54:08 +02:00
Uwe Steinmann
b55627f213 add initial support for timeline of recent changes 2015-09-16 21:19:46 +02:00
Uwe Steinmann
58413e5218 Merge branch 'seeddms-5.0.x' into develop 2015-08-19 09:24:20 +02:00
Uwe Steinmann
cde8e830f5 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-19 09:24:05 +02:00
Uwe Steinmann
123cccc72a getAccessMode() takes user/group rights in acls into account for guests 2015-08-19 08:21:15 +02:00
Uwe Steinmann
8a3aebf3cc Merge branch 'seeddms-5.0.x' into develop 2015-08-05 17:02:13 +02:00
Uwe Steinmann
1e17c393bb Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-05 16:57:07 +02:00
Uwe Steinmann
bc1eecc08c add methods to rewrite approval and review log 2015-08-04 07:38:45 +02:00
Uwe Steinmann
53bac225fb add SeedDMS_Core_Document::setDate() 2015-07-31 15:34:07 +02:00
Uwe Steinmann
01c30a0b8a add new method rewriteStatusLog(), add option parameter date to
setStatus()
2015-07-31 15:30:35 +02:00
Uwe Steinmann
ecbdb4ea4a use configured classname, remove old code 2015-07-15 22:28:31 +02:00
Uwe Steinmann
bd7a11f0b1 use configured classname in getInstance()
this will make sure that even getInstance in child classes defined
by an extension will return objects of the right class
2015-07-15 16:57:26 +02:00
Uwe Steinmann
de62d04129 fix some return values, use configured class names 2015-07-15 08:19:09 +02:00
Uwe Steinmann
463e94ee8a Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
Conflicts:
	CHANGELOG
	Makefile
	SeedDMS_Core/Core/inc.ClassDMS.php
	SeedDMS_Core/package.xml
	inc/inc.Utils.php
	inc/inc.Version.php
	install/install.php
	op/op.ApproveDocument.php
	op/op.Login.php
	op/op.RemoveDocumentLink.php
	op/op.ReviewDocument.php
	out/out.SetReviewersApprovers.php
	views/bootstrap/class.Bootstrap.php
2015-06-30 07:05:27 +02:00
Uwe Steinmann
f7d695c015 some initial code to recursively merge access list (not used yet) 2015-06-29 10:28:10 +02:00
Uwe Steinmann
401e995df6 removing a version will also remove all references
references in tblTransmittalItems, tblDocumentRevisions and
tblDocumentRecievers were not removed
2015-06-26 12:21:48 +02:00
Uwe Steinmann
871ed870cc add optional parameter $initstate to checkIn() 2015-06-24 20:34:40 +02:00
Uwe Steinmann
905bc9c140 add optional parameter cleasAccessList()
will turn off removal of notification
2015-06-19 15:25:25 +02:00
Uwe Steinmann
44bb62f413 add optional parameter cleasAccessList()
will turn off removal of notification
2015-06-19 15:25:20 +02:00
Uwe Steinmann
68d1816251 add optional parameter cleasAccessList()
will turn off removal of notification
2015-06-19 15:24:19 +02:00
Uwe Steinmann
75c8129185 add cleanNotifyList() which removes users/groups with read access
also adds an optional parameter $noclean to setDefaultAccess and
setInheritAccess which keeps the methods from cleaning up the
notifier list
2015-06-19 15:05:01 +02:00
Uwe Steinmann
870fb2d662 add cleanNotifyList() which removes users/groups with read access
also adds an optional parameter $noclean to setDefaultAccess and
setInheritAccess which keeps the methods from cleaning up the
notifier list
2015-06-19 15:04:50 +02:00
Uwe Steinmann
28bfe5c1d7 add cleanNotifyList() which removes users/groups with read access
also adds an optional parameter $noclean to setDefaultAccess and
setInheritAccess which keeps the methods from cleaning up the
notifier list
2015-06-19 15:02:37 +02:00
Uwe Steinmann
ee8ad500ce setDefaultAccess() propperly removes notifier without read access 2015-06-19 12:55:57 +02:00
Uwe Steinmann
1f19d7daaf setDefaultAccess() propperly removes notifier without read access 2015-06-19 12:55:51 +02:00
Uwe Steinmann
c4bea610cb setDefaultAccess() propperly removes notifier without read access 2015-06-19 12:52:49 +02:00
Uwe Steinmann
34a7df9180 rename approveLogId to approveLogID
Conflicts:
	views/bootstrap/class.ViewDocument.php
2015-06-12 12:46:03 +02:00
Uwe Steinmann
cc9f40997b rename approveLogId to approveLogID 2015-06-12 12:43:54 +02:00
Uwe Steinmann
418da4cb52 rename approveLogId to approveLogID 2015-06-12 12:42:37 +02:00