Commit Graph

930 Commits

Author SHA1 Message Date
Uwe Steinmann
4c794381e6 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-02-20 17:34:43 +01:00
Uwe Steinmann
410b36870a Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-20 17:22:26 +01:00
Uwe Steinmann
a6673fe908 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-20 17:21:24 +01:00
Uwe Steinmann
007f7c7f2c check if version is set 2017-02-20 15:34:23 +01:00
Uwe Steinmann
19f77a37c8 add missing changes which got lost during last rebase 2017-02-20 15:33:15 +01:00
Uwe Steinmann
6f0d9e5d5d move folders/documents propperly checks for access rights (Closes #309) 2017-02-18 07:55:40 +01:00
Uwe Steinmann
502b5c5414 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-16 15:26:46 +01:00
Uwe Steinmann
704fc28b34 comment, name must not be set, return json if requested 2017-02-16 14:54:55 +01:00
Uwe Steinmann
7d82b73208 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-13 12:12:07 +01:00
Uwe Steinmann
ba1d3c8c9b fix incluѕion of files 2017-02-08 16:38:04 +01:00
Uwe Steinmann
d5dc6b125d Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-08 15:52:00 +01:00
Uwe Steinmann
04a241111f remove imported folder if requested 2017-02-03 12:21:51 +01:00
Uwe Steinmann
8516d23684 add support for fine uploader 2017-01-31 17:27:53 +01:00
Uwe Steinmann
05e163a39d add support for fine uploader 2017-01-31 17:27:33 +01:00
Uwe Steinmann
3dd94a9eac do not check if file was uploaded, as this fails for fine uploader files 2017-01-31 17:19:12 +01:00
Uwe Steinmann
196725042d add support for fine-uploader as a replacement for the old jumploader 2017-01-30 13:17:58 +01:00
Uwe Steinmann
40956e9501 paѕs owner to controller 2017-01-25 12:24:47 +01:00
Uwe Steinmann
e280a6afa9 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-20 15:02:27 +01:00
Uwe Steinmann
cd745eb518 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-18 21:24:01 +01:00
Uwe Steinmann
6d9798753b set default access and owner 2017-01-18 20:58:52 +01:00
Uwe Steinmann
13973dd276 set default access for doc when uploading 2017-01-18 20:58:28 +01:00
Uwe Steinmann
88c06c2f37 add defaultAccessDocs 2017-01-18 20:58:03 +01:00
Uwe Steinmann
c63f994a5f Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-18 15:13:18 +01:00
Uwe Steinmann
47db85c175 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-18 15:11:45 +01:00
Uwe Steinmann
b8a7917c12 add '-' to allowed char in mimetype 2017-01-18 14:23:16 +01:00
Uwe Steinmann
56e7f567c7 enable turn off of updating document reception 2017-01-17 14:20:33 +01:00
Uwe Steinmann
f6d3e9785f Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-16 15:52:19 +01:00
Uwe Steinmann
c37910e473 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-16 15:12:16 +01:00
Uwe Steinmann
905eddabce add new configuration enableUpdateRevApp 2017-01-16 13:00:22 +01:00
Uwe Steinmann
b27b8ba7fd check access rights in controller, not before 2017-01-10 06:58:07 +01:00
Uwe Steinmann
95ebfe1657 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-09 21:13:42 +01:00
Uwe Steinmann
289e13b255 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-09 15:32:57 +01:00
Uwe Steinmann
60dd7f8516 check if preview and/or js cache is to be cleared 2017-01-09 10:56:32 +01:00
Uwe Steinmann
7d8f4f54c0 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-04 17:11:39 +01:00
Uwe Steinmann
d529b2d4b2 fix syntax error (Closes #304) 2017-01-01 19:29:20 +01:00
Uwe Steinmann
8d20d39a07 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-12-22 09:36:15 +01:00
Uwe Steinmann
c6d26ec3fa Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-12-15 06:42:15 +01:00
Uwe Steinmann
4147c29dd3 set availlanguages to empty array() if not set in configuration 2016-12-12 18:14:54 +01:00
Uwe Steinmann
7bf6ec003c Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-12-12 16:25:54 +01:00
Uwe Steinmann
6c7e634213 fix cleanup of new mimetype 2016-12-12 16:25:34 +01:00
Uwe Steinmann
13bab66b6f Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-12-08 18:21:08 +01:00
Uwe Steinmann
dfc0db8bc5 no longer send notif. to owner 2016-12-08 18:14:54 +01:00
Uwe Steinmann
902565fee4 merge notif. list to prevent duplicates 2016-12-08 18:14:24 +01:00
Uwe Steinmann
3f6f0dd818 do not send extra notif. to owner, send notif. of src and target forlder 2016-12-08 18:13:12 +01:00
Uwe Steinmann
30d85e03fc remove old, already commented code 2016-12-08 18:12:25 +01:00
Uwe Steinmann
5937d98cb3 do not send notif. to old owner, send notif. if access rights are inherited again 2016-12-08 18:11:35 +01:00
Uwe Steinmann
70a1a20070 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-12-08 15:43:07 +01:00
Uwe Steinmann
3ae469fd2b remove old notification code 2016-12-08 15:37:12 +01:00
Uwe Steinmann
edf32a9042 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-12-07 17:34:23 +01:00
Uwe Steinmann
af72e41cf3 check if mimetype has valid chars before saving new fulltext converter 2016-12-07 17:33:34 +01:00