Commit Graph

903 Commits

Author SHA1 Message Date
Uwe Steinmann
cde8e830f5 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-19 09:24:05 +02:00
Uwe Steinmann
ee5d01a1ee preset $placeholder to '' 2015-08-19 09:20:06 +02:00
Uwe Steinmann
4b94100cbe set users for showForm 2015-08-19 09:19:24 +02:00
Uwe Steinmann
4c6eb18528 Merge branch 'seeddms-5.0.x' into develop 2015-08-19 06:09:20 +02:00
Uwe Steinmann
83fbab5149 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-19 06:05:48 +02:00
Uwe Steinmann
4358eb9a39 load form for user on demand via ajax 2015-08-18 22:45:51 +02:00
Uwe Steinmann
69e262cea3 save state of jqtree widget
has no effect currently
2015-08-18 22:39:30 +02:00
Uwe Steinmann
92c24739bf Merge branch 'seeddms-5.0.x' into develop 2015-08-18 16:22:23 +02:00
Uwe Steinmann
973eb2453d Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-18 16:20:54 +02:00
Uwe Steinmann
5a1c4768af show also documents that needs to be reviewed/approved by the owner
hiding it here makes no sense, as review/approval can be done anyway
2015-08-18 16:10:33 +02:00
Uwe Steinmann
0c9a95aa44 input fields can have a placeholder 2015-08-13 22:21:47 +02:00
Uwe Steinmann
263d4b7caf fix input field name for new mimetype 2015-08-13 18:02:37 +02:00
Uwe Steinmann
9aa2637a71 user showTextField() 2015-08-13 18:00:48 +02:00
Uwe Steinmann
ad1d9f556f Merge branch 'seeddms-5.0.x' into develop 2015-08-13 17:56:15 +02:00
Uwe Steinmann
87f00973d4 use showText() 2015-08-13 17:55:44 +02:00
Uwe Steinmann
360b1be159 make textarea wider 2015-08-13 11:56:48 +02:00
Uwe Steinmann
f53413006b Merge branch 'seeddms-5.0.x' into develop 2015-08-13 11:55:19 +02:00
Uwe Steinmann
cccceaa78a Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-13 11:51:12 +02:00
Uwe Steinmann
4a69c1258e use variable length input fields 2015-08-13 11:50:49 +02:00
Uwe Steinmann
7e30ec4459 Merge branch 'seeddms-5.0.x' into develop 2015-08-13 08:18:57 +02:00
Uwe Steinmann
8d74f745f0 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-13 08:18:45 +02:00
Uwe Steinmann
3687cceb3f make fulltext search form at least 330px
needed because the user selection will be cut off otherwise
2015-08-13 08:17:39 +02:00
Uwe Steinmann
aa49c5b0b1 Merge branch 'seeddms-5.0.x' into develop 2015-08-10 21:58:16 +02:00
Uwe Steinmann
65fda6daee Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-10 21:53:27 +02:00
Uwe Steinmann
8ffcfab6e4 use new fulltext index interface with support for sqlitefts 2015-08-10 21:43:15 +02:00
Uwe Steinmann
b0413a0d46 engine for fulltext search can be configured 2015-08-10 21:41:51 +02:00
Uwe Steinmann
0ba67b2634 Merge branch 'seeddms-5.0.x' into develop 2015-08-09 07:19:27 +02:00
Uwe Steinmann
a74dd3f52b Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-09 07:18:23 +02:00
Uwe Steinmann
27ccf32206 allow to add file if group has to review 2015-08-09 07:16:24 +02:00
Uwe Steinmann
baa0d11d1c allow to add file if group has to approve 2015-08-09 07:16:04 +02:00
Uwe Steinmann
4c907dbf9e Merge branch 'seeddms-5.0.x' into develop 2015-08-07 20:08:29 +02:00
Uwe Steinmann
6d8930a360 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-07 14:30:07 +02:00
Uwe Steinmann
d7223bc521 fix link to downloadable file in printProtocol() 2015-08-07 14:29:32 +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
51a06c4ab6 Merge branch 'seeddms-5.0.x' into develop 2015-08-06 13:42:39 +02:00
Uwe Steinmann
53280de176 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-06 13:42:20 +02:00
Uwe Steinmann
b47fec8c74 place legend into its own column 2015-08-06 13:41:49 +02:00
Uwe Steinmann
55ccf3e987 Merge branch 'seeddms-5.0.x' into develop 2015-08-05 21:14:35 +02:00
Uwe Steinmann
122fcdb3c9 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-05 21:14:17 +02:00
Uwe Steinmann
7485a85077 set timeout for external commands when creating fulltext index 2015-08-05 21:11:21 +02:00
Uwe Steinmann
3d4f64a4e6 dangling links not needed anymore 2015-07-28 15:20:35 +02:00
Uwe Steinmann
de8726cccf Merge branch 'seeddms-5.0.x' into develop 2015-07-28 09:01:02 +02:00
Uwe Steinmann
d653c516ea pass backup dir to view 2015-07-28 07:50:02 +02:00
Uwe Steinmann
ff53a3e3e5 backup dir can be set 2015-07-28 07:29:08 +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
6060f1e98e new parameter $base for htmlStartPage(), propperly can hook in documentMenu 2015-07-15 22:32:19 +02:00
Uwe Steinmann
245bcc6a1e run hook folderNavigationMenu 2015-07-15 22:09:47 +02:00
Uwe Steinmann
8ed3264ae6 run hook folderNavigationMenu 2015-07-15 22:08:59 +02:00
Uwe Steinmann
a6d8ed829f add new parameter $base to htmlStartPage(), call hook for documentMenu propperly 2015-07-15 17:00:23 +02:00
Uwe Steinmann
0351305995 pass formkey when substituting user 2015-07-15 08:24:15 +02:00
Uwe Steinmann
71ed09ec0c pass previewer to printClipboard() 2015-07-15 07:26:47 +02:00
Uwe Steinmann
3dcda5e4ca fix typo in varialbe passed to hook 2015-07-15 07:26:18 +02:00
Uwe Steinmann
588caf9fde do not access _POST anymore 2015-07-15 07:25:45 +02:00
Uwe Steinmann
1609610541 pass previewer to printClipboard, call hook for menuitems, ...
backported from develop
2015-07-15 07:24:32 +02:00
Uwe Steinmann
f35ae2736a add new paramter autoLoginUser 2015-07-14 21:28:47 +02:00
Uwe Steinmann
9604076555 printAttributeEditField() can be passed a default value
document menu can be extended by a hook
2015-07-14 21:27:41 +02:00
Uwe Steinmann
d09605c6b9 pass null to printAttributeEditField if attribute is not set 2015-07-14 21:26:40 +02:00
Uwe Steinmann
a2179ca53e add new paramter autoLoginUser 2015-07-14 21:23:33 +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
a6541296a1 list documents to receipt and revise in menu task list 2015-07-09 18:29:34 +02:00
Uwe Steinmann
59fd3c7170 add missing space between tag attributes 2015-07-09 08:01:21 +02:00
Uwe Steinmann
b8e9d3a6dd add missing space between tag attributes 2015-07-09 08:00:43 +02:00
Uwe Steinmann
4290e705cf add tasks to menu if configured 2015-07-09 07:59:54 +02:00
Uwe Steinmann
cd3a239482 add new config parameter enableMenuTasks 2015-07-09 07:58:34 +02:00
Uwe Steinmann
bf95beb536 put tasks into submenus 2015-07-08 19:48:18 +02:00
Uwe Steinmann
a76e1de49e reorder lists 2015-07-08 18:59:14 +02:00
Uwe Steinmann
3583962085 new task menutask in op/op.Ajax.php which calls menuTask() 2015-07-08 18:58:38 +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
40cd60f985 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-07-08 07:33:02 +02:00
Uwe Steinmann
26982d1da0 show preview image in list 2015-07-08 07:26:16 +02:00
Uwe Steinmann
dd13814139 show preview image in list 2015-07-08 07:24:50 +02:00
Uwe Steinmann
dd939122de Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-07-08 06:55:51 +02:00
Uwe Steinmann
9ce168b4b6 list only documents to approve which have passed review
previously all documents that need to be approved some time were
listed. Even those documents which haven't passed review and cannot
be approved currently.
2015-07-08 06:54:45 +02:00
Uwe Steinmann
99bd517e2a list only documents to approve which have passed review
previously all documents that need to be approved some time were
listed. Even those documents which haven't passed review and cannot
be approved currently.
2015-07-08 06:51:15 +02:00
Uwe Steinmann
84a1879c85 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-07-06 22:18:23 +02:00
Uwe Steinmann
4ae913e307 make field for expired date larger 2015-07-06 22:18:11 +02:00
Uwe Steinmann
0aaf36bd0c make field for expired date larger 2015-07-06 21:54:03 +02:00
Uwe Steinmann
6b1124c23f pass folder object and not id to printDocumentChooser() 2015-07-06 16:09:25 +02:00
Uwe Steinmann
85174c6f45 create list of rejected documents 2015-07-03 20:52:55 +02:00
Uwe Steinmann
c70d0539b4 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-07-03 16:57:48 +02:00
Uwe Steinmann
4ac3ea014c set heading to add_approval 2015-07-03 16:57:37 +02:00
Uwe Steinmann
b74e4e154f set heading to add_approval 2015-07-03 16:57:01 +02:00
Uwe Steinmann
7902ab3fab Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-06-30 18:54:11 +02:00
Uwe Steinmann
77a5512f0b move code for easier merging 2015-06-30 18:53:40 +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
52559730d9 use new customizable preview converters 2015-06-25 19:52:02 +02:00
Uwe Steinmann
6b816f4d44 better handling of converters, added converters for preview
commands can also be deleted
2015-06-24 21:25:53 +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
f78af97b4a check if library folder is readable, pass folder to view 2015-06-24 12:26:08 +02:00
Uwe Steinmann
7f2bb15d49 remove some superflous chars 2015-06-23 19:10:14 +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
fd55efb3b9 show review/approval protocol 2015-06-23 10:03:15 +02:00
Uwe Steinmann
8db57d13b1 show review/approval protocol 2015-06-23 10:03:07 +02:00
Uwe Steinmann
7e7af661c7 show review/approval protocol 2015-06-23 10:02:45 +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
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
7cc3a0cf86 put icon before link to change status 2015-06-23 08:01:55 +02:00
Uwe Steinmann
fe31ebb2cc put icon before link to change status 2015-06-23 08:01:45 +02:00
Uwe Steinmann
06166d9c54 put icon before link to change status 2015-06-23 08:00:03 +02:00
Uwe Steinmann
b95f7ed91a new parameter overrideMimeType 2015-06-23 07:47:00 +02:00
Uwe Steinmann
f960bc81b4 new parameter overrideMimeType 2015-06-23 07:46:39 +02:00
Uwe Steinmann
515e95c227 new parameter overrideMimeType 2015-06-23 07:44:47 +02:00
Uwe Steinmann
3ed43b0a85 fix take over of reviewer/approver from previous version 2015-06-17 12:21:25 +02:00
Uwe Steinmann
42ce9fa21b add value to checkbox for exporting content 2015-06-17 11:32:46 +02:00
Uwe Steinmann
dbf31053c9 put export button into arcodion 2015-06-17 08:35:10 +02:00
Uwe Steinmann
5b03c3dcc3 show link to Indexer only if fulltext is enabled 2015-06-15 15:29:07 +02:00
Uwe Steinmann
a7ff808787 show link to Indexer only if fulltext is enabled 2015-06-15 15:28:53 +02:00
Uwe Steinmann
1d186d230b show link to Indexer only if fulltext is enabled 2015-06-15 15:28:25 +02:00
Uwe Steinmann
9eb9114ece receipt protocol just contains last entry, propperly check for access on
receiping  a version
2015-06-15 14:15:04 +02:00
Uwe Steinmann
d8df113676 add class 'help' 2015-06-15 09:24:56 +02:00
Uwe Steinmann
ae40f72b80 add class 'help' 2015-06-15 09:24:50 +02:00
Uwe Steinmann
4173dbcd20 add class 'help' 2015-06-15 09:24:25 +02:00
Uwe Steinmann
e7ed3f7789 add optional parameter class to contentContainerStart() 2015-06-15 09:21:20 +02:00
Uwe Steinmann
22b7b3ce96 add optional parameter class to contentContainerStart() 2015-06-15 09:21:13 +02:00
Uwe Steinmann
ae481e6ac9 add optional parameter class to contentContainerStart() 2015-06-15 09:20:33 +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
42d822a48d output link to approval/review file 2015-06-12 11:23:44 +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
fcddfb0162 allow to upload a file with each review/approval
Conflicts:
	op/op.ApproveDocument.php
	op/op.ReviewDocument.php
2015-06-11 21:37:41 +02:00
Uwe Steinmann
48d5f38c4a show link to downloaѕ review/approval file 2015-06-11 21:32:36 +02:00
Uwe Steinmann
d36ba8d906 allow to upload a file with each review/approval 2015-06-11 21:32:29 +02:00
Uwe Steinmann
220329c1b8 allow to upload a file with each review/approval 2015-06-11 21:30:56 +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
2fceade3a2 show docs in root folder of document chooser 2015-06-11 11:27:14 +02:00
Uwe Steinmann
0c9714c37c show docs in root folder of document chooser 2015-06-11 11:27:07 +02:00
Uwe Steinmann
f02734b063 show docs in root folder of document chooser 2015-06-11 11:25:14 +02:00
Uwe Steinmann
45a9373bdd include DocumentChooser relative to out
this makes it possible to include the document chooser even in
op/op.xxx.php files
2015-06-11 07:56:04 +02:00
Uwe Steinmann
0e8a385b6d allow context sensitive help files 2015-06-11 06:42:33 +02:00
Uwe Steinmann
269355bb43 allow context sensitive help files 2015-06-11 06:42:28 +02:00
Uwe Steinmann
e527862c9d allow context sensitive help files 2015-06-11 06:41:49 +02:00
Uwe Steinmann
6809645256 take out download of version info, take out next revision unless
document is released
2015-06-09 21:35:10 +02:00
Uwe Steinmann
7791ae1b0d open the right tab when jumping to ViewDocument 2015-06-09 11:19:16 +02:00
Uwe Steinmann
907c825dd5 open the right tab when jumping to ViewDocument 2015-06-09 11:18:53 +02:00
Uwe Steinmann
ffa03ead43 open the right tab when jumping to ViewDocument 2015-06-09 11:18:08 +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
82190c7d0e check for current tab 2015-06-09 09:00:22 +02:00