Commit Graph

205 Commits

Author SHA1 Message Date
Uwe Steinmann
0fb14d4c6a more similar look of documents list 2016-08-03 14:47:06 +02:00
Uwe Steinmann
624a96ddde Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-08-03 12:33:19 +02:00
Uwe Steinmann
03ff5dfc50 remove unneeded echo statement 2016-08-03 12:16:51 +02:00
Uwe Steinmann
20476876ac Merge branch 'seeddms-5.0.x' into develop 2016-05-23 12:32:18 +02:00
Uwe Steinmann
fe0e67b2ad Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-05-23 12:30:54 +02:00
Uwe Steinmann
1c09327bc0 add preview function for audio files (not activated) 2016-05-09 08:21:21 +02:00
Uwe Steinmann
38f02a149e Merge branch 'seeddms-5.0.x' into develop 2016-05-03 06:40:50 +02:00
Uwe Steinmann
129b725414 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-05-03 06:32:54 +02:00
Uwe Steinmann
8a4948085a Merge branch 'seeddms-5.0.x' into develop 2016-04-28 12:24:47 +02:00
Uwe Steinmann
24e30529ab fix html markup 2016-04-26 18:20:22 +02:00
Uwe Steinmann
51ca23085a fix some html markup 2016-04-26 18:16:24 +02:00
Uwe Steinmann
fcf85a88e0 move inclusion of "SeedDMS/Preview.php" into view 2016-04-26 12:16:29 +02:00
Uwe Steinmann
4206c5ef59 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-04-22 16:40:29 +02:00
Uwe Steinmann
877f5c80ed output access rights even if inherited 2016-04-22 16:36:47 +02:00
Uwe Steinmann
829d0911f0 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-04-20 18:11:36 +02:00
Uwe Steinmann
0ece3ef69a fix edit attributes of older versions
link always pointed to latest version
2016-04-20 18:10:55 +02:00
Uwe Steinmann
e22f0e2065 use html_link() instead of plain html 2016-04-20 18:09:36 +02:00
Uwe Steinmann
a1cd739293 fix links to out.EditOnline.php and out.RemoveVersion.php 2016-04-20 15:49:40 +02:00
Uwe Steinmann
ae1bbffc64 fix link to out.EditOnline.php and out.RemoveVersion.php 2016-04-20 15:46:36 +02:00
Uwe Steinmann
ced19968aa output progressbar for receipt status 2016-03-24 15:42:18 +01:00
Uwe Steinmann
50cfb869e2 pass $document to mayEditVersion() 2016-03-23 16:53:32 +01:00
Uwe Steinmann
3ed43f3f09 Merge branch 'seeddms-5.0.x' into develop 2016-03-21 08:34:20 +01:00
Uwe Steinmann
4fcd0d0a72 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-21 08:34:08 +01:00
Uwe Steinmann
070edae476 do not add js code for timeline if not admin 2016-03-21 08:33:41 +01:00
Uwe Steinmann
7bd77ba43e Merge branch 'seeddms-5.0.x' into develop 2016-03-15 08:50:32 +01:00
Uwe Steinmann
fc0b7a4e16 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-15 08:48:03 +01:00
Uwe Steinmann
66ec6fb7ce add missing contentEnd() at end of page 2016-03-15 08:30:53 +01:00
Uwe Steinmann
d317388d18 Merge branch 'seeddms-5.0.x' into develop 2016-03-09 08:10:15 +01:00
Uwe Steinmann
9a319ef539 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-09 08:06:37 +01:00
Uwe Steinmann
1f76c2455a add link to EditOnline 2016-03-09 07:58:52 +01:00
Uwe Steinmann
f859b48a57 Merge branch 'seeddms-5.0.x' into develop 2016-03-09 06:42:30 +01:00
Uwe Steinmann
dc3958b456 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-09 06:40:14 +01:00
Uwe Steinmann
5471c17b0f better check if reviewer/approver still exist 2016-03-08 16:07:42 +01:00
Uwe Steinmann
51fa5d18e6 enhance AccessOperation by check_view_access()
all methods in SeedDMS_AccessOperation take the object to be checked
as the first parameter. Add new method check_view_access() which
checks if a view may be accessed based on the tables tblAros, tblAcos,
tblArosAcos
2016-03-03 07:39:04 +01:00
Uwe Steinmann
bc608eff07 Merge branch 'seeddms-5.0.x' into develop 2016-02-15 20:45:05 +01:00
Uwe Steinmann
202d994e1c Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-15 17:08:01 +01:00
Uwe Steinmann
54df39ba81 pass timeout to view and previewer 2016-02-15 10:57:37 +01:00
Uwe Steinmann
3b8d7a5271 Merge branch 'seeddms-5.0.x' into develop 2016-02-04 19:22:59 +01:00
Uwe Steinmann
76f5a89f92 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-02 09:48:18 +01:00
Uwe Steinmann
52344c0842 fix Content-Type for javascript code 2016-01-28 16:50:06 +01:00
Uwe Steinmann
51f80c0930 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-01-27 17:23:22 +01:00
Uwe Steinmann
7efe61a059 add line break between users being active on a workflow 2016-01-27 06:49:19 +01:00
Uwe Steinmann
5863d962ac Merge branch 'seeddms-5.0.x' into develop 2015-12-16 09:30:16 +01:00
Uwe Steinmann
85e9dc25bb Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-11 20:35:20 +01:00
Uwe Steinmann
836fcd4457 remove all javascript from html output and place in a seperate file
this requires to change the popover into bootbox
2015-12-11 20:29:52 +01:00
Uwe Steinmann
f7b2d5b6d6 use the checkout space of the logged in user not the substituted user 2015-12-01 18:06:41 +01:00
Uwe Steinmann
348d40ad22 show filename as saved in database table 2015-11-30 20:47:07 +01:00
Uwe Steinmann
f78e02e7e8 Merge branch 'seeddms-5.0.x' into develop 2015-10-27 11:43:40 +01:00
Uwe Steinmann
b7d1b0e663 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-27 11:42:39 +01:00
Uwe Steinmann
aa1f10af1c add word-break class to output of orig filename
breaking long filenames will leave more space for the preview image
2015-10-27 11:41:02 +01:00