Commit Graph

910 Commits

Author SHA1 Message Date
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
3d4f64a4e6 dangling links not needed anymore 2015-07-28 15:20:35 +02:00
Uwe Steinmann
de8726cccf Merge branch 'seeddms-5.0.x' into develop 2015-07-28 09:01:02 +02:00