Commit Graph

80 Commits

Author SHA1 Message Date
Uwe Steinmann
ef8e4e8400 inList() returns false or the index of the element
backported from develop
2015-07-15 08:18:17 +02:00
Uwe Steinmann
cb13a89c1a add checking for duplicates 2015-05-13 18:42:42 +02:00
Uwe Steinmann
1717277684 set version to 5.0.0-pre3 2015-04-15 21:19:02 +02:00
Uwe Steinmann
7e8fb4451c add method getInstance() 2015-04-14 19:37:06 +02:00
Uwe Steinmann
72c3207a75 Merge branch 'seeddms-4.3.17' into develop
Conflicts:
	Makefile
2015-03-30 16:40:24 +02:00
Uwe Steinmann
35043b1cda new version 4.3.17 2015-03-27 17:34:28 +01: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
358c239c3a new version 4.3.16 2015-03-20 08:16:05 +01:00
Uwe Steinmann
3f46cbad5b add method inList() 2015-03-17 17:45:12 +01:00
Uwe Steinmann
b3bfaf9ac5 Merge branch 'seeddms-4.3.15' into develop
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
2015-02-05 09:37:52 +01:00
Uwe Steinmann
b04aecd7f3 fix objects returned by SeedDMS_Core_DMS::getAllUsers()
they have lanuage und theme set again
2015-02-05 09:35:05 +01:00
Uwe Steinmann
5496aa2bcc do not use fixed class names for folders and documents anymore
use instead the classname stored in $classnames[]
2015-02-05 07:37:50 +01:00
Uwe Steinmann
1aa08781b2 Merge branch 'seeddms-4.3.14' into develop
Conflicts:
	Makefile
	SeedDMS_Core/Core/inc.ClassFolder.php
2015-01-29 18:22:19 +01:00
Uwe Steinmann
6516c7ff1a set version to 4.3.14 2015-01-29 18:20:03 +01:00
Uwe Steinmann
ee2bb4ffd2 names of classes for folder, document objects can be set 2014-12-08 14:34:11 +01:00
Uwe Steinmann
631066b697 Merge branch 'seeddms-4.3.13' into develop 2014-11-27 13:52:38 +01:00
Uwe Steinmann
0eb9da705d getDocumentCategories() returns categories sorted by name (Bug #181) 2014-11-24 19:51:43 +01:00
Uwe Steinmann
17269c2979 add class variable enforceRename
if set, uploaded files will be move (not copied) into the document store
2014-11-24 15:07:46 +01:00
Uwe Steinmann
406b4a5a00 Merge branch 'seeddms-4.3.13' into develop
Conflicts:
	Makefile
2014-11-24 13:13:38 +01:00
Uwe Steinmann
5c60726508 new version 4.3.13 2014-11-21 11:56:51 +01:00
Uwe Steinmann
34cd44e35e more fixes for search by attributes 2014-11-21 11:35:49 +01:00
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