Commit Graph

1352 Commits

Author SHA1 Message Date
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
47c2083fe6 do not set min/max anymore as it can't be changed afterwards 2015-10-20 18:15:08 +02:00
Uwe Steinmann
f83ae3eda1 printTimeline() retrieves data from ajax 2015-10-19 13:15:52 +02:00
Uwe Steinmann
88e0a57135 add ajax function for returning the timeline data 2015-10-19 13:15:20 +02:00
Uwe Steinmann
002fa8df29 get timeline data in ajax call 2015-10-19 13:14:14 +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
ddfea8f3cb Merge branch 'seeddms-5.0.x' into develop 2015-09-28 12:35:18 +02:00
Uwe Steinmann
1ab19f6831 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-28 12:35:04 +02:00
Uwe Steinmann
23362f8146 remove old code, set data-query in div.ajax elements
load an initial user when the page is opened
2015-09-25 16:17:23 +02:00
Uwe Steinmann
fd92628c30 Merge branch 'seeddms-5.0.x' into develop 2015-09-23 18:11:17 +02:00
Uwe Steinmann
d43dc75207 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 18:05:47 +02:00
Uwe Steinmann
ca3970c9c3 fix setting date in timeline 2015-09-23 18:05:30 +02:00
Uwe Steinmann
4012122e5e Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 18:00:16 +02:00
Uwe Steinmann
dba8e78dc8 reformat datetime for timeline 2015-09-23 17:59:39 +02:00
Uwe Steinmann
37f9771b97 Merge branch 'seeddms-5.0.x' into develop 2015-09-23 17:21:26 +02:00
Uwe Steinmann
874066a7fc Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 17:21:17 +02:00
Uwe Steinmann
b456b02fbd add timeline to admin menu 2015-09-23 17:11:09 +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
42b5162ca4 Merge branch 'seeddms-5.0.x' into develop 2015-09-23 14:43:13 +02:00
Uwe Steinmann
10c5086307 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 14:13:56 +02:00
Uwe Steinmann
617d18d7d1 timeline can be filtered by type of items 2015-09-23 14:12:30 +02:00
Uwe Steinmann
06691a7d6f set className of items in timeline 2015-09-23 14:12:07 +02:00
Uwe Steinmann
c7e0702c97 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 12:59:53 +02:00
Uwe Steinmann
bf0702709e show creation date in info section 2015-09-23 12:57:49 +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
88d973f496 turn off selectable items in timeline 2015-09-22 10:55:52 +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
619d2b5ca3 limit timeline to date range 2015-09-22 10:16:56 +02:00
Uwe Steinmann
c8b007a1af timeline can be limited to date range 2015-09-22 10:16:26 +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
f82dc7558b Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-21 17:25:56 +02:00
Uwe Steinmann
a326421ac2 take out today from timeline 2015-09-21 17:20:10 +02:00
Uwe Steinmann
1de65573ec make chart for timeline higher 2015-09-21 17:19:52 +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
fc909100d2 add link to timeline, move version info into last line 2015-09-21 16:47:05 +02:00
Uwe Steinmann
c385d86a60 add timeline over all documents 2015-09-21 16:46:17 +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
71ba7412ce split extraheader into js and css, msg in timeline can be translated 2015-09-18 07:53:20 +02:00
Uwe Steinmann
b55627f213 add initial support for timeline of recent changes 2015-09-16 21:19:46 +02:00
Uwe Steinmann
f11738fbb1 show preview of file and date of creation 2015-09-03 15:16:20 +02:00
Uwe Steinmann
5a534e6b71 use translation for text when modal boxes are loading its content 2015-09-03 15:15:12 +02:00
Uwe Steinmann
07053ca7e9 check for includecontent checkbox and pass it to url 2015-08-25 16:44:07 +02:00
Uwe Steinmann
8c0377aa39 Merge branch 'seeddms-5.0.x' into develop 2015-08-21 11:10:23 +02:00
Uwe Steinmann
2be77ac0e9 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-21 11:10:05 +02:00
Uwe Steinmann
8256b61e36 do not output info if no user is selected 2015-08-21 11:09:38 +02:00
Uwe Steinmann
b7de0f61c7 Merge branch 'seeddms-5.0.x' into develop 2015-08-20 22:38:08 +02:00
Uwe Steinmann
cd3ca37885 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-20 22:37:50 +02:00
Uwe Steinmann
0ae71871ef fix php warning in getProgressBar() 2015-08-20 16:22:05 +02:00
Uwe Steinmann
6e80f025cf Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-20 15:55:53 +02:00
Uwe Steinmann
26819ce00e add method info(), place output of info below user selection 2015-08-20 15:55:03 +02:00
Uwe Steinmann
139b498d14 use new method getProgressBar() 2015-08-20 15:54:40 +02:00
Uwe Steinmann
ca32bc856e add method getProgressBar() 2015-08-20 15:52:46 +02:00
Uwe Steinmann
f59751aa14 set data-view and data-action in div.ajax tag instead of data-href 2015-08-20 14:52:36 +02:00
Uwe Steinmann
e97de9c6df Merge branch 'seeddms-5.0.x' into develop 2015-08-19 20:16:40 +02:00
Uwe Steinmann
784081b5d3 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-19 20:16:26 +02:00
Uwe Steinmann
c4e80969ea no need to count folders and documents anymore 2015-08-19 20:15:45 +02:00
Uwe Steinmann
58413e5218 Merge branch 'seeddms-5.0.x' into develop 2015-08-19 09:24:20 +02:00
Uwe Steinmann
cde8e830f5 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-19 09:24:05 +02:00
Uwe Steinmann
ee5d01a1ee preset $placeholder to '' 2015-08-19 09:20:06 +02:00
Uwe Steinmann
4b94100cbe set users for showForm 2015-08-19 09:19:24 +02:00
Uwe Steinmann
4c6eb18528 Merge branch 'seeddms-5.0.x' into develop 2015-08-19 06:09:20 +02:00
Uwe Steinmann
83fbab5149 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-19 06:05:48 +02:00
Uwe Steinmann
4358eb9a39 load form for user on demand via ajax 2015-08-18 22:45:51 +02:00
Uwe Steinmann
69e262cea3 save state of jqtree widget
has no effect currently
2015-08-18 22:39:30 +02:00
Uwe Steinmann
92c24739bf Merge branch 'seeddms-5.0.x' into develop 2015-08-18 16:22:23 +02:00
Uwe Steinmann
973eb2453d Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-18 16:20:54 +02:00
Uwe Steinmann
5a1c4768af show also documents that needs to be reviewed/approved by the owner
hiding it here makes no sense, as review/approval can be done anyway
2015-08-18 16:10:33 +02:00
Uwe Steinmann
0c9a95aa44 input fields can have a placeholder 2015-08-13 22:21:47 +02:00
Uwe Steinmann
263d4b7caf fix input field name for new mimetype 2015-08-13 18:02:37 +02:00
Uwe Steinmann
9aa2637a71 user showTextField() 2015-08-13 18:00:48 +02:00
Uwe Steinmann
ad1d9f556f Merge branch 'seeddms-5.0.x' into develop 2015-08-13 17:56:15 +02:00
Uwe Steinmann
87f00973d4 use showText() 2015-08-13 17:55:44 +02:00
Uwe Steinmann
360b1be159 make textarea wider 2015-08-13 11:56:48 +02:00
Uwe Steinmann
f53413006b Merge branch 'seeddms-5.0.x' into develop 2015-08-13 11:55:19 +02:00
Uwe Steinmann
cccceaa78a Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-13 11:51:12 +02:00
Uwe Steinmann
4a69c1258e use variable length input fields 2015-08-13 11:50:49 +02:00
Uwe Steinmann
7e30ec4459 Merge branch 'seeddms-5.0.x' into develop 2015-08-13 08:18:57 +02:00
Uwe Steinmann
8d74f745f0 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-13 08:18:45 +02:00
Uwe Steinmann
3687cceb3f make fulltext search form at least 330px
needed because the user selection will be cut off otherwise
2015-08-13 08:17:39 +02:00
Uwe Steinmann
aa49c5b0b1 Merge branch 'seeddms-5.0.x' into develop 2015-08-10 21:58:16 +02:00
Uwe Steinmann
65fda6daee Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-10 21:53:27 +02:00
Uwe Steinmann
8ffcfab6e4 use new fulltext index interface with support for sqlitefts 2015-08-10 21:43:15 +02:00
Uwe Steinmann
b0413a0d46 engine for fulltext search can be configured 2015-08-10 21:41:51 +02:00
Uwe Steinmann
0ba67b2634 Merge branch 'seeddms-5.0.x' into develop 2015-08-09 07:19:27 +02:00
Uwe Steinmann
a74dd3f52b Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-09 07:18:23 +02:00
Uwe Steinmann
27ccf32206 allow to add file if group has to review 2015-08-09 07:16:24 +02:00
Uwe Steinmann
baa0d11d1c allow to add file if group has to approve 2015-08-09 07:16:04 +02:00
Uwe Steinmann
4c907dbf9e Merge branch 'seeddms-5.0.x' into develop 2015-08-07 20:08:29 +02:00
Uwe Steinmann
6d8930a360 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-07 14:30:07 +02:00
Uwe Steinmann
d7223bc521 fix link to downloadable file in printProtocol() 2015-08-07 14:29:32 +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
51a06c4ab6 Merge branch 'seeddms-5.0.x' into develop 2015-08-06 13:42:39 +02:00
Uwe Steinmann
53280de176 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-06 13:42:20 +02:00
Uwe Steinmann
b47fec8c74 place legend into its own column 2015-08-06 13:41:49 +02:00
Uwe Steinmann
55ccf3e987 Merge branch 'seeddms-5.0.x' into develop 2015-08-05 21:14:35 +02:00
Uwe Steinmann
122fcdb3c9 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-05 21:14:17 +02:00
Uwe Steinmann
7485a85077 set timeout for external commands when creating fulltext index 2015-08-05 21:11:21 +02:00
Uwe Steinmann
de8726cccf Merge branch 'seeddms-5.0.x' into develop 2015-07-28 09:01:02 +02:00
Uwe Steinmann
d653c516ea pass backup dir to view 2015-07-28 07:50:02 +02:00
Uwe Steinmann
ff53a3e3e5 backup dir can be set 2015-07-28 07:29:08 +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
6060f1e98e new parameter $base for htmlStartPage(), propperly can hook in documentMenu 2015-07-15 22:32:19 +02:00
Uwe Steinmann
245bcc6a1e run hook folderNavigationMenu 2015-07-15 22:09:47 +02:00
Uwe Steinmann
8ed3264ae6 run hook folderNavigationMenu 2015-07-15 22:08:59 +02:00
Uwe Steinmann
a6d8ed829f add new parameter $base to htmlStartPage(), call hook for documentMenu propperly 2015-07-15 17:00:23 +02:00
Uwe Steinmann
0351305995 pass formkey when substituting user 2015-07-15 08:24:15 +02:00
Uwe Steinmann
71ed09ec0c pass previewer to printClipboard() 2015-07-15 07:26:47 +02:00
Uwe Steinmann
3dcda5e4ca fix typo in varialbe passed to hook 2015-07-15 07:26:18 +02:00
Uwe Steinmann
588caf9fde do not access _POST anymore 2015-07-15 07:25:45 +02:00
Uwe Steinmann
1609610541 pass previewer to printClipboard, call hook for menuitems, ...
backported from develop
2015-07-15 07:24:32 +02:00
Uwe Steinmann
f35ae2736a add new paramter autoLoginUser 2015-07-14 21:28:47 +02:00
Uwe Steinmann
9604076555 printAttributeEditField() can be passed a default value
document menu can be extended by a hook
2015-07-14 21:27:41 +02:00
Uwe Steinmann
d09605c6b9 pass null to printAttributeEditField if attribute is not set 2015-07-14 21:26:40 +02:00
Uwe Steinmann
a2179ca53e add new paramter autoLoginUser 2015-07-14 21:23:33 +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
a6541296a1 list documents to receipt and revise in menu task list 2015-07-09 18:29:34 +02:00
Uwe Steinmann
59fd3c7170 add missing space between tag attributes 2015-07-09 08:01:21 +02:00
Uwe Steinmann
b8e9d3a6dd add missing space between tag attributes 2015-07-09 08:00:43 +02:00
Uwe Steinmann
4290e705cf add tasks to menu if configured 2015-07-09 07:59:54 +02:00
Uwe Steinmann
cd3a239482 add new config parameter enableMenuTasks 2015-07-09 07:58:34 +02:00
Uwe Steinmann
bf95beb536 put tasks into submenus 2015-07-08 19:48:18 +02:00
Uwe Steinmann
a76e1de49e reorder lists 2015-07-08 18:59:14 +02:00
Uwe Steinmann
3583962085 new task menutask in op/op.Ajax.php which calls menuTask() 2015-07-08 18:58:38 +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
40cd60f985 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-07-08 07:33:02 +02:00
Uwe Steinmann
26982d1da0 show preview image in list 2015-07-08 07:26:16 +02:00
Uwe Steinmann
dd13814139 show preview image in list 2015-07-08 07:24:50 +02:00
Uwe Steinmann
dd939122de Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-07-08 06:55:51 +02:00
Uwe Steinmann
9ce168b4b6 list only documents to approve which have passed review
previously all documents that need to be approved some time were
listed. Even those documents which haven't passed review and cannot
be approved currently.
2015-07-08 06:54:45 +02:00
Uwe Steinmann
99bd517e2a list only documents to approve which have passed review
previously all documents that need to be approved some time were
listed. Even those documents which haven't passed review and cannot
be approved currently.
2015-07-08 06:51:15 +02:00
Uwe Steinmann
84a1879c85 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-07-06 22:18:23 +02:00
Uwe Steinmann
4ae913e307 make field for expired date larger 2015-07-06 22:18:11 +02:00
Uwe Steinmann
0aaf36bd0c make field for expired date larger 2015-07-06 21:54:03 +02:00
Uwe Steinmann
6b1124c23f pass folder object and not id to printDocumentChooser() 2015-07-06 16:09:25 +02:00
Uwe Steinmann
85174c6f45 create list of rejected documents 2015-07-03 20:52:55 +02:00
Uwe Steinmann
c70d0539b4 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-07-03 16:57:48 +02:00
Uwe Steinmann
4ac3ea014c set heading to add_approval 2015-07-03 16:57:37 +02:00
Uwe Steinmann
b74e4e154f set heading to add_approval 2015-07-03 16:57:01 +02:00
Uwe Steinmann
7902ab3fab Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-06-30 18:54:11 +02:00
Uwe Steinmann
77a5512f0b move code for easier merging 2015-06-30 18:53:40 +02:00
Uwe Steinmann
463e94ee8a Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
Conflicts:
	CHANGELOG
	Makefile
	SeedDMS_Core/Core/inc.ClassDMS.php
	SeedDMS_Core/package.xml
	inc/inc.Utils.php
	inc/inc.Version.php
	install/install.php
	op/op.ApproveDocument.php
	op/op.Login.php
	op/op.RemoveDocumentLink.php
	op/op.ReviewDocument.php
	out/out.SetReviewersApprovers.php
	views/bootstrap/class.Bootstrap.php
2015-06-30 07:05:27 +02:00
Uwe Steinmann
52559730d9 use new customizable preview converters 2015-06-25 19:52:02 +02:00
Uwe Steinmann
6b816f4d44 better handling of converters, added converters for preview
commands can also be deleted
2015-06-24 21:25:53 +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
f78af97b4a check if library folder is readable, pass folder to view 2015-06-24 12:26:08 +02:00
Uwe Steinmann
7f2bb15d49 remove some superflous chars 2015-06-23 19:10:14 +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
fd55efb3b9 show review/approval protocol 2015-06-23 10:03:15 +02:00
Uwe Steinmann
8db57d13b1 show review/approval protocol 2015-06-23 10:03:07 +02:00
Uwe Steinmann
7e7af661c7 show review/approval protocol 2015-06-23 10:02:45 +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
7cc3a0cf86 put icon before link to change status 2015-06-23 08:01:55 +02:00
Uwe Steinmann
fe31ebb2cc put icon before link to change status 2015-06-23 08:01:45 +02:00
Uwe Steinmann
06166d9c54 put icon before link to change status 2015-06-23 08:00:03 +02:00
Uwe Steinmann
b95f7ed91a new parameter overrideMimeType 2015-06-23 07:47:00 +02:00
Uwe Steinmann
f960bc81b4 new parameter overrideMimeType 2015-06-23 07:46:39 +02:00
Uwe Steinmann
515e95c227 new parameter overrideMimeType 2015-06-23 07:44:47 +02:00
Uwe Steinmann
3ed43b0a85 fix take over of reviewer/approver from previous version 2015-06-17 12:21:25 +02:00
Uwe Steinmann
42ce9fa21b add value to checkbox for exporting content 2015-06-17 11:32:46 +02:00
Uwe Steinmann
dbf31053c9 put export button into arcodion 2015-06-17 08:35:10 +02:00
Uwe Steinmann
5b03c3dcc3 show link to Indexer only if fulltext is enabled 2015-06-15 15:29:07 +02:00
Uwe Steinmann
a7ff808787 show link to Indexer only if fulltext is enabled 2015-06-15 15:28:53 +02:00
Uwe Steinmann
1d186d230b show link to Indexer only if fulltext is enabled 2015-06-15 15:28:25 +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
d8df113676 add class 'help' 2015-06-15 09:24:56 +02:00
Uwe Steinmann
ae40f72b80 add class 'help' 2015-06-15 09:24:50 +02:00
Uwe Steinmann
4173dbcd20 add class 'help' 2015-06-15 09:24:25 +02:00
Uwe Steinmann
e7ed3f7789 add optional parameter class to contentContainerStart() 2015-06-15 09:21:20 +02:00
Uwe Steinmann
22b7b3ce96 add optional parameter class to contentContainerStart() 2015-06-15 09:21:13 +02:00
Uwe Steinmann
ae481e6ac9 add optional parameter class to contentContainerStart() 2015-06-15 09:20:33 +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
fcddfb0162 allow to upload a file with each review/approval
Conflicts:
	op/op.ApproveDocument.php
	op/op.ReviewDocument.php
2015-06-11 21:37:41 +02:00
Uwe Steinmann
48d5f38c4a show link to downloaѕ review/approval file 2015-06-11 21:32:36 +02:00
Uwe Steinmann
d36ba8d906 allow to upload a file with each review/approval 2015-06-11 21:32:29 +02:00
Uwe Steinmann
220329c1b8 allow to upload a file with each review/approval 2015-06-11 21:30:56 +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
2fceade3a2 show docs in root folder of document chooser 2015-06-11 11:27:14 +02:00
Uwe Steinmann
0c9714c37c show docs in root folder of document chooser 2015-06-11 11:27:07 +02:00
Uwe Steinmann
f02734b063 show docs in root folder of document chooser 2015-06-11 11:25:14 +02:00
Uwe Steinmann
45a9373bdd include DocumentChooser relative to out
this makes it possible to include the document chooser even in
op/op.xxx.php files
2015-06-11 07:56:04 +02:00
Uwe Steinmann
0e8a385b6d allow context sensitive help files 2015-06-11 06:42:33 +02:00
Uwe Steinmann
269355bb43 allow context sensitive help files 2015-06-11 06:42:28 +02:00
Uwe Steinmann
e527862c9d allow context sensitive help files 2015-06-11 06:41:49 +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
7791ae1b0d open the right tab when jumping to ViewDocument 2015-06-09 11:19:16 +02:00
Uwe Steinmann
907c825dd5 open the right tab when jumping to ViewDocument 2015-06-09 11:18:53 +02:00
Uwe Steinmann
ffa03ead43 open the right tab when jumping to ViewDocument 2015-06-09 11:18:08 +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
Uwe Steinmann
56667f9005 approval can be submitted even after status S_DRAFT_APP has been left 2015-06-09 06:39:11 +02:00
Uwe Steinmann
da0b3e71b3 approval can be added again 2015-06-08 21:58:17 +02:00
Uwe Steinmann
8e2aeb7264 pass resultmode to view 2015-06-08 09:15:33 +02:00
Uwe Steinmann
83cdedad51 pass resultmode to view 2015-06-08 09:12:25 +02:00
Uwe Steinmann
c2e2b1e9be take resultmode from view parameters 2015-06-08 09:10:34 +02:00
Uwe Steinmann
4b23765042 show button to approve document if status is null
was only shown if the status of the document was S_APP_DRAFT
2015-06-08 09:09:03 +02:00
Uwe Steinmann
13a977f84f add export button if search returned documents 2015-06-02 17:29:33 +02:00
Uwe Steinmann
fe47ee86cc exiting review will not be hidden even if workflow mode is
traditional_only_approve
2015-06-02 10:23:50 +02:00
Uwe Steinmann
98b896a545 exiting review will not be hidden even if workflow mode is
traditional_only_approve
2015-06-02 10:22:21 +02:00
Uwe Steinmann
ec78639d94 do not hide review if workflow mode is traditional_only_approve
otherwise old documents which are still in review can't be reviewed
anymore
2015-06-02 10:18:37 +02:00
Uwe Steinmann
1123611371 rename mayOverwriteStatus() to mayOverrideStatus() 2015-06-02 10:04:35 +02:00
Uwe Steinmann
1bc5e6116c document status S_DRAFT can be set 2015-06-02 10:04:01 +02:00
Uwe Steinmann
d9d4d89a27 set initial document status 2015-06-02 10:02:46 +02:00
Uwe Steinmann
4814c5cefe search for documents/folders only 2015-06-02 08:53:21 +02:00
Uwe Steinmann
1150b5cc68 search for documents/folders only 2015-06-02 08:53:08 +02:00
Uwe Steinmann
bd08e9b125 search for documents/folders only 2015-06-02 08:52:36 +02:00
Uwe Steinmann
68e3045da2 make table condensed to save some space 2015-06-01 08:40:03 +02:00
Uwe Steinmann
d5e9c7532a fix error in calling hook showDocumentContentAttribute, show if document was checked out 2015-05-29 20:48:27 +02:00
Uwe Steinmann
5c94655bd7 allow to show partial trees 2015-05-29 20:47:46 +02:00
Uwe Steinmann
c48030d54e add more parameter to printDocumentChooser() 2015-05-29 20:47:03 +02:00
Uwe Steinmann
13babfa3f9 add field for selecting a document from the library 2015-05-29 20:46:25 +02:00
Uwe Steinmann
b8d06babee add setting for library folder 2015-05-29 20:42:37 +02:00
Uwe Steinmann
3bc72a46df do not include jquery-cookie/jquery.cookie.js
it's currently not needed and not available
2015-05-21 22:10:06 +02:00
Uwe Steinmann
967f85a463 replace '/' by ', ' for better line break in header of table 2015-05-21 16:00:03 +02:00
Uwe Steinmann
3002cb3f28 replace '/' by ', ' for better line break in header of table 2015-05-21 15:59:32 +02:00
Uwe Steinmann
5e846059f7 replace '/' by ', ' for better line break in header 2015-05-21 15:58:10 +02:00
Uwe Steinmann
555b586cda replace '/' by ', ' for better line break in table header 2015-05-21 15:44:59 +02:00
Uwe Steinmann
b82b6b10f3 replace '/' by ', ' for better line break in table header 2015-05-21 15:44:18 +02:00
Uwe Steinmann
f76536b0a4 set some new icons 2015-05-20 13:21:05 +02:00
Uwe Steinmann
536ead64ac allow to substitute user for regular users 2015-05-19 19:44:18 +02:00
Uwe Steinmann
a80f4090af add filter for documents in revision 2015-05-19 19:41:40 +02:00
Uwe Steinmann
f86fe26eee add placeholder to ind reviewer select box 2015-05-19 13:27:53 +02:00
Uwe Steinmann
34bdb9cb21 add placeholder to ind reviewer select box 2015-05-19 13:27:22 +02:00
Uwe Steinmann
20a695f571 minor html fixes 2015-05-19 13:26:10 +02:00
Uwe Steinmann
06c71cc332 add handling of substitutes 2015-05-19 08:06:24 +02:00
Uwe Steinmann
b374e8e962 fix output of message when item was deleted 2015-05-16 19:42:07 +02:00
Uwe Steinmann
eb7f3613ca add scripts for adding content to a transmittal 2015-05-13 18:43:28 +02:00
Uwe Steinmann
cb13a89c1a add checking for duplicates 2015-05-13 18:42:42 +02:00
Uwe Steinmann
fe9229c8bc add link for addind content to transmittal 2015-05-13 18:42:03 +02:00
Uwe Steinmann
2d967f8741 replace # in table header 2015-05-13 18:41:27 +02:00
Uwe Steinmann
259303fff1 add checking for duplicates 2015-05-13 17:38:20 +02:00
Uwe Steinmann
37fe7925a4 add checking for duplicates 2015-05-13 17:37:53 +02:00
Uwe Steinmann
3aa22eccbd add icon from removing and updating transmittal item 2015-05-13 17:35:36 +02:00
Uwe Steinmann
3efa77e78f add generic function for printing a workflow protocol 2015-05-12 19:14:25 +02:00
Uwe Steinmann
d446034193 nicer output of item list 2015-05-12 19:13:55 +02:00
Uwe Steinmann
20227a44a4 take out debug code 2015-05-12 19:13:34 +02:00
Uwe Steinmann
d538bde579 add more lists of documents 2015-05-12 19:13:08 +02:00
Uwe Steinmann
bc7407ad85 add transmittal mgr to user menu, some code cleanup 2015-05-12 19:12:22 +02:00
Uwe Steinmann
71da44c618 add missing files for revising documents 2015-05-12 19:05:02 +02:00
Uwe Steinmann
9859737668 fix typo in file 2015-05-11 09:32:10 +02:00
Uwe Steinmann
608a86d45c rename reviser to revisor, added revision workflow to document page 2015-05-11 09:30:13 +02:00
Uwe Steinmann
cf2160993f correct wrong phrase if there are no group approvals/reviews 2015-05-08 08:32:47 +02:00
Uwe Steinmann
9c6094da02 correct wrong phrase if there are no group approvals/reviews 2015-05-08 08:32:40 +02:00
Uwe Steinmann
e996ecb2d7 correct wrong phrase if there are no group approvals/reviews 2015-05-08 08:32:09 +02:00
Uwe Steinmann
7d664ac105 correct wrong phrase if there are no group receipts 2015-05-08 08:30:35 +02:00
Uwe Steinmann
ed0b1f28cb do not show items if no transmittal is selected 2015-05-08 08:23:33 +02:00
Uwe Steinmann
b872318350 output list of documents receipt by me 2015-05-04 06:12:30 +02:00
Uwe Steinmann
b0d8b42011 escape html code before output 2015-04-30 14:05:38 +02:00
Uwe Steinmann
f32dbe5ef8 escape html code before output 2015-04-30 14:05:28 +02:00
Uwe Steinmann
14c16f25ce escape html code before output 2015-04-30 14:04:56 +02:00
Uwe Steinmann
47d97e77d8 add files for transmittal management and receptions 2015-04-30 07:09:21 +02:00
Uwe Steinmann
b4e8c39158 add tab for document reception 2015-04-28 12:18:35 +02:00
Uwe Steinmann
3ed61ce6b8 fix calculated used disk space in percent 2015-04-27 21:29:51 +02:00
Uwe Steinmann
b2fcf4fd4b list only users in select box which are not hidden 2015-04-27 21:29:51 +02:00
Uwe Steinmann
c3d9efc691 fix calculated used disk space in percent 2015-04-27 21:29:35 +02:00
Uwe Steinmann
304e54f009 list only users in select box which are not hidden 2015-04-27 21:29:35 +02:00
Uwe Steinmann
02ef086bfe fix calculated used disk space in percent 2015-04-27 21:28:55 +02:00
Uwe Steinmann
902f418819 list only users in select box which are not hidden 2015-04-27 21:21:07 +02:00
Uwe Steinmann
4e4848c5d7 add more hooks for showing/editing attributes 2015-04-27 08:28:08 +02:00
Uwe Steinmann
4e682ecbe2 add more hooks for showing/editing attributes 2015-04-27 08:27:19 +02:00
Uwe Steinmann
654d8ac75a add parameter $version to documentListRow()
in order to show a specific version
2015-04-25 20:49:47 +02:00
Uwe Steinmann
3d3025c2cd no need to create temp table ttstatid anymore 2015-04-25 20:49:13 +02:00
Uwe Steinmann
0b57325c04 fix take over of approvers/reviewers from previous version 2015-04-23 17:12:57 +02:00
Uwe Steinmann
23983081ea fix take over of approvers/reviewers from previous version 2015-04-23 17:12:08 +02:00
Uwe Steinmann
91f7d8dfc3 show warning if document is checked out 2015-04-23 16:45:19 +02:00
Uwe Steinmann
5952d49711 add list of documents check out by me 2015-04-23 16:44:55 +02:00
Uwe Steinmann
0bac3deabb show message and hide form if document cannot be checked in 2015-04-23 16:44:16 +02:00
Uwe Steinmann
505763e0be use new SeedDMS_Core_DMS::getDocumentList() method 2015-04-23 11:26:25 +02:00
Uwe Steinmann
61294336b5 add missing files for listing of documents need to be watch at 2015-04-22 17:24:58 +02:00
Uwe Steinmann
08e768fc52 add missing files for document check out/іn 2015-04-22 17:23:54 +02:00
Uwe Steinmann
4f3c6ed090 add checkbox for creating checkout dir if it doesn't exists 2015-04-22 17:21:57 +02:00
Uwe Steinmann
5702708643 add link to out/out.ReceiptSummary.php in MyDocuments menu 2015-04-22 14:57:36 +02:00
Uwe Steinmann
2d3277a7ea add link to out/out.SetRevisers.php 2015-04-22 11:42:20 +02:00
Uwe Steinmann
0addaf56d3 add missing files for revision workflow and document reception 2015-04-22 10:33:49 +02:00
Uwe Steinmann
b07b65b574 get read access list for document not folder 2015-04-20 13:47:34 +02:00
Uwe Steinmann
4bd0e3efe0 show link to out/out.SetRecipients.php if allowed 2015-04-20 13:46:59 +02:00
Uwe Steinmann
387f67dad4 enable/disable Acknowledge and Revision workflow 2015-04-20 13:44:45 +02:00
Uwe Steinmann
03bfa5f972 get read access list for document not folder 2015-04-20 13:42:38 +02:00
Uwe Steinmann
696b5f0996 add checkout item to document menu 2015-04-17 20:11:51 +02:00
Uwe Steinmann
dc08f8df1b add configuration of checkout dir 2015-04-17 20:10:36 +02:00
Uwe Steinmann
fc7772f7d9 stay on extension pane after saving configuration 2015-04-16 08:12:50 +02:00
Uwe Steinmann
e91ce9d632 set proper active pane after saving configuration 2015-04-16 08:11:44 +02:00
Uwe Steinmann
f02917d5aa set proper active pane after saving configuration 2015-04-16 08:11:05 +02:00
Uwe Steinmann
de40aa816a printAttributeEditField() outputs textarea for longer values
up to 30 chars it remains an input field
2015-04-16 08:05:11 +02:00
Uwe Steinmann
46c2019ef2 nicer output of attribute values 2015-04-15 16:14:47 +02:00
Uwe Steinmann
b51b4713ae second parameter of printAttributeEditField() is attribute and not its
value anymore
2015-04-15 14:13:01 +02:00
Uwe Steinmann
7d7a21fc9e printAttributeEditField() takes a second parameter the attribute
this was the attribute value
2015-04-15 14:11:52 +02:00
Uwe Steinmann
ab07fbfef7 add hooks, put output of attribute into separate function 2015-04-14 19:38:50 +02:00
Uwe Steinmann
c36442303f add new attribute types to select boxes 2015-04-14 19:38:09 +02:00
Uwe Steinmann
db8e3bbfbb Merge branch 'seeddms-4.3.17' into develop 2015-04-14 06:21:12 +02:00
Uwe Steinmann
0994429edd issue warning if ordering of folder contents is != 's' 2015-04-08 06:43:31 +02:00
Uwe Steinmann
72c3207a75 Merge branch 'seeddms-4.3.17' into develop
Conflicts:
	Makefile
2015-03-30 16:40:24 +02:00
Uwe Steinmann
7ef7e13c4c show fields for user/group notification 2015-03-27 17:32:51 +01:00
Uwe Steinmann
234d333bfc fix selection of home folder 2015-03-20 08:40:30 +01:00
Uwe Steinmann
cb81eb7db4 Merge branch 'seeddms-4.3.16' into develop
Conflicts:
	Makefile
	views/bootstrap/class.UsrMgr.php
2015-03-20 08:32:29 +01:00
Uwe Steinmann
d2b26fafc4 fix key settings_passwordStrength_desc 2015-03-19 09:38:41 +01:00
Uwe Steinmann
67bd3171b4 approval/review log was mixed up 2015-03-18 11:54:01 +01:00
Uwe Steinmann
e8e24421b4 fix syntax error in javascript 2015-03-17 17:47:27 +01:00
Uwe Steinmann
cb3392c774 propperly take new workflow mode traditional_only_approval into account 2015-03-17 11:19:55 +01:00
Uwe Steinmann
4c41f560c3 reorganize code
make one single method which creates to add/update form
2015-03-17 09:54:59 +01:00
Uwe Steinmann
0335cc8bcd Merge branch 'seeddms-4.3.15' into develop
Conflicts:
	Makefile
	views/bootstrap/class.Search.php
	views/bootstrap/class.Settings.php
2015-03-17 06:52:33 +01:00
Uwe Steinmann
56b57179f4 use new translation keys add_review and add_approval 2015-03-16 10:37:15 +01:00
Uwe Steinmann
8f96bbaa1d workflow mode can be traditional without review 2015-03-16 08:58:10 +01:00
Uwe Steinmann
53697b37ff do not show copy clipboard icon if clipboard is turned off
was still visible in search result
2015-03-13 10:59:44 +01:00
Uwe Steinmann
89ef1a58ec view parameter enableClipboard has been renamed to enableclipboard 2015-03-13 09:31:48 +01:00
Uwe Steinmann
a87e145fda escape quotes in javascript for showing workflow graph 2015-03-11 19:27:09 +01:00
Uwe Steinmann
ed9fbe93e1 set current tab to last one selected when submitting data 2015-03-11 18:24:14 +01:00
Uwe Steinmann
c3b80c1b5d add new option enableNotificationWorkflow
turns on/off is mail is set to users/groups in next step of workflow
2015-03-11 18:11:41 +01:00
Uwe Steinmann
6d0a7d4f82 set tab last seen after submit new configuration 2015-03-11 17:48:10 +01:00
Uwe Steinmann
0266c3a037 Merge branch 'seeddms-4.3.15' into develop 2015-02-24 19:53:59 +01:00
Uwe Steinmann
c4feea2664 all converters are only used for fulltext 2015-02-24 19:26:38 +01:00
Uwe Steinmann
cb0d7d8d92 enableClipboard takes out all clipboard functions 2015-02-24 17:47:58 +01:00
Uwe Steinmann
5729cd91f1 reviewers/approvers can be taken over from last document version 2015-02-13 17:41:50 +01:00
Uwe Steinmann
6c3024e799 include application.css after all other css files 2015-02-13 17:41:12 +01:00
Uwe Steinmann
b3bfaf9ac5 Merge branch 'seeddms-4.3.15' into develop
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
2015-02-05 09:37:52 +01:00
Uwe Steinmann
59b50be3be do not use fixed class names for SeedDMЅ_Core_[Folder|Document]
use instead SeedDMS_Core_DMS::getClassname()
2015-02-05 07:39:59 +01:00
Uwe Steinmann
8963879f5d htmlencode() the complete content in deletion dialog
this used to be just the filename, but translations of the text
may also contain qoutes which break the javascript
2015-02-04 07:41:33 +01:00
Uwe Steinmann
92279dcaf4 minor change in html structure 2015-01-30 08:18:52 +01:00
Uwe Steinmann
061ed035cc Merge branch 'seeddms-4.3.14' into develop 2015-01-29 18:32:16 +01:00
Uwe Steinmann
8a6ff2f48a preset expiration date form settings 2015-01-29 18:31:37 +01:00
Uwe Steinmann
f7afddfa26 set attribute data-date of input field for expiration date 2015-01-29 18:30:54 +01:00
Uwe Steinmann
1aa08781b2 Merge branch 'seeddms-4.3.14' into develop
Conflicts:
	Makefile
	SeedDMS_Core/Core/inc.ClassFolder.php
2015-01-29 18:22:19 +01:00
Uwe Steinmann
75ef47f6e1 expiration date of documents can be preset in settings 2015-01-29 17:28:40 +01:00
Uwe Steinmann
9be1d40624 checkQuota() requires user object as a parameter 2015-01-15 11:12:30 +01:00
Uwe Steinmann
fc2eff631e lots of flags 2015-01-08 15:04:54 +01:00
Uwe Steinmann
9b8fe89730 some code reorganization 2014-12-08 14:50:48 +01:00
Uwe Steinmann
93cb26e79d do not used hard coded class names of SeedDMS_Core_xxx anymore 2014-12-08 14:49:26 +01:00
Uwe Steinmann
8809086014 Merge branch 'seeddms-4.3.13' into develop 2014-11-24 19:42:18 +01:00
Uwe Steinmann
8af69d9cfa Download of documents whose content is gone will not be possible anymore (Bug #185) 2014-11-24 19:23:26 +01:00
Uwe Steinmann
406b4a5a00 Merge branch 'seeddms-4.3.13' into develop
Conflicts:
	Makefile
2014-11-24 13:13:38 +01:00
Uwe Steinmann
1cb1ffb436 add button to select all files 2014-11-24 13:11:00 +01:00
Uwe Steinmann
2821e15867 add missing argument of checkQuota() (Bug #184) 2014-11-19 20:36:06 +01:00
Uwe Steinmann
985206f481 make last paramter of printFolderChooser() optional 2014-11-19 20:25:06 +01:00
Uwe Steinmann
e9c3696466 Merge branch 'seeddms-4.3.13' into develop
Conflicts:
	Makefile
2014-11-19 17:04:56 +01:00
Uwe Steinmann
f4bb51933f remove strptime() function calls 2014-11-14 20:23:26 +01:00
Uwe Steinmann
15c5392ed8 Merge branch 'seeddms-4.3.11' into develop
Conflicts:
	Makefile
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
2014-11-13 09:21:08 +01:00
Uwe Steinmann
2eb4408111 add missing space between icon and text on button 2014-11-13 09:01:39 +01:00
Uwe Steinmann
99590a322d use new method getValueAsArray() for showing attributes 2014-11-13 08:21:49 +01:00
Uwe Steinmann
53389d01d5 extend search on attributes for all object types 2014-11-13 07:55:29 +01:00
Uwe Steinmann
6d6bb02a60 do not show fast upload area if user has no write access of folder 2014-11-11 16:01:36 +01:00
Uwe Steinmann
7c4e5a15aa strip html tags from sitename when using for html title 2014-11-07 08:54:47 +01:00
Uwe Steinmann
15c163274c take out window.close() because there is no window to close anymore
since bootstraps modal box, the keyword chooser isn't a window anymore.
2014-11-07 08:06:08 +01:00
Uwe Steinmann
8db94efbf9 Merge branch 'seeddms-4.3.11' into develop 2014-10-31 13:29:21 +01:00
Uwe Steinmann
3ddf1727fd allow passwords to be never expire 2014-10-31 13:20:43 +01:00
Uwe Steinmann
6e793b29f9 change class of body tag 2014-10-31 13:03:20 +01:00
Uwe Steinmann
c1eeba573e Merge branch 'seeddms-4.3.10' into develop 2014-10-16 17:28:11 +02:00
Uwe Steinmann
8d4151893e use " instead of ' in javascript for deleting documents and folders 2014-10-16 17:27:07 +02:00
Uwe Steinmann
6443b9aa8e Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
	views/bootstrap/class.Search.php
2014-07-23 20:26:37 +02:00
Uwe Steinmann
b6f60e8c7f reoganize database search form, don't show results without a search criteria 2014-07-23 20:23:07 +02:00
Uwe Steinmann
52fa3f1bf8 reorganize database search form 2014-07-23 20:12:55 +02:00
Uwe Steinmann
cbe0574388 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Bootstrap.php
2014-07-23 06:55:44 +02:00
Uwe Steinmann
a011433d28 remove not used file upload code 2014-07-22 17:34:08 +02:00
Uwe Steinmann
2b5415e128 some cosmetic changes to ease merging with develop 2014-07-11 12:58:44 +02:00
Uwe Steinmann
6c1993a9fe show id of folder always, not just if inheritAccess is turn on
don't know how that got into the code
2014-07-11 12:57:13 +02:00
Uwe Steinmann
4186f6dd7e remove accidently duplicated code 2014-07-11 12:51:50 +02:00
Uwe Steinmann
e2974f2054 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.ViewFolder.php
2014-07-11 12:49:21 +02:00
Uwe Steinmann
72798e2ac4 set max file size for drag&drop upload 2014-07-11 12:04:13 +02:00
Uwe Steinmann
3c51f70e07 add drag&drop area for file upload 2014-07-11 08:42:57 +02:00
Uwe Steinmann
458069fba1 div.#main-clipboard doesn't need ondrop-attr anymore 2014-07-11 08:42:17 +02:00
Uwe Steinmann
289649b6ee add file upload via drag&drop
can be enabled in the settings
2014-07-11 08:41:25 +02:00
Uwe Steinmann
3a84ec91d4 fix php syntax error 2014-07-08 09:21:47 +02:00
Uwe Steinmann
4d8f9731d5 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	styles/bootstrap/application.js
	views/bootstrap/class.Bootstrap.php
2014-07-08 08:49:14 +02:00
Uwe Steinmann
73bfecb5a8 more general folder chooser
the choosen folder will no longer use targetidformx for the input field
containing the id. It is now independent of the form name.
2014-07-08 08:30:59 +02:00
Uwe Steinmann
cc61505825 document/folder chooser even works for forms not named 'form1' 2014-07-07 15:45:24 +02:00
Uwe Steinmann
579946d455 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Bootstrap.php
2014-07-03 12:07:27 +02:00
Uwe Steinmann
d3451e0b7b temporarily take out new fileupload 2014-07-03 12:04:11 +02:00
Uwe Steinmann
4ff87c2e7a do not output html page start/end 2014-06-24 16:12:02 +02:00
Uwe Steinmann
3cd1219b81 pass group/user name to htmlspecialchars() before output 2014-06-17 19:07:51 +02:00
Uwe Steinmann
cf7a6becf2 output mandatory reviewers/approvers 2014-06-17 18:11:09 +02:00
Uwe Steinmann
184811f9b6 remove container around search result 2014-06-11 11:02:50 +02:00
Uwe Steinmann
b494e3c248 add title attribute 2014-06-11 11:02:25 +02:00
Uwe Steinmann
f1a9923f57 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Bootstrap.php
2014-06-06 15:13:15 +02:00
Uwe Steinmann
3301dbeda5 showing the clipboard will filter out those objects which are no longer available 2014-06-06 15:08:44 +02:00
Uwe Steinmann
6325bd2844 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Bootstrap.php
	views/bootstrap/class.ViewFolder.php
2014-06-06 14:15:39 +02:00
Uwe Steinmann
216e38378d take out code for show document/folder lines in table
they have been moved into the new functions printDocumentListRow()
and printFolderListRow()
2014-06-06 14:00:59 +02:00
Uwe Steinmann
e552294073 add new methods documentListRow(), printLockDocumentBtn() 2014-06-06 14:00:28 +02:00
Uwe Steinmann
df3a55d39b make clipboard ajax aware 2014-06-05 15:02:19 +02:00
Uwe Steinmann
58cdecfe21 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Bootstrap.php
	views/bootstrap/class.ViewFolder.php
2014-06-05 10:03:35 +02:00
Uwe Steinmann
8abed5989f use new folder remove operation 2014-06-05 09:51:20 +02:00
Uwe Steinmann
1d8b73c2f9 add new method printDeleteFolderButton(), fix drag and drop from clipboard 2014-06-05 09:50:21 +02:00
Uwe Steinmann
32d160ed99 show clipboard even if foldertree ist turned off 2014-06-04 21:42:08 +02:00
Uwe Steinmann
854700183c put clipboard into left coŀumn 2014-06-04 21:40:50 +02:00
Uwe Steinmann
aa6bdf000b Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
2014-06-04 21:25:30 +02:00
Uwe Steinmann
7a2bcfb312 use new method for printing delete document icon 2014-06-04 19:22:54 +02:00
Uwe Steinmann
a152a57735 use new code for printing delete document icon 2014-06-04 19:21:59 +02:00
Uwe Steinmann
6b56a5e31f pass formtoken to movedocument and movefolder ajax calls 2014-06-04 19:21:25 +02:00
Uwe Steinmann
b950d22b60 javascript can be collected and output at end of page
add method to show icon for deleting documents in document/folder list
2014-06-04 19:20:07 +02:00
Uwe Steinmann
f13ef894b2 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	Makefile
	op/op.RemoveDocument.php
	op/op.UpdateDocument.php
	out/out.RemoveDocument.php
2014-06-04 07:58:06 +02:00
Uwe Steinmann
0717db2926 do not set expiration in version box 2014-06-03 17:52:01 +02:00
Uwe Steinmann
16e22ceafd check if expiration may be set 2014-06-03 17:51:44 +02:00
Uwe Steinmann
1fcc786d25 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
	SeedDMS_Core/Core/inc.ClassUser.php
	op/op.AddDocument.php
	styles/bootstrap/application.css
	views/bootstrap/class.UsrMgr.php
2014-05-22 08:21:22 +02:00
Uwe Steinmann
2a5441e7bd fix showing version and comment of document content 2014-05-22 07:44:57 +02:00
Uwe Steinmann
8e1bc0153f reorganize layout 2014-05-22 07:33:48 +02:00
Uwe Steinmann
d412b3ffad renew php time limit for each folder 2014-05-22 06:50:33 +02:00
Uwe Steinmann
2689872dd5 add new item in select menu for keeping current password expiration 2014-05-22 06:47:10 +02:00
Uwe Steinmann
bfb6620b3b show only last approval status 2014-05-22 06:46:44 +02:00
Uwe Steinmann
2af505942e show password expiration and currently logged in user 2014-05-22 06:45:09 +02:00
Uwe Steinmann
2414d9e510 menu on myaccount page shows 'edit user' item if admin 2014-05-22 06:44:20 +02:00
Uwe Steinmann
1f5b44a654 show quota 2014-05-20 06:29:29 +02:00
Uwe Steinmann
d63a6e0977 show quota 2014-05-20 06:29:03 +02:00
Uwe Steinmann
3de00379d2 quota can be edited 2014-05-20 06:28:40 +02:00
Uwe Steinmann
8fc212966b add menu item for user list in admin menu 2014-05-20 06:26:23 +02:00
Uwe Steinmann
01e067a2c4 use container-fluid class for top navigation (Bug #157) 2014-05-16 11:05:53 +02:00
Uwe Steinmann
04c5476f2b use new file upload chooser 2014-05-16 09:19:36 +02:00
Uwe Steinmann
315111a778 add nicer looking file upload chooser 2014-05-16 09:17:43 +02:00
Uwe Steinmann
319b2cbe75 Merge branch 'seeddms-4.3.8' into develop 2014-04-15 18:53:21 +02:00
Uwe Steinmann
02d8da676e show predefined value of multivalue attribute only if not empty 2014-04-15 15:33:05 +02:00
Uwe Steinmann
783a7a3d37 Merge branch 'seeddms-4.3.8' into develop 2014-04-10 21:41:56 +02:00
Uwe Steinmann
c550d7f11d use preview image width from settings 2014-04-10 21:38:33 +02:00
Uwe Steinmann
0144c4c396 Merge branch 'seeddms-4.3.8' into develop 2014-04-10 11:22:05 +02:00
Uwe Steinmann
100909a910 check for new versions 2014-04-10 11:19:45 +02:00
Uwe Steinmann
821e93cbc0 fix guest login by clicking on th link (Bug #152) 2014-04-10 08:41:11 +02:00
Uwe Steinmann
89ea53caf4 Merge branch 'seeddms-4.3.8' into develop 2014-04-09 09:26:22 +02:00
Uwe Steinmann
63991f8217 show docs per month as bar chart 2014-04-09 09:25:56 +02:00
Uwe Steinmann
c180f17f98 Merge branch 'seeddms-4.3.8' into develop
Conflicts:
	styles/bootstrap/application.js
	views/bootstrap/class.Bootstrap.php
2014-04-09 06:26:32 +02:00
Uwe Steinmann
e9b0968b93 add tooltips for line graph 2014-04-08 15:28:38 +02:00
Uwe Steinmann
eb4f49af8a add more charts 2014-04-08 10:48:44 +02:00
Uwe Steinmann
2c4ce681ef add function for listing missing languages at end of page
also check if turned on
2014-04-08 10:47:28 +02:00
Uwe Steinmann
3a0dc14e87 fix ending of html page, change some language keys 2014-04-08 10:46:26 +02:00
Uwe Steinmann
0ff38100c6 new parameter to turn missing translation output 2014-04-08 10:40:20 +02:00
Uwe Steinmann
da84192af8 remove nasty spacіng with empty paragraph, add css instead 2014-04-02 08:57:30 +02:00
Uwe Steinmann
82c9dbe2aa add new page for charts to admin menu 2014-04-02 08:50:57 +02:00
Uwe Steinmann
3104c57c68 add new page with charts to admin menu 2014-04-02 08:50:35 +02:00
Uwe Steinmann
19e8115f92 use translations for chart title, turn on hover function 2014-04-02 08:42:49 +02:00
Uwe Steinmann
729fff53ef include jquery.js before extra header 2014-04-01 21:04:55 +02:00
Uwe Steinmann
aa725b8dce new statistical output as pie charts 2014-04-01 21:02:32 +02:00
Uwe Steinmann
5c3a22dee1 return message when password was send 2014-04-01 17:14:57 +02:00
Uwe Steinmann
885a26a6a4 check for saving empty category and keyword (Bug #148) 2014-04-01 13:59:34 +02:00
Uwe Steinmann
134bcd025d do not link '...' in page browser 2014-04-01 10:42:51 +02:00
Uwe Steinmann
a8ae1c5a89 better navigation in page browser 2014-04-01 09:20:58 +02:00
Uwe Steinmann
82184bdcae limit pager to one line by restricting the number of pages to 20 2014-04-01 07:39:16 +02:00
Uwe Steinmann
5944edd41b do not show two dividers in right most menu
was shown when no language menu item and no su user item was visible
2014-04-01 06:49:29 +02:00
Uwe Steinmann
2299bb9b49 somewhat nicer formating 2014-04-01 06:42:15 +02:00
Uwe Steinmann
9049104210 add icon to button 2014-04-01 06:22:23 +02:00
Uwe Steinmann
95cae18e88 regard settings for language and theme selector in profile 2014-03-28 18:40:06 +01:00
Uwe Steinmann
eabfee8c76 set attribute target in folder chooser pointing the input field storing the folder id 2014-03-26 17:36:00 +01:00
Uwe Steinmann
52bab22fc2 add fields for homefolder and quota 2014-03-26 17:31:37 +01:00
Uwe Steinmann
a26270f5b6 add optional parameter 'formname' to printFolderChooser()
this allows to set the name of the input field containing the selected
folder
2014-03-26 08:17:55 +01:00
Uwe Steinmann
1d011feaf6 Merge branch 'seeddms-4.3.8' into develop 2014-03-26 07:29:28 +01:00
Uwe Steinmann
815ca1acf8 show link to indexer in folder menu (if admin) 2014-03-26 07:27:01 +01:00
Uwe Steinmann
034c709cee fix html which makes disclaimer smaller 2014-03-25 18:51:57 +01:00
Uwe Steinmann
c49061ea15 more condensed output of terms and documents 2014-03-25 18:51:08 +01:00
Uwe Steinmann
468846b19f Merge branch 'seeddms-4.3.7' into develop
Conflicts:
	Makefile
	op/op.Download.php
2014-03-21 09:20:19 +01:00
Uwe Steinmann
7901fa28b8 always sort folders/documents in ѕequence chooser by ѕequence 2014-03-21 08:49:47 +01:00
Uwe Steinmann
646128cbd8 add dummy javascript function, Bug #135
when clicking on a folder in the document chooser, the none existing
javascript function folderSelectedform1() was called. This fix just
adds it.
2014-03-21 08:05:08 +01:00
Uwe Steinmann
5499dbeb66 Merge branch 'seeddms-4.3.6' into develop
Conflicts:
	languages/de_DE/lang.inc
2014-03-20 08:50:23 +01:00
Uwe Steinmann
b047f3a23f fix link to folder in clipboard menu 2014-03-20 08:37:47 +01:00
Uwe Steinmann
c1f5a31f13 Merge branch 'seeddms-4.3.6' into develop
Conflicts:
	Makefile
2014-03-18 16:55:06 +01:00
Uwe Steinmann
b078102c19 use configured preview image width 2014-03-18 10:55:24 +01:00
Uwe Steinmann
9b58c1fcfa make layout look more like document details page 2014-03-18 10:54:24 +01:00
Uwe Steinmann
d87296c859 make preview image size configurable 2014-03-18 10:03:39 +01:00
Uwe Steinmann
a3cd77dd17 show reverse document links 2014-03-18 07:07:12 +01:00
Uwe Steinmann
9032170149 pass sort order to ajax subtree command 2014-03-14 15:11:13 +01:00
Uwe Steinmann
2aa129772b add translated phrase for 'you are the manager of this group' 2014-03-06 20:31:14 +01:00
Uwe Steinmann
0a070eef1f Merge branch 'seeddms-4.3.5' into develop
Conflicts:
	languages/en_GB/lang.inc
	views/bootstrap/class.Bootstrap.php
2014-03-04 11:20:02 +01:00
Uwe Steinmann
598be765c6 force exitError() to not exit
added optional parameter noexit
2014-03-04 08:30:32 +01:00
Uwe Steinmann
ace5d1078b issue warning if mandatory users/groups have no access on document 2014-03-03 14:46:16 +01:00
Uwe Steinmann
50d939cd8e Merge branch 'seeddms-4.3.4' into develop
Conflicts:
	Makefile
	op/op.RemoveFolder.php
2014-02-26 23:12:40 +01:00
Uwe Steinmann
0be40d61c8 fix vulnerablity against xss attack 2014-02-26 22:42:26 +01:00
Uwe Steinmann
31ffad39a8 fix security hole
missing check for passed parameters allows to read files on the server
2014-02-26 22:32:19 +01:00
Uwe Steinmann
5d879a3439 Merge branch 'seeddms-4.3.4' into develop
Conflicts:
	Makefile
	op/op.Ajax.php
	styles/bootstrap/application.js
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
2014-02-21 22:04:22 +01:00
Uwe Steinmann
5e2ede8fd5 set variable with preview width
next step will be to make this configurable
2014-02-21 21:51:53 +01:00
Uwe Steinmann
ea276405e6 unlinked documents/folders can be moved into rootfolder 2014-02-21 21:27:39 +01:00
Uwe Steinmann
02bd5c8f5f make warning about used attributes more visible 2014-02-21 21:26:56 +01:00
Uwe Steinmann
66b4885c8d fix some layout problems in forms 2014-02-21 11:27:03 +01:00
Uwe Steinmann
eae0d22bf3 add missing file for deleting content of document 2014-02-21 11:23:25 +01:00
Uwe Steinmann
3d1bb14c29 use same ordering in tree as in list (Bug #121) 2014-02-21 10:58:27 +01:00
Uwe Steinmann
a14c6b85e4 Merge branch 'seeddms-4.3.4' into develop
Conflicts:
	op/op.Login.php
2014-02-21 07:53:14 +01:00
Uwe Steinmann
90bea9a2fb fix handling of multivalue attributes 2014-02-20 21:05:22 +01:00
Uwe Steinmann
a4f26d3f68 Merge branch 'seeddms-4.3.3' into develop
Conflicts:
	CHANGELOG
	languages/de_DE/lang.inc
	languages/en_GB/lang.inc
	views/bootstrap/class.ViewFolder.php
2014-02-01 16:15:46 +01:00
Uwe Steinmann
94b107b7bd theme and language selector can be turn off on login page 2014-02-01 16:06:12 +01:00
Uwe Steinmann
3596a7a191 add support for configuring folder sort method of folders 2014-02-01 15:23:19 +01:00
Uwe Steinmann
5af3ceef36 apply htmlspecialchars() on converter cmds 2014-01-08 06:37:07 +01:00
Uwe Steinmann
2d4ded2d0f do not use short tags anymore 2014-01-08 06:36:40 +01:00
Uwe Steinmann
0ad0410404 run cmd of converters through htmlspecialchars() 2014-01-06 22:09:08 +01:00
Uwe Steinmann
ae8df3f9c6 replace all php short tags (bug #102) 2013-12-11 11:37:20 +01:00
Uwe Steinmann
39f19f25bb Merge branch 'seeddms-4.3.2' into develop
Conflicts:
	Makefile
2013-11-27 14:10:05 +01:00
Uwe Steinmann
b5b93470a5 add new checks for unlinked documents and folders 2013-11-27 09:44:43 +01:00
Uwe Steinmann
49c38263f8 tree for document chooser lists documents in folders without subfolders (Bug #105) 2013-11-26 21:31:43 +01:00
Uwe Steinmann
564a0eec9d fix php warning because of undefined variable 2013-11-26 21:13:16 +01:00
Uwe Steinmann
4538a26fae check for cyclic parent-child relations between folders 2013-11-26 07:45:33 +01:00
Uwe Steinmann
cf867792b2 Merge branch 'seeddms-4.3.2' into develop 2013-11-24 18:20:36 +01:00
Uwe Steinmann
92a11af19f add hook folderListHeader 2013-10-08 21:10:08 +02:00
Uwe Steinmann
9ab1160cea move application.css at end of css files, include jquery.cookie.js 2013-10-08 21:09:06 +02:00
Uwe Steinmann
fac83d7e1f set priority of log msg 2013-10-06 12:27:06 +02:00
Uwe Steinmann
fcffe34047 list all approval/review logs if admin 2013-10-06 08:08:41 +02:00
Uwe Steinmann
d51eb587f1 turning of the language selector will no longer turn of user substitution 2013-09-30 11:08:05 +02:00
Uwe Steinmann
63d8fa4314 make jumploader work with java 1.7 2013-09-30 09:11:58 +02:00
Uwe Steinmann
544cc2669f allow members of a group to approve a document if user is owner
only if enableOwnerRevApp is set in the settings
2013-09-27 08:25:37 +02:00
Uwe Steinmann
4c514a23b6 Merge branch 'seeddms-4.3.1' into develop
Conflicts:
	Makefile
2013-09-20 21:40:22 +02:00
Uwe Steinmann
08008551b9 replace hard coding strings with translation 2013-09-20 21:05:46 +02:00
Uwe Steinmann
b7f20daa26 use translation for hardcoded strings 2013-09-20 20:56:46 +02:00
Uwe Steinmann
eb9c1d14b6 add translation for 'Stastistic' (Bug #88) 2013-09-20 19:01:18 +02:00
Uwe Steinmann
58fdef13eb Merge branch 'seeddms-4.3.1' into develop 2013-09-20 13:45:33 +02:00
Uwe Steinmann
1b86aa6727 check for _enableOwnerRevApp before showing the approve/review button 2013-09-19 14:27:09 +02:00
Uwe Steinmann
617a37559c upper level of folder tree can be removed in presentation
This is controlled by a view parameter 'remove_root_from_tree' which
currently can only be set by an extension
2013-09-17 06:22:34 +02:00
Uwe Steinmann
9382c4d1b1 add config parameters for smtp username and password 2013-09-13 14:54:37 +02:00
Uwe Steinmann
1eb5669022 call hook startPage 2013-09-11 18:42:10 +02:00
Uwe Steinmann
9add363cad Merge branch 'seeddms-4.3.1' into develop 2013-09-09 22:17:40 +02:00
Uwe Steinmann
961a4351c2 add missing div in header
this also makes the folding of the menu work again
2013-09-09 20:46:33 +02:00
Uwe Steinmann
2a6ff25765 Merge branch 'seeddms-4.3.1' into develop 2013-09-09 07:34:42 +02:00
Uwe Steinmann
b87aa2b8c7 add missing placeholdes in chzn select box (fixes bug #87) 2013-09-09 07:31:06 +02:00
Uwe Steinmann
91a4c65b6c add translation text in select boxes (fixes bug #87)
if select box is managed by chosen and no match could be found
2013-09-09 07:16:18 +02:00
Uwe Steinmann
472ca6bd0f access 'expandFolderTree' via params[] array
do not add new class variable anymore
2013-09-09 06:43:04 +02:00
Uwe Steinmann
ac7bd8cbdc Merge branch 'seeddms-4.3.1' into develop 2013-09-06 15:26:34 +02:00
Uwe Steinmann
9f6cb6453c folder tree can be expanded again on default 2013-09-06 15:24:51 +02:00
Uwe Steinmann
353da0c297 Merge branch 'seeddms-4.3.1' into develop 2013-09-05 23:01:27 +02:00
Uwe Steinmann
9a0d6cb3b8 set icon for rar files (fixes bug #85) 2013-09-05 22:59:45 +02:00
Uwe Steinmann
76c7033313 Merge branch 'seeddms-4.3.1' into develop 2013-09-05 22:55:13 +02:00
Uwe Steinmann
275896d95c translate strings (fixes bug #86) 2013-09-05 22:51:01 +02:00
Uwe Steinmann
6e6fb20244 Merge branch 'hooks' into develop
Conflicts:
	Makefile
2013-09-05 08:52:37 +02:00
Uwe Steinmann
40ad10b45f set time of splash message
default for error message is now 3000 ms unless it is overritten by
'duration' parameter
2013-08-15 20:38:05 +02:00
Uwe Steinmann
e9adfa0f92 propper passing of url params in page list
the links in the page browser were missing propper attribute values
2013-08-14 09:12:20 +02:00
Uwe Steinmann
020384cb1c show clipboard only if enable in configuration 2013-08-13 14:48:43 +02:00
Uwe Steinmann
12f81b47eb call hook folderMenu 2013-08-12 07:03:24 +02:00
Uwe Steinmann
b2bc46b677 minor cosmetic change in printNavigation() 2013-08-12 07:02:40 +02:00