gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2026-01-15 22:06:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,023 Commits 7 Branches 94 Tags 67 MiB
c142e68c5f
Commit Graph

322 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
03ff5dfc50 remove unneeded echo statement 2016-08-03 12:16:51 +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
129b725414 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-05-03 06:32:54 +02:00
Uwe Steinmann
24e30529ab fix html markup 2016-04-26 18:20:22 +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
a1cd739293 fix links to out.EditOnline.php and out.RemoveVersion.php 2016-04-20 15:49:40 +02: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
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
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
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
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
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
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
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
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
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
c17d7246ad call hook for setting msg of timeline item 2015-09-29 12:12:01 +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
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
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
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
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
421bf3e81a add hooks (pre|post)DocumentInfos 2015-08-07 10:13:47 +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
b011ecf3c6 same ul list for attributes of older versions 2015-07-08 15:39:03 +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
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
Uwe Steinmann
73254d7346 move printProtocol() into class.Bootstrap.php 2015-06-23 09:49:34 +02:00
Uwe Steinmann
3aeccf5a18 backport printProtocol() 
Conflicts:
	views/bootstrap/class.ViewDocument.php
 2015-06-23 09:22:27 +02:00
Uwe Steinmann
2969166155 backport printProtocol() 2015-06-23 09:18:36 +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
a4f006971a fix status output for reviews, fix link to approval files 2015-06-12 11:15:03 +02:00
Uwe Steinmann
bd475c6bd3 add link to review/approval files 2015-06-12 11:12:31 +02:00
Uwe Steinmann
212e345cdc use buttons for downloading review/approval file 2015-06-12 08:04:23 +02:00
Uwe Steinmann
48d5f38c4a show link to downloaѕ review/approval file 2015-06-11 21:32:36 +02:00
Uwe Steinmann
4b0db52bdf show link to downloaѕ review/approval file 2015-06-11 21:30:30 +02:00
Uwe Steinmann
dc20e609c7 minor fix in comment to easy merging 2015-06-11 14:07:17 +02:00
Uwe Steinmann
e0fdb21986 check for currenttab 2015-06-09 09:18:57 +02:00
Uwe Steinmann
887690336d check for currenttab 2015-06-09 09:18:29 +02:00
Uwe Steinmann
855b9695cd approval can be submitted even after status S_DRAFT_APP has been left 2015-06-09 06:40:35 +02:00
Uwe Steinmann
56667f9005 approval can be submitted even after status S_DRAFT_APP has been left 2015-06-09 06:39:11 +02:00
Uwe Steinmann
fe47ee86cc exiting review will not be hidden even if workflow mode is 
traditional_only_approve
 2015-06-02 10:23:50 +02:00
Uwe Steinmann
98b896a545 exiting review will not be hidden even if workflow mode is 
traditional_only_approve
 2015-06-02 10:22:21 +02:00
Uwe Steinmann
967f85a463 replace '/' by ', ' for better line break in header of table 2015-05-21 16:00:03 +02:00
Uwe Steinmann
3002cb3f28 replace '/' by ', ' for better line break in header of table 2015-05-21 15:59:32 +02:00
Uwe Steinmann
555b586cda replace '/' by ', ' for better line break in table header 2015-05-21 15:44:59 +02:00
Uwe Steinmann
b82b6b10f3 replace '/' by ', ' for better line break in table header 2015-05-21 15:44:18 +02:00
Uwe Steinmann
4e4848c5d7 add more hooks for showing/editing attributes 2015-04-27 08:28:08 +02:00
Uwe Steinmann
46c2019ef2 nicer output of attribute values 2015-04-15 16:14:47 +02:00
Uwe Steinmann
ab07fbfef7 add hooks, put output of attribute into separate function 2015-04-14 19:38:50 +02:00
Uwe Steinmann
cb81eb7db4 Merge branch 'seeddms-4.3.16' into develop 
Conflicts:
	Makefile
	views/bootstrap/class.UsrMgr.php
 2015-03-20 08:32:29 +01:00
Uwe Steinmann
67bd3171b4 approval/review log was mixed up 2015-03-18 11:54:01 +01:00
Uwe Steinmann
0335cc8bcd Merge branch 'seeddms-4.3.15' into develop 
Conflicts:
	Makefile
	views/bootstrap/class.Search.php
	views/bootstrap/class.Settings.php
 2015-03-17 06:52:33 +01:00
Uwe Steinmann
56b57179f4 use new translation keys add_review and add_approval 2015-03-16 10:37:15 +01:00
Uwe Steinmann
8f96bbaa1d workflow mode can be traditional without review 2015-03-16 08:58:10 +01:00
Uwe Steinmann
8809086014 Merge branch 'seeddms-4.3.13' into develop 2014-11-24 19:42:18 +01:00
Uwe Steinmann
8af69d9cfa Download of documents whose content is gone will not be possible anymore (Bug #185) 2014-11-24 19:23:26 +01:00
Uwe Steinmann
15c5392ed8 Merge branch 'seeddms-4.3.11' into develop 
Conflicts:
	Makefile
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
 2014-11-13 09:21:08 +01:00
Uwe Steinmann
2eb4408111 add missing space between icon and text on button 2014-11-13 09:01:39 +01:00
Uwe Steinmann
99590a322d use new method getValueAsArray() for showing attributes 2014-11-13 08:21:49 +01:00
Uwe Steinmann
f13ef894b2 Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	Makefile
	op/op.RemoveDocument.php
	op/op.UpdateDocument.php
	out/out.RemoveDocument.php
 2014-06-04 07:58:06 +02:00
Uwe Steinmann
0717db2926 do not set expiration in version box 2014-06-03 17:52:01 +02:00
Uwe Steinmann
1fcc786d25 Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
	SeedDMS_Core/Core/inc.ClassUser.php
	op/op.AddDocument.php
	styles/bootstrap/application.css
	views/bootstrap/class.UsrMgr.php
 2014-05-22 08:21:22 +02:00
Uwe Steinmann
bfb6620b3b show only last approval status 2014-05-22 06:46:44 +02:00
Uwe Steinmann
c1f5a31f13 Merge branch 'seeddms-4.3.6' into develop 
Conflicts:
	Makefile
 2014-03-18 16:55:06 +01:00
Uwe Steinmann
b078102c19 use configured preview image width 2014-03-18 10:55:24 +01:00
Uwe Steinmann
a3cd77dd17 show reverse document links 2014-03-18 07:07:12 +01:00
Uwe Steinmann
cf867792b2 Merge branch 'seeddms-4.3.2' into develop 2013-11-24 18:20:36 +01:00
Uwe Steinmann
fcffe34047 list all approval/review logs if admin 2013-10-06 08:08:41 +02:00
Uwe Steinmann
544cc2669f allow members of a group to approve a document if user is owner 
only if enableOwnerRevApp is set in the settings
 2013-09-27 08:25:37 +02:00
Uwe Steinmann
4c514a23b6 Merge branch 'seeddms-4.3.1' into develop 
Conflicts:
	Makefile
 2013-09-20 21:40:22 +02:00
Uwe Steinmann
08008551b9 replace hard coding strings with translation 2013-09-20 21:05:46 +02:00
Uwe Steinmann
b7f20daa26 use translation for hardcoded strings 2013-09-20 20:56:46 +02:00
Uwe Steinmann
58fdef13eb Merge branch 'seeddms-4.3.1' into develop 2013-09-20 13:45:33 +02:00
Uwe Steinmann
1b86aa6727 check for _enableOwnerRevApp before showing the approve/review button 2013-09-19 14:27:09 +02:00
Uwe Steinmann
c240a0ebec Merge branch 'develop' into hooks 2013-08-05 14:56:43 +02:00
Uwe Steinmann
bf01a83a05 show plain workflow action name if translation cannot be found 2013-08-05 14:55:53 +02:00
Uwe Steinmann
2979fc9648 Merge branch 'develop' into hooks 
Conflicts:
	views/bootstrap/class.ViewFolder.php
 2013-07-19 23:14:29 +02:00
Uwe Steinmann
82d5863591 uncomment code to set expiration date 2013-06-17 07:12:02 +02:00
Uwe Steinmann
2fe6e7ac82 Merge branch 'develop' into hooks 2013-05-28 06:31:59 +02:00
Uwe Steinmann
854ca658f9 added missing space on button 2013-05-28 06:28:33 +02:00
Uwe Steinmann
df35579ea6 Merge branch 'develop' into hooks 2013-05-17 09:47:14 +02:00
Uwe Steinmann
2fe12295ea take over recent changes in 4.3.0 after merge with 4.2.2 2013-05-17 09:46:16 +02:00
Uwe Steinmann
9f945b2714 Merge branch 'seeddms-4.2.2' into develop 
Conflicts:
	CHANGELOG
	views/bootstrap/class.ViewDocument.php
 2013-05-17 09:42:33 +02:00
Uwe Steinmann
e36d4c0094 fix approving of documents 
The variable $status was overridden in the the status log if logged
in as admin. This causse problems whenever was allow to review/approve
documents. All other users where not affected because the don't see
the status log
 2013-05-17 09:27:15 +02:00
Uwe Steinmann
8adb1ad5f6 Merge branch 'develop' into hooks 2013-04-30 19:27:33 +02:00
Uwe Steinmann
492c08e397 move tab pane into right page column 2013-04-30 19:26:33 +02:00
Uwe Steinmann
1f73a6150e Merge branch 'develop' into hooks 2013-04-30 19:20:17 +02:00
Uwe Steinmann
29b5dd476a make sure preview for related document is created before showing 2013-04-30 18:36:24 +02:00
Uwe Steinmann
a1f57d3e73 use some icon for editing comments 2013-04-30 18:19:28 +02:00
Uwe Steinmann
57590fef86 show review/approval tab only if version has reviewer or approver 2013-04-30 18:14:05 +02:00
Uwe Steinmann
f2a37f3e0e remove link on current version for setting the expiration date 
the expiration date can only be set for the document
 2013-04-30 17:24:45 +02:00
Uwe Steinmann
c64dc58a77 Merge branch 'seeddms-4.2.1' into develop 2013-04-30 08:40:38 +02:00
Uwe Steinmann
1ef343903c show expiration date; show login on review/approval page 2013-04-30 08:36:53 +02:00
Uwe Steinmann
025e88d5af add icon for setting approver/reviewer 2013-04-30 08:02:53 +02:00
Uwe Steinmann
b4ab7ace36 better icon for version information download 2013-04-29 19:55:50 +02:00
Uwe Steinmann
fdb82c7abb use better icon for version information download 2013-04-29 19:52:11 +02:00
Uwe Steinmann
1f4dde6b59 show preview of document files too 2013-04-29 19:32:55 +02:00
Uwe Steinmann
8a9099bbcb various ui improvements 2013-04-23 19:03:56 +02:00
Uwe Steinmann
ea79961d85 Merge branch 'develop' into hooks 2013-04-22 10:48:06 +02:00
Uwe Steinmann
9885e26f96 put save icon on all save buttons 2013-04-19 15:22:25 +02:00
Uwe Steinmann
7edf2cef00 call parent::show 2013-04-18 22:20:28 +02:00
Uwe Steinmann
57c58a09c7 place a message on the page if document has a waiting workflow transition 2013-04-18 13:38:02 +02:00
Uwe Steinmann
fd1d5fa2cf use function filterDocumentLinks() from class SeedDMS_Core_DMS 2013-04-10 15:49:54 +02:00
Uwe Steinmann
0565e9c55d fix code to determine if user is required for review 2013-04-08 09:12:56 +02:00
Uwe Steinmann
b95597c8ae show number of attachments and related documents 
it is shown behind the tab title for related documents and attachments
 2013-03-28 10:18:49 +01:00
Uwe Steinmann
759484841a do not access full name of user if he was deleted 2013-03-26 20:30:39 +01:00
Uwe Steinmann
b4ea1a922d pass current document to pageNavigation() 
pageNavigation() still uses a global variable $document which is
replaced by a parameter passed to the function. All calls of
pageNavigation() needs a third parameter with the document.
 2013-03-08 17:55:14 +01:00
Uwe Steinmann
728760f78a show workflow steps (Bug #1) 
even after the workflow has ended
 2013-03-08 14:21:33 +01:00
Uwe Steinmann
63bf420133 added colon after property name 2013-02-16 19:43:39 +01:00
Uwe Steinmann
73c6ff9427 major name change from letodms to seeddms 2013-02-14 12:10:53 +01:00
steinm
befb3afad7 - use LetoDMS_Core_File::format_filesize() 2013-02-08 08:10:03 +00:00
steinm
3833e0da1a - added title tag to icons 
- show id if logged in as admin
 2013-02-07 21:40:46 +00:00
steinm
55ec35b5b8 - do not show meta data without a value (comment, ..) 
- show access rights if admin
 2013-02-06 13:58:15 +00:00
steinm
27dfd15814 - replace some icons 
- added override status
 2013-02-02 16:00:37 +00:00
steinm
a21c20c7c1 put current version onto document tab 2013-01-28 10:44:53 +00:00
steinm
6c18add303 - fixed list of attributes 
- added more icons on buttons
- put icons into link
 2013-01-25 07:34:54 +00:00
steinm
7582c2bd11 - put icons on remove/rewind workflow buttons 2013-01-24 10:47:32 +00:00
steinm
8dc42ee730 added new tab for workflow actions 
added icons to document content actions
 2013-01-24 09:39:14 +00:00
steinm
c5ddc59c51 do not use hard coded path for cache dir 2012-12-19 10:28:36 +00:00
steinm
d4d366d5aa new dir with different views 2012-12-14 07:53:13 +00:00