Uwe Steinmann
9e4b80e25b
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
2017-08-02 12:14:14 +02:00
Uwe Steinmann
5ec13f02af
Merge branch 'seeddms-5.0.x' into seeddms-5.1.x
2017-08-02 10:57:20 +02:00
Uwe Steinmann
efbc30c0dd
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
2017-08-02 10:57:10 +02:00
Uwe Steinmann
c54faf8f90
regard mandatory reviewers/approvers
...
the owner of the document may not remove mandatory reviewers/approvers
anymore. Only admin may do that, it he/she is not the owner.
2017-08-02 10:54:40 +02:00
Uwe Steinmann
8f59babaad
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
2017-08-01 08:37:31 +02:00
Uwe Steinmann
85cc7c017f
send mails to reviewer and approver
2017-08-01 08:36:17 +02:00
Uwe Steinmann
e8b09b3f03
do not send notification to owner anymore
...
was sent when current user != owner
2017-08-01 08:04:46 +02:00
Uwe Steinmann
05671428e1
file in drop folder can be shown in menu as item
2017-07-31 20:30:59 +02:00
Uwe Steinmann
2de7d8931a
set status[receipt] and status[revision] to empty array if not set
2017-07-31 14:22:12 +02:00
Uwe Steinmann
596cb2afd6
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
2017-07-31 14:18:18 +02:00
Uwe Steinmann
f307658290
do not remove from process when none is checked
2017-07-31 14:16:45 +02:00
Uwe Steinmann
afefe1d66c
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
2017-07-31 11:49:43 +02:00
Uwe Steinmann
2d2dd8f1bf
docs, folders etc. can be transferred
2017-07-31 11:28:39 +02:00
Uwe Steinmann
67f2d70ce4
fix uploading of attachments
2017-07-31 11:24:42 +02:00
Uwe Steinmann
e953d9dcbb
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
2017-07-28 15:12:00 +02:00
Uwe Steinmann
d8ae673270
finish removal from process
2017-07-28 14:57:17 +02:00
Uwe Steinmann
dee74c96e6
add new action 'removefromprocesses'
2017-07-28 12:34:37 +02:00
Uwe Steinmann
26cb15fe21
verify status after setting revisors
2017-07-21 11:48:32 +02:00
Uwe Steinmann
09dd448b40
set right message when removing revisor
2017-07-20 18:22:33 +02:00
Uwe Steinmann
a846bcf633
replace sql statement by function in SeedDMS_Core_Document
2017-07-20 18:21:24 +02:00
Uwe Steinmann
7c01cadb2f
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
2017-07-20 17:05:25 +02:00
Uwe Steinmann
2fe4724bfd
set $indexconf to null if fulltext is disabled
2017-07-20 17:04:26 +02:00
Uwe Steinmann
b855389965
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
2017-07-13 18:08:56 +02:00
Uwe Steinmann
a0651239dd
Merge branch 'seeddms-5.0.x' into seeddms-5.1.x
2017-07-13 18:03:15 +02:00
Uwe Steinmann
e029e8e55a
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
2017-07-13 17:56:31 +02:00
Uwe Steinmann
d6e10dddd6
pass $content to controller, not $latestContent
...
$latestContent and $content are different objects. If $latestContent
is passed to the controller, its status will be updated in the object
but $content has still the old status. Getting the status later on
from $content, still returns the old content.
2017-07-13 14:55:51 +02:00
Uwe Steinmann
6e37e1ded6
fix check for new content status
2017-07-13 14:11:04 +02:00
Uwe Steinmann
f1cfa81c39
set splash messages after succesful saving the data
2017-07-13 08:49:50 +02:00
Uwe Steinmann
c26d13484f
fix regex expression
2017-07-10 10:32:21 +02:00
Uwe Steinmann
99682a11d1
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
2017-07-10 07:50:33 +02:00
Uwe Steinmann
258c3fae0b
change field name of attributes to 'attributes_version'
...
makes much more sense because the attributes are version attributes.
2017-06-29 16:32:42 +02:00
Uwe Steinmann
2a38d713b8
get approval status before sending notification mails
...
the approval status was simply not known because part of the code
went into the controller
2017-06-29 15:34:32 +02:00
Uwe Steinmann
919f4cb39c
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
2017-06-26 10:20:48 +02:00
Uwe Steinmann
31ed9a729f
remove old code
2017-06-24 07:16:13 +02:00
Uwe Steinmann
b59b6a0cfb
pass initial status from settings to updateDocument
2017-06-14 14:04:38 +02:00
Uwe Steinmann
652e7a82af
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
2017-06-13 14:48:55 +02:00
Uwe Steinmann
778f94f0d1
use AddDocument controller when uploading a document
...
this will make sure all hooks are being called
2017-06-09 12:29:20 +02:00
Uwe Steinmann
b406d31ea0
add menu tasks including checkbox in settings for enabling it
2017-05-12 18:09:53 +02:00
Uwe Steinmann
add8c5ae2e
propperly set status in reject mail
2017-05-12 13:25:58 +02:00
Uwe Steinmann
092967004a
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
2017-05-12 08:23:42 +02:00
Uwe Steinmann
8e69893e89
move updating document into controller
2017-05-04 13:48:07 +02:00
Uwe Steinmann
3cc572a1cd
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
2017-05-02 06:47:42 +02:00
Uwe Steinmann
fe13c6cee1
move code into controller
2017-04-27 17:21:05 +02:00
Uwe Steinmann
6ee6e3fde2
take out enableAttachmentUpload
2017-04-27 17:19:49 +02:00
Uwe Steinmann
b1d5548853
also upload attachment if passed
2017-04-27 06:51:43 +02:00
Uwe Steinmann
d2fc9b534f
add enableMultiUpload and enableAttachmentUpload
2017-04-27 06:50:12 +02:00
Uwe Steinmann
dae6b2afde
fix parameter of hooks
2017-04-20 10:03:53 +02:00
Uwe Steinmann
5484c47ebd
pass null as first parameter of hooks, will later be the controller
2017-04-20 10:01:15 +02:00
Uwe Steinmann
1a901f47f3
fix reges for mimetype
2017-04-20 09:59:23 +02:00
Uwe Steinmann
f33b70c0db
fix regex for mimetypes
2017-04-20 09:58:46 +02:00