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
7,825 Commits 7 Branches 80 Tags 38 MiB
dc661029af
Commit Graph

364 Commits

Author SHA1 Message Date
Uwe Steinmann
8afaf3c748 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-03-15 16:46:04 +01:00
Uwe Steinmann
c823981bd9 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-15 16:45:02 +01:00
Uwe Steinmann
82d0bfde44 set preview with for document icons 2017-03-15 16:41:32 +01:00
Uwe Steinmann
ae33edbcdc put documentListItem from Bootstrap base class in ViewDocument 2017-03-10 20:08:01 +01:00
Uwe Steinmann
132f146a9f Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-06 10:52:36 +01:00
Uwe Steinmann
4d2aec52fe Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-03-06 10:51:36 +01:00
Uwe Steinmann
cabe4371e7 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-06 10:51:24 +01:00
Uwe Steinmann
d392ca727e show also number of reverse links in tab header 2017-03-06 08:53:36 +01:00
Uwe Steinmann
390a653b94 do not show 'AddFile' link if access is not allowed 2017-03-03 14:10:03 +01:00
Uwe Steinmann
4c794381e6 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-02-20 17:34:43 +01:00
Uwe Steinmann
19f77a37c8 add missing changes which got lost during last rebase 2017-02-20 15:33:15 +01:00
Uwe Steinmann
9346fa6072 use new function filterDocumentFiles() 2017-02-20 15:21:06 +01:00
Uwe Steinmann
7d82b73208 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-13 12:12:07 +01:00
Uwe Steinmann
d5dc6b125d Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-08 15:52:00 +01:00
Uwe Steinmann
341aa12a05 call new hook 'documentPreview' 2017-02-07 11:52:38 +01:00
Uwe Steinmann
ea85b65818 do not output anything if attachment file is missing 
previously outputs an icon which didn't make sense at all
 2017-01-31 17:25:22 +01:00
Uwe Steinmann
eb82f8cc19 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-26 14:44:47 +01:00
Uwe Steinmann
7a674b9162 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-26 14:44:33 +01:00
Uwe Steinmann
1314f27660 list access rights in popup box if more than 3 2017-01-26 14:44:07 +01:00
Uwe Steinmann
56e7f567c7 enable turn off of updating document reception 2017-01-17 14:20:33 +01:00
Uwe Steinmann
f6d3e9785f Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-16 15:52:19 +01:00
Uwe Steinmann
c37910e473 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-16 15:12:16 +01:00
Uwe Steinmann
20e57e8e76 check if enableUpdateRevApp is set 2017-01-16 13:02:15 +01:00
Uwe Steinmann
d31951748c pass 'target' or 'source' to filterDocumentLinks() 
will check if access rights on linked documents are sufficient
 2017-01-16 13:01:09 +01:00
Uwe Steinmann
b5f8e9efcc readd [post|pre]PreviewDocument hooks 2017-01-04 17:23:59 +01:00
Uwe Steinmann
8b1b9fdb2a set $dms in preview() 2017-01-04 17:14:45 +01:00
Uwe Steinmann
7d8f4f54c0 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-04 17:11:39 +01:00
Uwe Steinmann
8d20d39a07 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-12-22 09:36:15 +01:00
Uwe Steinmann
3242714fda move document infos into own method 2016-12-22 09:31:46 +01:00
Uwe Steinmann
d47982a671 do not allow to edit content if file doesn't exist 2016-12-22 09:25:10 +01:00
Uwe Steinmann
db0021d65b pass content instead of document to preview hooks 2016-12-22 09:21:20 +01:00
Uwe Steinmann
259c7ffc3c add hooks for showing preview of document 2016-12-22 09:11:40 +01:00
Uwe Steinmann
cf597a4bed get $dms from view in preview() 2016-12-22 07:54:07 +01:00
Uwe Steinmann
662d9d0d85 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-11-22 10:34:15 +01:00
Uwe Steinmann
a4bec45158 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-11-22 10:28:29 +01:00
Uwe Steinmann
9f5aa9c8be add more documentation 
explain in comment why 'Done' is output when a workflow transition
can be executed but the trigger is already there.
 2016-11-18 08:42:56 +01:00
Uwe Steinmann
1df09242a0 don't show preview if ViewOnline isn't allowed, more access checks 2016-11-09 19:54:00 +01:00
Uwe Steinmann
ca76b64ba8 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-11-08 12:00:44 +01:00
Uwe Steinmann
2ed68b22d2 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-11-08 11:39:02 +01:00
Uwe Steinmann
379a3d728e show svg in preview 2016-11-07 16:28:58 +01:00
Uwe Steinmann
b5626c2cdf Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-11-07 09:27:28 +01:00
Uwe Steinmann
84f9fd89f0 show pdf preview 2016-11-07 09:25:55 +01:00
Uwe Steinmann
58bee377a0 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-10-27 17:07:22 +02:00
Uwe Steinmann
682b5dafe7 do not check for enableOwnerRevApp anymore 
a user who has been once added as a reviewer/approver may have become
the owner of the document later. Such a user may still be allowed
to review/approve. enableOwnerRevApp will only affect the list of
users when the reviewers/approvers are set.
 2016-10-27 17:05:12 +02:00
Uwe Steinmann
94dbc6b240 do not take enableOwnerRe[vApp|cipt] into account 
if a user has been assigen as Reviewer/Approver/Revisor and became
the owner of the document in the mean timer or the configuration has
change he/she should still be able to do the review/approval/revision
 2016-10-27 14:23:26 +02:00
Uwe Steinmann
e10b6974ae add new config flag which allows doc reception by owner 2016-10-27 12:17:04 +02:00
Uwe Steinmann
efc11d4236 do not show users in list of recipients if they were deleted 
only admin will see them
 2016-10-05 12:05:19 +02:00
Uwe Steinmann
35e6625601 fix calculation of already receipt documents 2016-10-05 11:16:26 +02:00
Uwe Steinmann
42c20082eb Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-09-06 08:43:52 +02:00
Uwe Steinmann
10c89c9e5b Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-09-06 08:24:38 +02:00
Uwe Steinmann
49cf88c5c2 show workflow graph only if involved in workflow or admin 2016-09-06 08:21:44 +02:00
Uwe Steinmann
75ce06c128 check if workflow graph may be shown 2016-09-05 10:05:54 +02:00
Uwe Steinmann
a1ccc60729 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-09-05 08:57:18 +02:00
Uwe Steinmann
fac5f44f65 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-09-05 07:48:09 +02:00
Uwe Steinmann
ae532b7b28 show workflow graph 2016-09-05 06:39:20 +02:00
Uwe Steinmann
a2bde8fd6b access check for AddToTransmittal 2016-08-22 06:29:50 +02:00
Uwe Steinmann
74f9a0209b add more access checks 2016-08-12 18:08:30 +02:00
Uwe Steinmann
bf7a63bf5a add more role based access checks 2016-08-12 12:43:21 +02:00
Uwe Steinmann
c4401a45df don't show any links to op/op.Download.php and op/op.ViewOnline.php if access is prohibited 2016-08-11 12:05:36 +02:00
Uwe Steinmann
0fb14d4c6a more similar look of documents list 2016-08-03 14:47:06 +02:00
Uwe Steinmann
624a96ddde Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-08-03 12:33:19 +02:00
Uwe Steinmann
03ff5dfc50 remove unneeded echo statement 2016-08-03 12:16:51 +02:00
Uwe Steinmann
20476876ac Merge branch 'seeddms-5.0.x' into develop 2016-05-23 12:32:18 +02:00
Uwe Steinmann
fe0e67b2ad Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-05-23 12:30:54 +02:00
Uwe Steinmann
1c09327bc0 add preview function for audio files (not activated) 2016-05-09 08:21:21 +02:00
Uwe Steinmann
38f02a149e Merge branch 'seeddms-5.0.x' into develop 2016-05-03 06:40:50 +02:00
Uwe Steinmann
129b725414 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-05-03 06:32:54 +02:00
Uwe Steinmann
8a4948085a Merge branch 'seeddms-5.0.x' into develop 2016-04-28 12:24:47 +02:00
Uwe Steinmann
24e30529ab fix html markup 2016-04-26 18:20:22 +02:00
Uwe Steinmann
51ca23085a fix some html markup 2016-04-26 18:16:24 +02:00
Uwe Steinmann
fcf85a88e0 move inclusion of "SeedDMS/Preview.php" into view 2016-04-26 12:16:29 +02:00
Uwe Steinmann
4206c5ef59 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-04-22 16:40:29 +02:00
Uwe Steinmann
877f5c80ed output access rights even if inherited 2016-04-22 16:36:47 +02:00
Uwe Steinmann
829d0911f0 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-04-20 18:11:36 +02:00
Uwe Steinmann
0ece3ef69a fix edit attributes of older versions 
link always pointed to latest version
 2016-04-20 18:10:55 +02:00
Uwe Steinmann
e22f0e2065 use html_link() instead of plain html 2016-04-20 18:09:36 +02:00
Uwe Steinmann
a1cd739293 fix links to out.EditOnline.php and out.RemoveVersion.php 2016-04-20 15:49:40 +02:00
Uwe Steinmann
ae1bbffc64 fix link to out.EditOnline.php and out.RemoveVersion.php 2016-04-20 15:46:36 +02:00
Uwe Steinmann
ced19968aa output progressbar for receipt status 2016-03-24 15:42:18 +01:00
Uwe Steinmann
50cfb869e2 pass $document to mayEditVersion() 2016-03-23 16:53:32 +01:00
Uwe Steinmann
3ed43f3f09 Merge branch 'seeddms-5.0.x' into develop 2016-03-21 08:34:20 +01:00
Uwe Steinmann
4fcd0d0a72 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-21 08:34:08 +01:00
Uwe Steinmann
070edae476 do not add js code for timeline if not admin 2016-03-21 08:33:41 +01:00
Uwe Steinmann
7bd77ba43e Merge branch 'seeddms-5.0.x' into develop 2016-03-15 08:50:32 +01:00
Uwe Steinmann
fc0b7a4e16 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-15 08:48:03 +01:00
Uwe Steinmann
66ec6fb7ce add missing contentEnd() at end of page 2016-03-15 08:30:53 +01:00
Uwe Steinmann
d317388d18 Merge branch 'seeddms-5.0.x' into develop 2016-03-09 08:10:15 +01:00
Uwe Steinmann
9a319ef539 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-09 08:06:37 +01:00
Uwe Steinmann
1f76c2455a add link to EditOnline 2016-03-09 07:58:52 +01:00
Uwe Steinmann
f859b48a57 Merge branch 'seeddms-5.0.x' into develop 2016-03-09 06:42:30 +01:00
Uwe Steinmann
dc3958b456 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-09 06:40:14 +01:00
Uwe Steinmann
5471c17b0f better check if reviewer/approver still exist 2016-03-08 16:07:42 +01:00
Uwe Steinmann
51fa5d18e6 enhance AccessOperation by check_view_access() 
all methods in SeedDMS_AccessOperation take the object to be checked
as the first parameter. Add new method check_view_access() which
checks if a view may be accessed based on the tables tblAros, tblAcos,
tblArosAcos
 2016-03-03 07:39:04 +01:00
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
54df39ba81 pass timeout to view and previewer 2016-02-15 10:57:37 +01:00
Uwe Steinmann
3b8d7a5271 Merge branch 'seeddms-5.0.x' into develop 2016-02-04 19:22:59 +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
52344c0842 fix Content-Type for javascript code 2016-01-28 16:50:06 +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
7efe61a059 add line break between users being active on a workflow 2016-01-27 06:49:19 +01:00
Uwe Steinmann
5863d962ac Merge branch 'seeddms-5.0.x' into develop 2015-12-16 09:30:16 +01:00
Uwe Steinmann
85e9dc25bb Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-11 20:35:20 +01:00
Uwe Steinmann
836fcd4457 remove all javascript from html output and place in a seperate file 
this requires to change the popover into bootbox
 2015-12-11 20:29:52 +01:00
Uwe Steinmann
f7b2d5b6d6 use the checkout space of the logged in user not the substituted user 2015-12-01 18:06:41 +01:00
Uwe Steinmann
348d40ad22 show filename as saved in database table 2015-11-30 20:47:07 +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
aa1f10af1c add word-break class to output of orig filename 
breaking long filenames will leave more space for the preview image
 2015-10-27 11:41:02 +01:00
Uwe Steinmann
50ef190ae7 Merge branch 'seeddms-5.0.x' into develop 2015-10-27 09:03:45 +01:00
Uwe Steinmann
15040a2f92 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-20 18:36:57 +02:00
Uwe Steinmann
af91b6813f do not use reference to array item, use index 2015-10-20 18:36:24 +02: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
88e0a57135 add ajax function for returning the timeline data 2015-10-19 13:15:20 +02:00
Uwe Steinmann
7ba956d760 Merge branch 'seeddms-5.0.x' into develop 2015-09-30 12:10:39 +02:00
Uwe Steinmann
c17d7246ad call hook for setting msg of timeline item 2015-09-29 12:12:01 +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
659f788de4 do not show subheader of timeline if empty 2015-09-23 15:50:04 +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
6a91429711 do not output timeline if no data is available 2015-09-22 10:32:33 +02:00
Uwe Steinmann
9db24f5e7d set height of timeline to 300px, limit max date to today 2015-09-22 10:20:11 +02:00
Uwe Steinmann
fcbb5f68fe Merge branch 'seeddms-5.0.x' into develop 2015-09-22 08:51:59 +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
94dbfdfd15 set msg of item in timeline to name of document 2015-09-21 18:09:30 +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
a7736397a8 pass $timeline instead of $document to printTimeline() 2015-09-21 16:47:47 +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
1004d5f1ee separate extraheader by js and css, only admins see timeline 2015-09-18 07:55:24 +02:00
Uwe Steinmann
b55627f213 add initial support for timeline of recent changes 2015-09-16 21:19:46 +02:00
Uwe Steinmann
c4f7223293 Merge branch 'seeddms-5.0.x' into develop 2015-08-07 13:13:14 +02:00
Uwe Steinmann
421bf3e81a add hooks (pre|post)DocumentInfos 2015-08-07 10:13:47 +02:00
Uwe Steinmann
de8726cccf Merge branch 'seeddms-5.0.x' into develop 2015-07-28 09:01:02 +02:00
Uwe Steinmann
6a555554be Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-07-22 09:26:49 +02:00
Uwe Steinmann
3dcda5e4ca fix typo in varialbe passed to hook 2015-07-15 07:26:18 +02:00
Uwe Steinmann
d0760b2925 place comment in left column on previous versions tab 2015-07-14 10:08:04 +02:00
Uwe Steinmann
5a3dec7c2e some reorganization of docinfo tab 
make some more room
 2015-07-14 10:00:39 +02:00
Uwe Steinmann
b011ecf3c6 same ul list for attributes of older versions 2015-07-08 15:39:03 +02:00
Uwe Steinmann
d146e04a13 some ul list for attributes of older versions 2015-07-08 15:37:37 +02:00
Uwe Steinmann
52559730d9 use new customizable preview converters 2015-06-25 19:52:02 +02:00
Uwe Steinmann
7ed7ae01ca set width of column for preview image to width of preview 2015-06-24 17:28:17 +02:00
Uwe Steinmann
6487db064a use same icons and output for version information 
Conflicts:
	views/bootstrap/class.ViewDocument.php
 2015-06-23 10:16:16 +02:00
Uwe Steinmann
bd007a6660 use same icons and output for version information 2015-06-23 10:15:19 +02:00
Uwe Steinmann
85ff032271 use same icons and output for version information 2015-06-23 10:14:33 +02:00
Uwe Steinmann
88df1cee82 move printProtocol() into class.Bootstrap.php 2015-06-23 09:53:14 +02:00
Uwe Steinmann
195add869c move printProtocol() into class.Bootstrap.php 
Conflicts:
	views/bootstrap/class.Bootstrap.php
	views/bootstrap/class.ViewDocument.php
 2015-06-23 09:52:29 +02:00