Commit Graph

164 Commits

Author SHA1 Message Date
Uwe Steinmann
156354ac76 pass '' as orderby to hook searchListHeader() 2017-03-24 09:17:24 +01:00
Uwe Steinmann
df27dcf878 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-20 11:54:55 +01:00
Uwe Steinmann
c823981bd9 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-15 16:45:02 +01:00
Uwe Steinmann
82d0bfde44 set preview with for document icons 2017-03-15 16:41:32 +01:00
Uwe Steinmann
012d4d9f8d Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-03 09:43:45 +01:00
Uwe Steinmann
2d9f3f8494 call hook searchListHeader 2017-03-02 20:00:56 +01:00
Uwe Steinmann
1c359cb701 pass context to hook documentListItem 2017-03-02 08:40:46 +01:00
Uwe Steinmann
c63f994a5f Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-18 15:13:18 +01:00
Uwe Steinmann
47db85c175 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-18 15:11:45 +01:00
Uwe Steinmann
8959a9e167 add searching for document id 2017-01-18 14:45:40 +01:00
Uwe Steinmann
66e6cec446 add filter for status 'S_DRAFT' 2017-01-11 17:49:21 +01:00
Uwe Steinmann
e21e897468 use keywords for different searches for document reception 2016-11-22 17:58:59 +01:00
Uwe Steinmann
ca76b64ba8 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-11-08 12:00:44 +01:00
Uwe Steinmann
2ed68b22d2 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-11-08 11:39:02 +01:00
Uwe Steinmann
943d8d262c make entries in search result dragable and dropable 2016-11-08 11:10:09 +01:00
Uwe Steinmann
10a8b14eff take out search for reception 2016-11-04 20:28:22 +01:00
Uwe Steinmann
9d1f3b867f Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-10-04 20:55:33 +02:00
Uwe Steinmann
3d50543b66 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-10-04 20:48:51 +02:00
Uwe Steinmann
b29dfb2f50 call printAttributeEditField() with optional parameter norequire=true 2016-10-04 17:05:46 +02:00
Uwe Steinmann
94c3ba51d1 search for each status of reception 2016-09-28 21:29:36 +02:00
Uwe Steinmann
9746c85ce5 add search paramter for documents with missing reception 2016-09-28 20:22:59 +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
0006416b7e add class table-hover to table 2016-05-18 09:19:46 +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
7e3cd7d6c4 move inclusion SeedDMS/Preview.php into view 2016-04-26 13:43:02 +02:00
Uwe Steinmann
92ab26d547 call hook extraDownloadHeader 2016-04-22 12:58:28 +02:00
Uwe Steinmann
8d8f3e51fb move excel export into view 2016-04-18 20:53:00 +02:00
Uwe Steinmann
2188babab8 move js from html into dynamic js file 2016-04-18 13:21:56 +02:00
Uwe Steinmann
7d50c6e69d Merge branch 'seeddms-5.0.x' into develop 2016-03-31 11:19:36 +02:00
Uwe Steinmann
8cd3e6cada Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-31 11:17:47 +02:00
Uwe Steinmann
8ac0a99e09 take out last empty line (Closes: #252, #254)
causes a header to be send to early
2016-03-29 08:03:08 +02: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
7099dc6d73 set $openfilterdlg before accordion for export 2016-02-25 10:43:14 +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
5863d962ac Merge branch 'seeddms-5.0.x' into develop 2015-12-16 09:30:16 +01:00
Uwe Steinmann
1acad75f83 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-15 21:04:45 +01:00
Uwe Steinmann
dfeac6843f no need for $user in js() 2015-12-15 21:02:14 +01:00
Uwe Steinmann
29f4ca0710 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-14 12:09:16 +01:00
Uwe Steinmann
5f85b2290a do not access view parameter 'folder' in js() 2015-12-14 11:47:11 +01:00
Uwe Steinmann
8cc2d4d9ab change all links to op/op.Search.php to out/out.Search.php 2015-12-14 10:48:56 +01:00
Uwe Steinmann
b21237e87a seperate html from javascript 2015-12-14 09:53:42 +01:00
Uwe Steinmann
a30b3b9505 Merge branch 'seeddms-5.0.x' into develop 2015-10-30 13:09:25 +01:00
Uwe Steinmann
50e0d2a885 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-30 08:41:40 +01:00
Uwe Steinmann
15b1414d6e set format in date field to yyyy-mm-dd 2015-10-30 08:02:57 +01:00
Uwe Steinmann
07053ca7e9 check for includecontent checkbox and pass it to url 2015-08-25 16:44:07 +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
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
d09605c6b9 pass null to printAttributeEditField if attribute is not set 2015-07-14 21:26:40 +02:00
Uwe Steinmann
52559730d9 use new customizable preview converters 2015-06-25 19:52:02 +02:00
Uwe Steinmann
7f2bb15d49 remove some superflous chars 2015-06-23 19:10:14 +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
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
13a977f84f add export button if search returned documents 2015-06-02 17:29:33 +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
a80f4090af add filter for documents in revision 2015-05-19 19:41:40 +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
304e54f009 list only users in select box which are not hidden 2015-04-27 21:29:35 +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
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
cb3392c774 propperly take new workflow mode traditional_only_approval into account 2015-03-17 11:19:55 +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
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
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
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
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
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
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
184811f9b6 remove container around search result 2014-06-11 11:02:50 +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
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
a152a57735 use new code for printing delete document icon 2014-06-04 19:21:59 +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
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
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
2a6ff25765 Merge branch 'seeddms-4.3.1' into develop 2013-09-09 07:34:42 +02:00