Commit Graph

59 Commits

Author SHA1 Message Date
Uwe Steinmann
ed486aabb0 Merge branch 'seeddms-4.3.13' into develop 2014-11-19 20:26:18 +01:00
Uwe Steinmann
1a35cdfb61 remove echo 2014-11-19 20:25:59 +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
e5e3128478 fix searching for several attributes 2014-11-19 16:59:39 +01:00
Uwe Steinmann
68b968036f add more documentation 2014-11-19 07:44:54 +01:00
Uwe Steinmann
e3a95ceeb2 another fix in searching for multi value attributes 2014-11-14 20:01:55 +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
cd1bff73be fix searching for multi value attributes 2014-11-13 07:53:29 +01:00
Uwe Steinmann
f76cb1afc1 new version 4.3.11 2014-11-07 08:42:55 +01:00
Uwe Steinmann
e364c3dd92 Merge branch 'seeddms-4.3.10' into develop
Conflicts:
	Makefile
2014-10-22 14:26:52 +02:00
Uwe Steinmann
a7a6d8d8ac new version 4.3.10 2014-10-22 14:15:16 +02:00
Uwe Steinmann
9ef3b6aa37 Merge branch 'seeddms-4.3.9' into develop 2014-07-24 13:20:23 +02:00
Uwe Steinmann
7ebaab55f1 fix counting folders in search() 2014-07-24 13:06:45 +02: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
5641b5b067 propperly initialize $totalDocs in search() 2014-07-24 07:52:43 +02:00
Uwe Steinmann
37f2705e6b fix syntax error 2014-07-23 20:28:10 +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
0acc1fad4d fix searching for folders by attributes
do not search documents if not at least one search criteria is given
2014-07-23 20:11:36 +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
b1d8a77b2a extend search() by searching in attributes 2014-06-30 07:41:28 +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
4de2bf318d new version 4.3.9 2014-05-22 07:50:36 +02:00
Uwe Steinmann
1a72e2bc4e set pwdexpiration to '0000-00-00 00:00:00' if not set (addUser()) (Bug #151) 2014-05-16 11:25:27 +02:00
Uwe Steinmann
71fb0326e1 Merge branch 'seeddms-4.3.8' into develop
Conflicts:
	Makefile
2014-04-09 09:55:38 +02:00
Uwe Steinmann
8bb07f80b7 new version 4.3.8 2014-04-09 09:46:16 +02:00
Uwe Steinmann
89ea53caf4 Merge branch 'seeddms-4.3.8' into develop 2014-04-09 09:26:22 +02:00
Uwe Steinmann
5e1564aa83 simplified code getStatisticalData() 2014-04-09 09:25:27 +02:00
Uwe Steinmann
1687ba233f fix sql statements in getStatisticalData()
makes them work for sqlite and mysql
2014-04-09 09:24:01 +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
9da9b10b88 make sql statement work for mysql and sqlite 2014-04-08 15:28:13 +02:00
Uwe Steinmann
76b765c0fa add more statistics in getStatisticData() 2014-04-08 09:15:59 +02:00
Uwe Steinmann
9154038211 add type 'docsperstatus' to getStatisticalData() 2014-04-02 08:21:10 +02:00
Uwe Steinmann
9cb368fcab new method getStatisticalData() 2014-04-01 21:03:22 +02:00
Uwe Steinmann
12e36a3d13 add homefolder to user 2014-03-26 17:29:56 +01:00
Uwe Steinmann
e4411cadf1 new version 4.3.7 2014-03-21 09:04:23 +01:00
Uwe Steinmann
f919c4ae2f new version 4.3.6 2014-03-18 16:46:13 +01:00
Uwe Steinmann
6f48eb9ad0 new version 4.3.5 2014-03-04 19:45:16 +01:00
Uwe Steinmann
4d44f549e9 set version to 4.3.4 2014-02-21 09:04:15 +01:00
Uwe Steinmann
92554f64aa new version 4.3.3 2014-02-01 16:28:54 +01:00
Uwe Steinmann
51d775c158 add methods checkFolders() and checkDocuments() 2013-11-27 09:43:33 +01:00
Uwe Steinmann
9b021e6e20 new version 4.3.1 2013-09-20 21:36:10 +02:00
Uwe Steinmann
a6972545fd set number of folders found in search() to 0
This was set to late and in case the ѕearch for folders was not done
a php warning was issued
2013-06-14 16:03:49 +02:00
Uwe Steinmann
45f0771b3f passing an array of user to search() is supported
till now it was only possible to filter the search by a single user
2013-06-07 10:09:32 +02:00
Uwe Steinmann
39d7eb045e add method getDocumentContent() 2013-05-29 20:05:15 +02:00
Uwe Steinmann
216eee25b1 add regex for checking attribute values 2013-05-28 09:01:04 +02:00
Uwe Steinmann
8c09b7fcb1 new versіon 4.3.0 2013-05-22 20:29:11 +02:00
Uwe Steinmann
60ea8fccb4 new version 4.2.2 2013-05-17 09:31:52 +02:00
Uwe Steinmann
baf4b9a979 new version 4.2.1 2013-05-02 07:19:19 +02:00
Uwe Steinmann
567b9a22bd new version 4.2.0 2013-04-19 14:40:03 +02:00