Commit Graph

819 Commits

Author SHA1 Message Date
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