gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-07 07:34:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,022 Commits 7 Branches 78 Tags 37 MiB
56e7f567c7
Commit Graph

245 Commits

Author SHA1 Message Date
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
Uwe Steinmann
50ef190ae7 Merge branch 'seeddms-5.0.x' into develop 2015-10-27 09:03:45 +01:00
Uwe Steinmann
15040a2f92 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-20 18:36:57 +02:00
Uwe Steinmann
af91b6813f do not use reference to array item, use index 2015-10-20 18:36:24 +02:00
Uwe Steinmann
031129a31c Merge branch 'seeddms-5.0.x' into develop 2015-10-20 18:21:47 +02:00
Uwe Steinmann
2f9e015856 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-20 18:20:24 +02:00
Uwe Steinmann
88e0a57135 add ajax function for returning the timeline data 2015-10-19 13:15:20 +02:00
Uwe Steinmann
7ba956d760 Merge branch 'seeddms-5.0.x' into develop 2015-09-30 12:10:39 +02:00
Uwe Steinmann
c17d7246ad call hook for setting msg of timeline item 2015-09-29 12:12:01 +02:00
Uwe Steinmann
37f9771b97 Merge branch 'seeddms-5.0.x' into develop 2015-09-23 17:21:26 +02:00
Uwe Steinmann
42dbb30e22 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 16:03:15 +02:00
Uwe Steinmann
659f788de4 do not show subheader of timeline if empty 2015-09-23 15:50:04 +02:00
Uwe Steinmann
b0edf297a2 Merge branch 'seeddms-5.0.x' into develop 2015-09-22 16:01:09 +02:00
Uwe Steinmann
58731cfdde Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-22 15:59:47 +02:00
Uwe Steinmann
6a91429711 do not output timeline if no data is available 2015-09-22 10:32:33 +02:00
Uwe Steinmann
9db24f5e7d set height of timeline to 300px, limit max date to today 2015-09-22 10:20:11 +02:00
Uwe Steinmann
fcbb5f68fe Merge branch 'seeddms-5.0.x' into develop 2015-09-22 08:51:59 +02:00
Uwe Steinmann
272d9a43ee Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-21 18:10:07 +02:00
Uwe Steinmann
94dbfdfd15 set msg of item in timeline to name of document 2015-09-21 18:09:30 +02:00
Uwe Steinmann
6be0d179fc Merge branch 'seeddms-5.0.x' into develop 2015-09-21 16:58:25 +02:00
Uwe Steinmann
229d976113 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-21 16:58:14 +02:00
Uwe Steinmann
a7736397a8 pass $timeline instead of $document to printTimeline() 2015-09-21 16:47:47 +02:00
Uwe Steinmann
d54172d366 Merge branch 'seeddms-5.0.x' into develop 2015-09-18 08:00:06 +02:00
Uwe Steinmann
8ab6dda490 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-18 07:59:15 +02:00
Uwe Steinmann
1004d5f1ee separate extraheader by js and css, only admins see timeline 2015-09-18 07:55:24 +02:00
Uwe Steinmann
b55627f213 add initial support for timeline of recent changes 2015-09-16 21:19:46 +02:00
Uwe Steinmann
c4f7223293 Merge branch 'seeddms-5.0.x' into develop 2015-08-07 13:13:14 +02:00
Uwe Steinmann
421bf3e81a add hooks (pre|post)DocumentInfos 2015-08-07 10:13:47 +02:00
Uwe Steinmann
de8726cccf Merge branch 'seeddms-5.0.x' into develop 2015-07-28 09:01:02 +02:00
Uwe Steinmann
6a555554be Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-07-22 09:26:49 +02:00
Uwe Steinmann
3dcda5e4ca fix typo in varialbe passed to hook 2015-07-15 07:26:18 +02:00
Uwe Steinmann
d0760b2925 place comment in left column on previous versions tab 2015-07-14 10:08:04 +02:00
Uwe Steinmann
5a3dec7c2e some reorganization of docinfo tab 
make some more room
 2015-07-14 10:00:39 +02:00
Uwe Steinmann
b011ecf3c6 same ul list for attributes of older versions 2015-07-08 15:39:03 +02:00
Uwe Steinmann
d146e04a13 some ul list for attributes of older versions 2015-07-08 15:37:37 +02:00
Uwe Steinmann
52559730d9 use new customizable preview converters 2015-06-25 19:52:02 +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
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
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
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
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
48d5f38c4a show link to downloaѕ review/approval file 2015-06-11 21:32:36 +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
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
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