Commit Graph

659 Commits

Author SHA1 Message Date
Uwe Steinmann
84a1879c85 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-07-06 22:18:23 +02:00
Uwe Steinmann
0aaf36bd0c make field for expired date larger 2015-07-06 21:54:03 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
8e2aeb7264 pass resultmode to view 2015-06-08 09:15:33 +02:00
Uwe Steinmann
83cdedad51 pass resultmode to view 2015-06-08 09:12:25 +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
4814c5cefe search for documents/folders only 2015-06-02 08:53:21 +02:00
Uwe Steinmann
1150b5cc68 search for documents/folders only 2015-06-02 08:53:08 +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
f86fe26eee add placeholder to ind reviewer select box 2015-05-19 13:27:53 +02:00
Uwe Steinmann
34bdb9cb21 add placeholder to ind reviewer select box 2015-05-19 13:27:22 +02:00
Uwe Steinmann
cb13a89c1a add checking for duplicates 2015-05-13 18:42:42 +02:00
Uwe Steinmann
259303fff1 add checking for duplicates 2015-05-13 17:38:20 +02:00
Uwe Steinmann
9c6094da02 correct wrong phrase if there are no group approvals/reviews 2015-05-08 08:32:40 +02:00
Uwe Steinmann
e996ecb2d7 correct wrong phrase if there are no group approvals/reviews 2015-05-08 08:32:09 +02:00
Uwe Steinmann
b0d8b42011 escape html code before output 2015-04-30 14:05:38 +02:00
Uwe Steinmann
14c16f25ce escape html code before output 2015-04-30 14:04:56 +02:00
Uwe Steinmann
3ed61ce6b8 fix calculated used disk space in percent 2015-04-27 21:29:51 +02:00
Uwe Steinmann
b2fcf4fd4b list only users in select box which are not hidden 2015-04-27 21:29:51 +02:00
Uwe Steinmann
02ef086bfe fix calculated used disk space in percent 2015-04-27 21:28:55 +02:00
Uwe Steinmann
902f418819 list only users in select box which are not hidden 2015-04-27 21:21:07 +02:00
Uwe Steinmann
4e4848c5d7 add more hooks for showing/editing attributes 2015-04-27 08:28:08 +02:00
Uwe Steinmann
23983081ea fix take over of approvers/reviewers from previous version 2015-04-23 17:12:08 +02:00
Uwe Steinmann
b07b65b574 get read access list for document not folder 2015-04-20 13:47:34 +02:00
Uwe Steinmann
fc7772f7d9 stay on extension pane after saving configuration 2015-04-16 08:12:50 +02:00
Uwe Steinmann
e91ce9d632 set proper active pane after saving configuration 2015-04-16 08:11:44 +02:00
Uwe Steinmann
f02917d5aa set proper active pane after saving configuration 2015-04-16 08:11:05 +02:00
Uwe Steinmann
de40aa816a printAttributeEditField() outputs textarea for longer values
up to 30 chars it remains an input field
2015-04-16 08:05:11 +02:00
Uwe Steinmann
46c2019ef2 nicer output of attribute values 2015-04-15 16:14:47 +02:00
Uwe Steinmann
b51b4713ae second parameter of printAttributeEditField() is attribute and not its
value anymore
2015-04-15 14:13:01 +02:00
Uwe Steinmann
7d7a21fc9e printAttributeEditField() takes a second parameter the attribute
this was the attribute value
2015-04-15 14:11:52 +02:00
Uwe Steinmann
ab07fbfef7 add hooks, put output of attribute into separate function 2015-04-14 19:38:50 +02:00
Uwe Steinmann
c36442303f add new attribute types to select boxes 2015-04-14 19:38:09 +02:00
Uwe Steinmann
db8e3bbfbb Merge branch 'seeddms-4.3.17' into develop 2015-04-14 06:21:12 +02:00
Uwe Steinmann
0994429edd issue warning if ordering of folder contents is != 's' 2015-04-08 06:43:31 +02:00
Uwe Steinmann
72c3207a75 Merge branch 'seeddms-4.3.17' into develop
Conflicts:
	Makefile
2015-03-30 16:40:24 +02:00
Uwe Steinmann
7ef7e13c4c show fields for user/group notification 2015-03-27 17:32:51 +01:00
Uwe Steinmann
234d333bfc fix selection of home folder 2015-03-20 08:40:30 +01: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
d2b26fafc4 fix key settings_passwordStrength_desc 2015-03-19 09:38:41 +01:00
Uwe Steinmann
67bd3171b4 approval/review log was mixed up 2015-03-18 11:54:01 +01:00
Uwe Steinmann
e8e24421b4 fix syntax error in javascript 2015-03-17 17:47:27 +01:00
Uwe Steinmann
cb3392c774 propperly take new workflow mode traditional_only_approval into account 2015-03-17 11:19:55 +01:00
Uwe Steinmann
4c41f560c3 reorganize code
make one single method which creates to add/update form
2015-03-17 09:54:59 +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
53697b37ff do not show copy clipboard icon if clipboard is turned off
was still visible in search result
2015-03-13 10:59:44 +01:00
Uwe Steinmann
89ef1a58ec view parameter enableClipboard has been renamed to enableclipboard 2015-03-13 09:31:48 +01:00
Uwe Steinmann
a87e145fda escape quotes in javascript for showing workflow graph 2015-03-11 19:27:09 +01:00
Uwe Steinmann
ed9fbe93e1 set current tab to last one selected when submitting data 2015-03-11 18:24:14 +01:00
Uwe Steinmann
c3b80c1b5d add new option enableNotificationWorkflow
turns on/off is mail is set to users/groups in next step of workflow
2015-03-11 18:11:41 +01:00
Uwe Steinmann
6d0a7d4f82 set tab last seen after submit new configuration 2015-03-11 17:48:10 +01:00