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 |
|
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
|
da0b3e71b3
|
approval can be added again
|
2015-06-08 21:58:17 +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
|
c2e2b1e9be
|
take resultmode from view parameters
|
2015-06-08 09:10:34 +02:00 |
|
Uwe Steinmann
|
4b23765042
|
show button to approve document if status is null
was only shown if the status of the document was S_APP_DRAFT
|
2015-06-08 09:09:03 +02:00 |
|
Uwe Steinmann
|
13a977f84f
|
add export button if search returned documents
|
2015-06-02 17:29:33 +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
|
ec78639d94
|
do not hide review if workflow mode is traditional_only_approve
otherwise old documents which are still in review can't be reviewed
anymore
|
2015-06-02 10:18:37 +02:00 |
|
Uwe Steinmann
|
1123611371
|
rename mayOverwriteStatus() to mayOverrideStatus()
|
2015-06-02 10:04:35 +02:00 |
|
Uwe Steinmann
|
1bc5e6116c
|
document status S_DRAFT can be set
|
2015-06-02 10:04:01 +02:00 |
|
Uwe Steinmann
|
d9d4d89a27
|
set initial document status
|
2015-06-02 10:02:46 +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
|
bd08e9b125
|
search for documents/folders only
|
2015-06-02 08:52:36 +02:00 |
|
Uwe Steinmann
|
68e3045da2
|
make table condensed to save some space
|
2015-06-01 08:40:03 +02:00 |
|
Uwe Steinmann
|
d5e9c7532a
|
fix error in calling hook showDocumentContentAttribute, show if document was checked out
|
2015-05-29 20:48:27 +02:00 |
|
Uwe Steinmann
|
5c94655bd7
|
allow to show partial trees
|
2015-05-29 20:47:46 +02:00 |
|
Uwe Steinmann
|
c48030d54e
|
add more parameter to printDocumentChooser()
|
2015-05-29 20:47:03 +02:00 |
|
Uwe Steinmann
|
13babfa3f9
|
add field for selecting a document from the library
|
2015-05-29 20:46:25 +02:00 |
|
Uwe Steinmann
|
b8d06babee
|
add setting for library folder
|
2015-05-29 20:42:37 +02:00 |
|
Uwe Steinmann
|
3bc72a46df
|
do not include jquery-cookie/jquery.cookie.js
it's currently not needed and not available
|
2015-05-21 22:10:06 +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
|
5e846059f7
|
replace '/' by ', ' for better line break in header
|
2015-05-21 15:58:10 +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
|
f76536b0a4
|
set some new icons
|
2015-05-20 13:21:05 +02:00 |
|
Uwe Steinmann
|
536ead64ac
|
allow to substitute user for regular users
|
2015-05-19 19:44:18 +02:00 |
|
Uwe Steinmann
|
a80f4090af
|
add filter for documents in revision
|
2015-05-19 19:41:40 +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 |
|