Commit Graph

4734 Commits

Author SHA1 Message Date
Uwe Steinmann
988f28c664 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-08-02 14:02:11 +02:00
Uwe Steinmann
9473d423a8 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-08-02 14:02:01 +02:00
Uwe Steinmann
3406739f94 add entry for 4.3.36 2017-08-02 14:01:41 +02:00
Uwe Steinmann
0ba02cc2a8 use only svg icons 2017-08-02 14:01:00 +02:00
Uwe Steinmann
2d1b1b1a03 add svg icon for pdf files 2017-08-02 14:00:42 +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
0dbf05334d add entry for 4.3.36 2017-08-02 10:56:46 +02:00
Uwe Steinmann
48e1bfa670 regard mandatory reviewers/approvers 2017-08-02 10:56:28 +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
ea8a695551 maySetReviewersApprovers() checks if review/approval has been done already 2017-08-02 10:53:50 +02:00
Uwe Steinmann
13845065d4 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-08-02 07:06:16 +02:00
Uwe Steinmann
ac184a030a Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-08-02 07:05:57 +02:00
Uwe Steinmann
0c3355ed9d no extra check enableVersionModificaton
is done by maySetReviewersApprovers()
2017-08-02 07:04:46 +02:00
Uwe Steinmann
4aef48e5f7 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-08-02 07:02:58 +02:00
Uwe Steinmann
b974ee0df2 add entry for 4.3.36 2017-08-02 06:49:01 +02:00
Uwe Steinmann
76508cb52b check with SeedDMS_AccessOperation for allowed operation 2017-08-02 06:47:48 +02:00
Uwe Steinmann
e0dcd86f5a add optional version number to mayEditOnline() 2017-08-02 06:46:44 +02:00
Uwe Steinmann
16461fef75 two column layout 2017-08-01 18:09:01 +02:00
Uwe Steinmann
00a91b621c Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-08-01 10:30:22 +02:00
Uwe Steinmann
5e640ad42b Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-08-01 10:30:09 +02:00
Uwe Steinmann
11f67105bd minor updates 2017-08-01 10:29:50 +02:00
Uwe Steinmann
22406501dd add entry for 4.3.36 2017-08-01 10:24:02 +02:00
Uwe Steinmann
64e75e8064 correct rootDir if not set propperly, set contentDir below rootDir 2017-08-01 10:22:42 +02:00
Uwe Steinmann
1339c36d67 do not add dir separator to contentDir if it is empty 2017-08-01 10:22:10 +02:00
Uwe Steinmann
a86985a4a0 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-08-01 09:08:55 +02:00
Uwe Steinmann
34b59ab4f6 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-08-01 09:08:45 +02:00
Uwe Steinmann
3697ab0da1 new phrases 2017-08-01 09:08:31 +02:00
Uwe Steinmann
abfc3a248d list number of files in drop folder, don't show menu if no files available 2017-08-01 09:03:58 +02:00
Uwe Steinmann
ca479f29d9 add entry for 5.1.3 2017-08-01 08:50:13 +02:00
Uwe Steinmann
e9c6c09fa1 fix typo 2017-08-01 08:47:53 +02:00
Uwe Steinmann
d16ec5d631 pass dropfolderfile to view 2017-08-01 07:58:27 +02:00
Uwe Steinmann
2958667600 pass folder id to DropFolderChooser::menuList 2017-08-01 07:58:05 +02:00
Uwe Steinmann
f35b9bf5c5 show preview image, link to out.AddDocument.php if folder is set 2017-08-01 07:57:16 +02:00
Uwe Steinmann
e1bd23b828 drop folder file can be passed by http request 2017-08-01 07:56:31 +02:00
Uwe Steinmann
ecc8cd9594 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-07-31 20:32:47 +02:00
Uwe Steinmann
b5c16a24c7 first check if $_GER[form] is set 2017-07-31 20:32:23 +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
a7c24043d4 add entry from 5.1.3 2017-07-31 14:49:16 +02:00
Uwe Steinmann
78e66b20d4 do not show quota info if turne off 2017-07-31 14:48:56 +02:00
Uwe Steinmann
5396829d7f take out echos 2017-07-31 14:23:16 +02:00
Uwe Steinmann
2a4b8ffcfc remove from process only if status[review], status[approval] is not set 2017-07-31 14:17:41 +02:00
Uwe Steinmann
f307658290 do not remove from process when none is checked 2017-07-31 14:16:45 +02:00
Uwe Steinmann
c6a69f399b separate removal of reviews and approvals 2017-07-31 13:21:56 +02:00
Uwe Steinmann
c32bff5074 separate removal of reviews and approval 2017-07-31 13:21:01 +02:00
Uwe Steinmann
485a6f7651 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-07-31 12:52:44 +02:00
Uwe Steinmann
48dc573e80 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-07-31 12:52:34 +02:00
Uwe Steinmann
35d24d9062 new phrases 2017-07-31 12:52:20 +02:00
Uwe Steinmann
b79cd1e9c6 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-07-31 12:42:50 +02:00
Uwe Steinmann
9cec7debe7 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-07-31 12:42:36 +02:00