gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-07 15:44:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,817 Commits 7 Branches 80 Tags 38 MiB
8d1dc66c59
Commit Graph

386 Commits

Author SHA1 Message Date
Uwe Steinmann
1532ba3b82 getTimeLine() returns only false if db query fails 2015-11-19 06:43:02 +01:00
Uwe Steinmann
19c195a357 Merge branch 'seeddms-5.0.x' into develop 2015-11-11 06:52:36 +01:00
Uwe Steinmann
ac09780cad Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-11-11 06:27:58 +01:00
Uwe Steinmann
4dd2dc87af new version 4.3.22 2015-11-09 20:00:02 +01:00
Uwe Steinmann
a30b3b9505 Merge branch 'seeddms-5.0.x' into develop 2015-10-30 13:09:25 +01:00
Uwe Steinmann
50e0d2a885 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-30 08:41:40 +01:00
Uwe Steinmann
f225b42d71 set number of type_date to 7 2015-10-30 08:06:32 +01:00
Uwe Steinmann
ec581518f0 add new type for date fields 2015-10-30 08:05:22 +01:00
Uwe Steinmann
f78e02e7e8 Merge branch 'seeddms-5.0.x' into develop 2015-10-27 11:43:40 +01:00
Uwe Steinmann
b7d1b0e663 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-27 11:42:39 +01:00
Uwe Steinmann
fa0e365375 fix sql-Statement in createPasswordRequest() (Closes #236) 2015-10-27 11:33:23 +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
193077fdcd properly set homefolder to NULL when creating a user 2015-10-19 13:42:19 +02:00
Uwe Steinmann
54b2e8a881 add statusid and fileid in entry of timeline 2015-10-19 13:12:35 +02:00
Uwe Steinmann
15bedc303e Merge branch 'seeddms-5.0.x' into develop 2015-09-28 14:54:03 +02:00
Uwe Steinmann
1d626fc7e5 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-28 14:53:46 +02:00
Uwe Steinmann
ea20501ed3 update date of new version 2015-09-28 14:34:19 +02:00
Uwe Steinmann
33c5e313d0 do not pass parameter 'localtime' to strftime() 2015-09-28 13:25:00 +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
109f814fa9 new version 4.3.21 2015-09-22 10:22:40 +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
65133cb366 started new version 4.3.21 2015-09-22 07:55:28 +02:00
Uwe Steinmann
daa72a9ca3 user getCurrentTimestamp() and getCurrentDatetime() 2015-09-22 07:50:36 +02:00
Uwe Steinmann
4ffa4399a2 add getCurrentDatetime() and getCurrentTimestamp() 
getCurrentTimestamp() used return the sql statement for a datetime
 2015-09-22 07:48:49 +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
b6012ae428 set homefolder to NULL if not set 2015-09-21 12:51:37 +02:00
Uwe Steinmann
419af9880a initial version of getTimeline() 2015-09-21 12:42:58 +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
0a4e2861ce fix sql statements when searching fro attributes (Closes #227) 2015-08-31 07:58:09 +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
7ae79bd09d new version 4.3.20 2015-08-19 08:30:51 +02:00
Uwe Steinmann
951a261030 new version 4.3.20 2015-08-19 08:22:07 +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
215380b806 remove echo statement 2015-08-05 22:45:57 +02:00
Uwe Steinmann
170f70d005 Merge branch 'seeddms-5.0.x' into develop 2015-08-05 21:32:53 +02:00
Uwe Steinmann
81872f4319 unset homefolder of users before the folder will be deleted 2015-08-05 21:19:00 +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
150e5445df add method setDate() 2015-08-04 07:39:14 +02:00
Uwe Steinmann
bc1eecc08c add methods to rewrite approval and review log 2015-08-04 07:38:45 +02:00
Uwe Steinmann
1200460cee add parameter $format to checkDate() 2015-08-04 07:37:48 +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
3699adfaf5 add method checkDate() 2015-07-31 15:30:00 +02:00
Uwe Steinmann
de8726cccf Merge branch 'seeddms-5.0.x' into develop 2015-07-28 09:01:02 +02:00
Uwe Steinmann
b5f5ef6e21 use configured classname in getInstance() 2015-07-15 22:28:58 +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
156ec69355 fix documentation error 2015-07-15 08:21:28 +02:00
Uwe Steinmann
832e760e03 use configured class names, remove old code 2015-07-15 08:20:55 +02:00
Uwe Steinmann
533011df95 use configured class names 2015-07-15 08:20:27 +02:00
Uwe Steinmann
40646009ab minor documentation fix 2015-07-15 08:20:08 +02:00
Uwe Steinmann
de62d04129 fix some return values, use configured class names 2015-07-15 08:19:09 +02:00
Uwe Steinmann
ef8e4e8400 inList() returns false or the index of the element 
backported from develop
 2015-07-15 08:18:17 +02:00
Uwe Steinmann
9bc675873d getDocumentList() returns only documents I haven't touched 
The lists AppRevByMe, ReviseByMe and ReceiptByMe will only return
those documents in its initial review/approval/receipt/revision
status (0).
 2015-07-09 18:25:55 +02:00
Uwe Steinmann
6b2f528624 getDocumentList(AppRev) returns only untouched documents 2015-07-08 18:57:53 +02:00
Uwe Steinmann
85174c6f45 create list of rejected documents 2015-07-03 20:52:55 +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
3a531462d9 add static method mergeAccessLists() 2015-06-29 10:27:23 +02:00
Uwe Steinmann
6c016f236a new version 4.3.19 2015-06-26 16:46:41 +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
5348905c23 check if content is still there when calculating size 2015-06-25 19:50:10 +02:00
Uwe Steinmann
871ed870cc add optional parameter $initstate to checkIn() 2015-06-24 20:34:40 +02:00
Uwe Steinmann
4fed0eacc9 add notes for 4.3.19 2015-06-19 15:27:55 +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
8ee6d74613 setDefaultAccess() cleanly removes als notifiers without read access 
This failed because the first call of removeNotify() has invalidated
the list of notifiers
 2015-06-19 12:54:43 +02:00
Uwe Steinmann
1bd1198335 setDefaultAccess() cleanly removes als notifiers without read access 
This failed because the first call of removeNotify() has invalidated
the list of notifiers
 2015-06-19 12:53:57 +02:00
Uwe Steinmann
c4bea610cb setDefaultAccess() propperly removes notifier without read access 2015-06-19 12:52:49 +02:00
Uwe Steinmann
92299df0ea setDefaultAccess() cleanly removes als notifiers without read access 
This failed because the first call of removeNotify() has invalidated
the list of notifiers
 2015-06-19 12:47:30 +02:00
Uwe Steinmann
2cdc9e3a1f fix some code which was intended for 5.0.x 2015-06-18 17:44:22 +02:00
Uwe Steinmann
a0d0790a34 initialize return array 2015-06-18 17:36:47 +02:00
Uwe Steinmann
7f9de8b665 subfolders and documents can be order by date and direction can be set 2015-06-18 13:50:45 +02:00
Uwe Steinmann
e513731455 subfolders and documents can be order by date and direction can be set 2015-06-18 13:50:34 +02:00
Uwe Steinmann
4cbd1be175 subfolders and documents can be order by date and direction can be set 2015-06-18 13:49:52 +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