gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-17 05:22:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,834 Commits 7 Branches 76 Tags 32 MiB
0b8b92076a
Commit Graph

433 Commits

Author SHA1 Message Date
Uwe Steinmann
d41937735e remove method login(), update documentation 2016-10-05 09:14:03 +02:00
Uwe Steinmann
9fca3c0302 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-09-16 11:28:47 +02:00
Uwe Steinmann
01b6de8428 add getWorkflow() 2016-09-16 11:20:32 +02:00
Uwe Steinmann
53a277bb2b add method rewriteWorkflowLog() 2016-09-16 11:18:47 +02:00
Uwe Steinmann
a5651d3ce6 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-09-15 14:02:59 +02:00
Uwe Steinmann
4ccdcac7df rewrite[Review|Approval]Log() copies file 2016-09-15 11:02:40 +02:00
Uwe Steinmann
f2eac265f9 force reload of workflow transitions after adding new transition 2016-09-07 16:48:05 +02:00
Uwe Steinmann
8881ad1e74 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-09-06 14:49:22 +02:00
Uwe Steinmann
0977ed0a76 new version 4.3.29 2016-09-06 14:35:30 +02:00
Uwe Steinmann
bf5ddaf9f7 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-09-06 11:43:31 +02:00
Uwe Steinmann
8fd19944a4 getAttributes() orders attributes by attr def name 2016-09-06 11:31:03 +02:00
Uwe Steinmann
05a7a897f2 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-24 11:17:17 +02:00
Uwe Steinmann
6ab08983bb new version 4.3.28 2016-08-24 10:20:53 +02:00
Uwe Steinmann
5215d0a230 search() searches in comment of document versions 2016-08-24 10:17:21 +02:00
Uwe Steinmann
727169d5ff Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-07-28 08:07:00 +02:00
Uwe Steinmann
398244ab68 add $_comment as protected var, add some more documentation 2016-07-28 08:05:40 +02:00
Uwe Steinmann
6bebd3df5e Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-07-27 21:10:31 +02:00
Uwe Steinmann
506e63f8d6 add fold marks 2016-07-27 08:29:52 +02:00
Uwe Steinmann
4196e11792 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-07-04 21:13:41 +02:00
Uwe Steinmann
d7898f972e new version 4.3.27 2016-07-04 09:17:35 +02:00
Uwe Steinmann
0afbcc73d8 fix some sql statements to work with mysql 5.7.5 (Closes: #273) 2016-07-04 09:11:50 +02:00
Uwe Steinmann
9fb4dfaa9b start new version 5.0.4 2016-05-03 06:44: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
0b69ddb439 callbacks can have more than one user function 2016-04-26 12:06:41 +02:00
Uwe Steinmann
135f9c06f6 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-04-22 16:49:11 +02:00
Uwe Steinmann
2ee76efedb new version 4.3.26 2016-04-22 16:46:56 +02:00
Uwe Steinmann
94c3b635a6 use classname from $dms->_classnames for SeedDMS_Core_DocumentContent 2016-04-08 15:55:52 +02:00
Uwe Steinmann
2c14ec295a various minor clean ups 
remove old code, add scope of variables, add additional comments
 2016-04-07 08:29:35 +02:00
Uwe Steinmann
2045060f78 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-04-04 08:59:28 +02:00
Uwe Steinmann
ae14f25d58 add more callbacks 2016-04-04 07:39:39 +02:00
Uwe Steinmann
d398f7733f Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-23 12:34:50 +01:00
Uwe Steinmann
510e177391 fix setting multi value attributes for a version 2016-03-23 08:30:38 +01:00
Uwe Steinmann
0577fec1ba Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-22 15:11:42 +01:00
Uwe Steinmann
826c9fca72 use __construct for constructor 2016-03-22 15:08:36 +01:00
Uwe Steinmann
9a319ef539 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-09 08:06:37 +01:00
Uwe Steinmann
4c2fd6962a new version 4.3.25 2016-03-09 08:01:31 +01:00
Uwe Steinmann
dc3958b456 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-09 06:40:14 +01:00
Uwe Steinmann
ec8f40cf1f rename getNotificationsByGroup() to getNotifications() 2016-03-08 14:56:27 +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
69e0ae0b3d get getDocumentsLocked() sets locking user in document 2016-02-15 15:14:42 +01:00
Uwe Steinmann
c01a84cfb7 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-15 08:24:39 +01:00
Uwe Steinmann
3a47861a50 propperly returns false if operation fails in addGroup() and delGroup() 2016-02-15 08:04:38 +01:00
Uwe Steinmann
43c80a9f73 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-10 11:48:19 +01:00
Uwe Steinmann
a8c98b5f72 add method getWorkflowStatus() 2016-02-10 10:32:27 +01:00
Uwe Steinmann
625462712d replace comment in german, fix typo 2016-02-10 10:03:21 +01:00
Uwe Steinmann
d1ffd8db1a fix getDocumentsByCategory() 
didn't return the documents
 2016-02-09 13:12:31 +01:00
Uwe Steinmann
0903eacb62 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-08 12:46:59 +01:00
Uwe Steinmann
879a67ab84 getNotificationsBy[User|Group] uses the new methods in SeedDMS_Core_User and SeedDMS_Core_Group 2016-02-05 16:48:32 +01:00
Uwe Steinmann
e0de75d160 add method getNotifications() 2016-02-05 16:47:54 +01:00
Uwe Steinmann
d4deb0cc35 add method getNotifications() 2016-02-05 16:47:38 +01:00
Uwe Steinmann
b04571da11 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-04 19:13:06 +01:00
Uwe Steinmann
f57a6a6600 getStatistics() returns info about folders and versions 2016-02-04 18:25:04 +01:00
Uwe Steinmann
d835aa84fe better checking when setting attr. value 2016-02-03 14:45:00 +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
0c8768a09e new version 4.3.24 2016-02-01 20:49:28 +01:00
Uwe Steinmann
e4c229854e make sure boolean attribute is set to 0/1 2016-01-29 16:44:05 +01:00
Uwe Steinmann
51f80c0930 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-01-27 17:23:22 +01:00
Uwe Steinmann
a935a635c8 make list of workflow status distinct, add [g|s]etMandatoryWorkflows() 2016-01-27 16:18:12 +01:00
Uwe Steinmann
f81eab28b4 new version 4.3.23 2016-01-21 07:41:09 +01:00
Uwe Steinmann
0167723ca9 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-09 19:49:39 +01:00
Uwe Steinmann
d105fa5155 add new method createDump() 2015-12-09 18:24:31 +01:00
Uwe Steinmann
8fbec2821b Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-09 18:06:48 +01:00
Uwe Steinmann
6ad953005d take out echo of sql statement 2015-12-09 18:06:23 +01:00
Uwe Steinmann
9c0fe92998 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-09 18:04:12 +01:00
Uwe Steinmann
666fc944ff getReadAccess() returns right list of users 
doesn't return users anymore which have no read access
because the group has no read access
 2015-12-09 18:01:27 +01:00
Uwe Steinmann
2575a675aa msg can be passed to del[Ind|Grp][Approver|Reviewer]() 2015-12-09 17:48:29 +01:00
Uwe Steinmann
9d763b60a5 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-11-19 07:59:34 +01:00
Uwe Steinmann
1532ba3b82 getTimeLine() returns only false if db query fails 2015-11-19 06:43:02 +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
f225b42d71 set number of type_date to 7 2015-10-30 08:06:32 +01:00
Uwe Steinmann
ec581518f0 add new type for date fields 2015-10-30 08:05:22 +01:00
Uwe Steinmann
b7d1b0e663 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-27 11:42:39 +01:00
Uwe Steinmann
fa0e365375 fix sql-Statement in createPasswordRequest() (Closes #236) 2015-10-27 11:33:23 +01:00
Uwe Steinmann
2f9e015856 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-20 18:20:24 +02:00
Uwe Steinmann
193077fdcd properly set homefolder to NULL when creating a user 2015-10-19 13:42:19 +02:00
Uwe Steinmann
54b2e8a881 add statusid and fileid in entry of timeline 2015-10-19 13:12:35 +02:00
Uwe Steinmann
1d626fc7e5 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-28 14:53:46 +02:00
Uwe Steinmann
33c5e313d0 do not pass parameter 'localtime' to strftime() 2015-09-28 13:25:00 +02:00
Uwe Steinmann
42dbb30e22 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 16:03:15 +02:00
Uwe Steinmann
3f82cb1957 do not add item to timeline if date is empty 2015-09-23 15:47:46 +02:00
Uwe Steinmann
58731cfdde Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-22 15:59:47 +02:00
Uwe Steinmann
109f814fa9 new version 4.3.21 2015-09-22 10:22:40 +02:00
Uwe Steinmann
083e323721 take out creation of content from timeline 
it will be added by the status log anyway
 2015-09-22 09:24:06 +02:00
Uwe Steinmann
c3296e476b Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-22 07:57:54 +02:00
Uwe Steinmann
daa72a9ca3 user getCurrentTimestamp() and getCurrentDatetime() 2015-09-22 07:50:36 +02:00
Uwe Steinmann
4ffa4399a2 add getCurrentDatetime() and getCurrentTimestamp() 
getCurrentTimestamp() used return the sql statement for a datetime
 2015-09-22 07:48:49 +02:00
Uwe Steinmann
272d9a43ee Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-21 18:10:07 +02:00
Uwe Steinmann
8295cde1e7 add getCurrentTimestamp() to database driver 
will return datetime('now', 'localtime') for sqlite because otherwise
it will return GMT
 2015-09-21 18:08:05 +02:00
Uwe Steinmann
229d976113 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-21 16:58:14 +02:00
Uwe Steinmann
c385d86a60 add timeline over all documents 2015-09-21 16:46:17 +02:00
Uwe Steinmann
b6012ae428 set homefolder to NULL if not set 2015-09-21 12:51:37 +02:00
Uwe Steinmann
419af9880a initial version of getTimeline() 2015-09-21 12:42:58 +02:00
Uwe Steinmann
8ab6dda490 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-18 07:59:15 +02:00
Uwe Steinmann
753733d153 set type and params in list of timeline actions 2015-09-18 07:54:08 +02:00
Uwe Steinmann
b55627f213 add initial support for timeline of recent changes 2015-09-16 21:19:46 +02:00
Uwe Steinmann
0a4e2861ce fix sql statements when searching fro attributes (Closes #227) 2015-08-31 07:58:09 +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
7ae79bd09d new version 4.3.20 2015-08-19 08:30:51 +02:00
Uwe Steinmann
123cccc72a getAccessMode() takes user/group rights in acls into account for guests 2015-08-19 08:21:15 +02:00
Uwe Steinmann
81872f4319 unset homefolder of users before the folder will be deleted 2015-08-05 21:19:00 +02:00
Uwe Steinmann
1e17c393bb Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-05 16:57:07 +02:00
Uwe Steinmann
150e5445df add method setDate() 2015-08-04 07:39:14 +02:00
Uwe Steinmann
bc1eecc08c add methods to rewrite approval and review log 2015-08-04 07:38:45 +02:00
Uwe Steinmann
1200460cee add parameter $format to checkDate() 2015-08-04 07:37:48 +02:00
Uwe Steinmann
53bac225fb add SeedDMS_Core_Document::setDate() 2015-07-31 15:34:07 +02:00
Uwe Steinmann
01c30a0b8a add new method rewriteStatusLog(), add option parameter date to 
setStatus()
 2015-07-31 15:30:35 +02:00
Uwe Steinmann
3699adfaf5 add method checkDate() 2015-07-31 15:30:00 +02:00
Uwe Steinmann
b5f5ef6e21 use configured classname in getInstance() 2015-07-15 22:28:58 +02:00
Uwe Steinmann
ecbdb4ea4a use configured classname, remove old code 2015-07-15 22:28:31 +02:00
Uwe Steinmann
156ec69355 fix documentation error 2015-07-15 08:21:28 +02:00
Uwe Steinmann
832e760e03 use configured class names, remove old code 2015-07-15 08:20:55 +02:00
Uwe Steinmann
533011df95 use configured class names 2015-07-15 08:20:27 +02:00
Uwe Steinmann
40646009ab minor documentation fix 2015-07-15 08:20:08 +02:00
Uwe Steinmann
de62d04129 fix some return values, use configured class names 2015-07-15 08:19:09 +02:00
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
463e94ee8a Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 
Conflicts:
	CHANGELOG
	Makefile
	SeedDMS_Core/Core/inc.ClassDMS.php
	SeedDMS_Core/package.xml
	inc/inc.Utils.php
	inc/inc.Version.php
	install/install.php
	op/op.ApproveDocument.php
	op/op.Login.php
	op/op.RemoveDocumentLink.php
	op/op.ReviewDocument.php
	out/out.SetReviewersApprovers.php
	views/bootstrap/class.Bootstrap.php
 2015-06-30 07:05:27 +02:00
Uwe Steinmann
6c016f236a new version 4.3.19 2015-06-26 16:46:41 +02:00
Uwe Steinmann
44bb62f413 add optional parameter cleasAccessList() 
will turn off removal of notification
 2015-06-19 15:25:20 +02:00
Uwe Steinmann
68d1816251 add optional parameter cleasAccessList() 
will turn off removal of notification
 2015-06-19 15:24:19 +02:00
Uwe Steinmann
870fb2d662 add cleanNotifyList() which removes users/groups with read access 
also adds an optional parameter $noclean to setDefaultAccess and
setInheritAccess which keeps the methods from cleaning up the
notifier list
 2015-06-19 15:04:50 +02:00
Uwe Steinmann
28bfe5c1d7 add cleanNotifyList() which removes users/groups with read access 
also adds an optional parameter $noclean to setDefaultAccess and
setInheritAccess which keeps the methods from cleaning up the
notifier list
 2015-06-19 15:02:37 +02:00
Uwe Steinmann
1f19d7daaf setDefaultAccess() propperly removes notifier without read access 2015-06-19 12:55:51 +02:00
Uwe Steinmann
1bd1198335 setDefaultAccess() cleanly removes als notifiers without read access 
This failed because the first call of removeNotify() has invalidated
the list of notifiers
 2015-06-19 12:53:57 +02:00
Uwe Steinmann
c4bea610cb setDefaultAccess() propperly removes notifier without read access 2015-06-19 12:52:49 +02:00
Uwe Steinmann
92299df0ea setDefaultAccess() cleanly removes als notifiers without read access 
This failed because the first call of removeNotify() has invalidated
the list of notifiers
 2015-06-19 12:47:30 +02:00
Uwe Steinmann
2cdc9e3a1f fix some code which was intended for 5.0.x 2015-06-18 17:44:22 +02:00
Uwe Steinmann
7f9de8b665 subfolders and documents can be order by date and direction can be set 2015-06-18 13:50:45 +02:00
Uwe Steinmann
4cbd1be175 subfolders and documents can be order by date and direction can be set 2015-06-18 13:49:52 +02:00
Uwe Steinmann
cc9f40997b rename approveLogId to approveLogID 2015-06-12 12:43:54 +02:00
Uwe Steinmann
418da4cb52 rename approveLogId to approveLogID 2015-06-12 12:42:37 +02:00
Uwe Steinmann
d55346ba0f manage file uploaded with review or approval 2015-06-11 21:32:16 +02:00
Uwe Steinmann
5b40c64413 manage file uploaded with review or approval 2015-06-11 21:28:04 +02:00
Uwe Steinmann
1a63dbb1de unset $this->_status in SeedDMS_Core_DocumentContent::setStatus() 2015-05-30 07:35:27 +02:00
Uwe Steinmann
cb13a89c1a add checking for duplicates 2015-05-13 18:42:42 +02:00
Uwe Steinmann
259303fff1 add checking for duplicates 2015-05-13 17:38:20 +02:00
Uwe Steinmann
c2b2240238 pass on msg to setStatus() in verifyStatus() 2015-05-04 08:39:24 +02:00
Uwe Steinmann
bda66d22dd pass on msg to setStatus() in verifyStatus() 2015-05-04 08:38:46 +02:00
Uwe Steinmann
e47218eb32 add optional parameter $msg to 
SeedDMS_Core_DocumentContent::verifyStatus()

set when method is called in removeWorkflow
 2015-05-04 08:29:23 +02:00
Uwe Steinmann
6867d1dc87 add optional parameter $msg to 
SeedDMS_Core_DocumentContent::verifyStatus()

set when method is called in removeWorkflow
 2015-05-04 08:27:20 +02:00
Uwe Steinmann
4187b78053 new version 4.3.18 2015-05-04 06:26:01 +02:00
Uwe Steinmann
2781974f7b Merge commit 'a252f82f085b8284d353a31a7fa583b8f12da4fa' into seeddms-5.0.0-pre3 2015-04-23 12:38:31 +02:00
Uwe Steinmann
62be2422d0 fix error in managing reviewers 2015-04-20 18:35:05 +02:00
Uwe Steinmann
ba5185eec8 fix wrong sql statement in getInstance() 2015-04-16 14:11:14 +02:00
Uwe Steinmann
1717277684 set version to 5.0.0-pre3 2015-04-15 21:19:02 +02:00
Uwe Steinmann
b0bc6e5c01 use variable classnames instead of fixed names 2015-04-15 16:11:07 +02:00
Uwe Steinmann
444d3a8b01 add new method getAttribute() 2015-04-15 14:11:21 +02:00
Uwe Steinmann
7e8fb4451c add method getInstance() 2015-04-14 19:37:06 +02:00
Uwe Steinmann
3f35ff5671 add new attribute types url and email, add attribute validation 2015-04-14 19:36:10 +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
57520f27cf clean workflow log if document version is deleted 2015-03-27 17:15:21 +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
5b8746a8a5 add methods getSearchFields() and getSearchTables() 2015-02-05 07:36:37 +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
a4065698d6 fix checking for subfolder (Bug #194) 2015-01-29 18:15:04 +01:00
Uwe Steinmann
cdeda7ecb1 add missing start of transaction 2014-12-08 16:57:26 +01:00
Uwe Steinmann
8ace74ef85 do not used fixed class names for folders and documents anymore 2014-12-08 14:34:54 +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
5f7dd4d472 add methode getIntance(), place code to remove folder into its own 
methode
 2014-12-08 14:33:13 +01:00
Uwe Steinmann
bcee025d90 add method getInstance() 2014-12-08 14:32:47 +01:00
Uwe Steinmann
631066b697 Merge branch 'seeddms-4.3.13' into develop 2014-11-27 13:52:38 +01:00
Uwe Steinmann
d6565041cd add new methode replaceContent() 
instead of adding a new version, this function replaces the content
file of a version
 2014-11-27 13:40:58 +01:00
Uwe Steinmann
0eb9da705d getDocumentCategories() returns categories sorted by name (Bug #181) 2014-11-24 19:51:43 +01:00
Uwe Steinmann
8614412908 check if SeedDMS_Core_DMS::forceRename is set 2014-11-24 15:08:37 +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
1ddc9ea337 better documentation for getFolderPathPlain() 2014-11-17 11:27:19 +01:00
Uwe Steinmann
2fb95a1d4a add some more documentation 2014-11-17 10:45:07 +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
86ba6aa6a6 add new method getValueAsArray() 
helpful for multi value attributes
 2014-11-13 08:20:45 +01:00
Uwe Steinmann
9f758667c4 fix saving of multi value attributes 2014-11-13 07:53:51 +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
55def11f01 fix saving of multi value attributes 2014-11-04 16:54:56 +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
e2974f2054 Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	views/bootstrap/class.ViewFolder.php
 2014-07-11 12:49:21 +02:00
Uwe Steinmann
7e91088cde preset $reqversion in addDocument() to 0 2014-07-11 08:36:46 +02:00