gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-10-31 13:18:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,713 Commits 7 Branches 90 Tags 55 MiB
cc387a1f52
Commit Graph

419 Commits

Author SHA1 Message Date
Uwe Steinmann
bc608eff07 Merge branch 'seeddms-5.0.x' into develop 2016-02-15 20:45:05 +01:00
Uwe Steinmann
202d994e1c Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-15 17:08:01 +01:00
Uwe Steinmann
69e0ae0b3d get getDocumentsLocked() sets locking user in document 2016-02-15 15:14:42 +01:00
Uwe Steinmann
c01a84cfb7 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-15 08:24:39 +01:00
Uwe Steinmann
3a47861a50 propperly returns false if operation fails in addGroup() and delGroup() 2016-02-15 08:04:38 +01:00
Uwe Steinmann
db8b5cc033 add 'WorkflowOwner' list to getDocumentList() 2016-02-10 13:33:56 +01:00
Uwe Steinmann
14f600da35 add 'WorkflowByMe' list in getDocumentList() 2016-02-10 12:30:51 +01:00
Uwe Steinmann
2a5a2cd61d Merge branch 'seeddms-5.0.x' into develop 2016-02-10 11:49:15 +01:00
Uwe Steinmann
43c80a9f73 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-10 11:48:19 +01:00
Uwe Steinmann
a8c98b5f72 add method getWorkflowStatus() 2016-02-10 10:32:27 +01:00
Uwe Steinmann
625462712d replace comment in german, fix typo 2016-02-10 10:03:21 +01:00
Uwe Steinmann
d1ffd8db1a fix getDocumentsByCategory() 
didn't return the documents
 2016-02-09 13:12:31 +01:00
Uwe Steinmann
2da2f0af9a Merge branch 'seeddms-5.0.x' into develop 2016-02-08 13:24:40 +01:00
Uwe Steinmann
0903eacb62 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-08 12:46:59 +01:00
Uwe Steinmann
879a67ab84 getNotificationsBy[User|Group] uses the new methods in SeedDMS_Core_User and SeedDMS_Core_Group 2016-02-05 16:48:32 +01:00
Uwe Steinmann
e0de75d160 add method getNotifications() 2016-02-05 16:47:54 +01:00
Uwe Steinmann
d4deb0cc35 add method getNotifications() 2016-02-05 16:47:38 +01:00
Uwe Steinmann
3b8d7a5271 Merge branch 'seeddms-5.0.x' into develop 2016-02-04 19:22:59 +01:00
Uwe Steinmann
b04571da11 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-04 19:13:06 +01:00
Uwe Steinmann
f57a6a6600 getStatistics() returns info about folders and versions 2016-02-04 18:25:04 +01:00
Uwe Steinmann
d835aa84fe better checking when setting attr. value 2016-02-03 14:45:00 +01:00
Uwe Steinmann
76f5a89f92 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-02 09:48:18 +01:00
Uwe Steinmann
0c8768a09e new version 4.3.24 2016-02-01 20:49:28 +01:00
Uwe Steinmann
e4c229854e make sure boolean attribute is set to 0/1 2016-01-29 16:44:05 +01:00
Uwe Steinmann
51f80c0930 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-01-27 17:23:22 +01:00
Uwe Steinmann
a935a635c8 make list of workflow status distinct, add [g|s]etMandatoryWorkflows() 2016-01-27 16:18:12 +01:00
Uwe Steinmann
f81eab28b4 new version 4.3.23 2016-01-21 07:41:09 +01:00
Uwe Steinmann
6b95229ff7 Merge branch 'seeddms-5.0.x' into develop 2015-12-09 21:54:02 +01:00
Uwe Steinmann
0167723ca9 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-09 19:49:39 +01:00
Uwe Steinmann
d105fa5155 add new method createDump() 2015-12-09 18:24:31 +01:00
Uwe Steinmann
8fbec2821b Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-09 18:06:48 +01:00
Uwe Steinmann
6ad953005d take out echo of sql statement 2015-12-09 18:06:23 +01:00
Uwe Steinmann
9c0fe92998 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-09 18:04:12 +01:00
Uwe Steinmann
666fc944ff getReadAccess() returns right list of users 
doesn't return users anymore which have no read access
because the group has no read access
 2015-12-09 18:01:27 +01:00
Uwe Steinmann
2575a675aa msg can be passed to del[Ind|Grp][Approver|Reviewer]() 2015-12-09 17:48:29 +01:00
Uwe Steinmann
5351bd9596 create checkout filename from id, version and name 2015-11-30 20:47:19 +01:00
Uwe Steinmann
d04e65108d Merge branch 'seeddms-5.0.x' into develop 2015-11-19 08:00:10 +01:00
Uwe Steinmann
9d763b60a5 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-11-19 07:59:34 +01:00
Uwe Steinmann
1532ba3b82 getTimeLine() returns only false if db query fails 2015-11-19 06:43: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
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
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
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
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
Uwe Steinmann
418da4cb52 rename approveLogId to approveLogID 2015-06-12 12:42:37 +02:00
Uwe Steinmann
5bac2e9a4e manage file uploaded with review or approval 2015-06-11 21:32:45 +02:00
Uwe Steinmann
d55346ba0f manage file uploaded with review or approval 2015-06-11 21:32:16 +02:00
Uwe Steinmann
5b40c64413 manage file uploaded with review or approval 2015-06-11 21:28:04 +02:00
Uwe Steinmann
3a99d005b1 new parameter initialstate for addDocument() 2015-06-02 10:01:08 +02:00
Uwe Steinmann
325b91933d new document status S_DRAFT, initial doc status can set 2015-06-02 10:00:15 +02:00
Uwe Steinmann
312e619fa6 take out echo, remove $limit parameter from getStatus() 
The $limit parameter has not been used and if if was used, the
method would have returned false in many cases because the number
records would have been > 1
 2015-06-01 17:33:12 +02:00
Uwe Steinmann
ed5a5bb069 fix typo in variable name 2015-06-01 14:01:23 +02:00
Uwe Steinmann
1a63dbb1de unset $this->_status in SeedDMS_Core_DocumentContent::setStatus() 2015-05-30 07:35:27 +02:00
Uwe Steinmann
bcebca9c97 unset $this->_status in SeedDMS_Core_DocumentContent::setStatus() 2015-05-30 07:33:28 +02:00
Uwe Steinmann
e65c266831 add SeedDMS_Core_AddContentResultSet::setDMS(), fixed typo 2015-05-21 22:09:33 +02:00
Uwe Steinmann
207f0b255f add method maySwitchToUser(), fix getReverseSubstitutes() 2015-05-19 19:42:29 +02:00
Uwe Steinmann
d4652a614c add functions for handling substitutes 2015-05-19 08:03:12 +02:00
Uwe Steinmann
cb13a89c1a add checking for duplicates 2015-05-13 18:42:42 +02:00
Uwe Steinmann
bdd75ecfee fix addContent() 2015-05-13 18:41:10 +02:00
Uwe Steinmann
259303fff1 add checking for duplicates 2015-05-13 17:38:20 +02:00
Uwe Steinmann
37fe7925a4 add checking for duplicates 2015-05-13 17:37:53 +02:00
Uwe Steinmann
540b1ece0a add getSize(), updateContent() etc. 2015-05-13 17:32:10 +02:00
Uwe Steinmann
309be28256 add getUser() 2015-05-12 19:08:55 +02:00