Commit Graph

86 Commits

Author SHA1 Message Date
Uwe Steinmann
f33f7ab41a Merge branch 'seeddms-5.0.x' into develop 2015-11-16 21:58:04 +01:00
Uwe Steinmann
af15dd7573 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-11-16 08:09:00 +01:00
Uwe Steinmann
5200057e19 fix another error message 2015-11-16 08:08:30 +01:00
Uwe Steinmann
9c2928a60f fix error message when creation date was wrong 2015-11-16 08:06:55 +01:00
Uwe Steinmann
b2163806ad fix check of expiration date range 2015-11-16 08:02:32 +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
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
7e507e6a9e fix searching in fulltext, number of hits and pages was often wrong 2015-09-28 12:32:41 +02:00
Uwe Steinmann
022490e461 set propper content type for excel documents 2015-08-25 16:43:27 +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
58d8d8dd9e set search time, document und folder count after fulltext search 2015-08-19 20:15:04 +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
572927668a remove space in content type for excel sheet 2015-07-27 20:54:21 +02:00
Uwe Steinmann
52559730d9 use new customizable preview converters 2015-06-25 19:52:02 +02:00
Uwe Steinmann
1a179c7dca check if includecontent is set
if not set only the excel file is delivered
2015-06-17 08:34:15 +02:00
Uwe Steinmann
73650ae32e send end date to end of day 2015-06-10 19:15:10 +02:00
Uwe Steinmann
2cd37d90b1 send end date to end of day 2015-06-10 19:14:28 +02:00
Uwe Steinmann
9d4a219065 send end date to end of day 2015-06-10 19:14:07 +02:00
Uwe Steinmann
8e2aeb7264 pass resultmode to view 2015-06-08 09:15:33 +02:00
Uwe Steinmann
4180e56690 check if resultmode is set before passing it to view 2015-06-08 09:13:47 +02:00
Uwe Steinmann
83cdedad51 pass resultmode to view 2015-06-08 09:12:25 +02:00
Uwe Steinmann
f7c8d39b5d pass resultmode to view 2015-06-08 09:08:32 +02:00
Uwe Steinmann
11bac92d2f if $_GE['export'] is set the search result will be downloaded as a
zipfile
2015-06-02 17:28:09 +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
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
d7d63ae129 fix calculation of totalPages 2015-03-20 07:57:02 +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
a257c25277 fully obey permissions of documents 2015-03-17 06:36:33 +01:00
Uwe Steinmann
f992adf775 do not used fixed classnames for SeedDMS_Core[Folder|Document]
use classname returned by SeedDMЅ_Core_DMS::getClassname()
2015-02-05 07:38:56 +01:00
Uwe Steinmann
e486254d80 include inc/inc.Init.php, new order of include files 2014-12-08 14:47:32 +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
5ff934373d take all attributes for searching into account 2014-11-13 07:54:35 +01:00
Uwe Steinmann
31da6d4f5f Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
2014-07-24 07:58:32 +02:00
Uwe Steinmann
0026f8c69c selecting a status or category will not turn of folder search 2014-07-23 20:51:45 +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
c5b41095a2 pass folder attributes to search form 2014-07-23 20:12:29 +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
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