gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-10-31 21:27:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,776 Commits 7 Branches 90 Tags 55 MiB
aabbb5c254
Commit Graph

604 Commits

Author SHA1 Message Date
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
ba4a6558b4 add new document list ReceiveOwner, list docs with revision in AppRevOwner 2017-01-17 13:44:19 +01:00
Uwe Steinmann
f6d3e9785f Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-16 15:52:19 +01:00
Uwe Steinmann
c37910e473 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-16 15:12:16 +01:00
Uwe Steinmann
57498f84a1 add optional parameter to filterDocumentLinks() 2017-01-16 12:59:02 +01:00
Uwe Steinmann
deceea4494 new version 5.0.9 2017-01-12 21:05:15 +01:00
Uwe Steinmann
d0662a6132 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-12 18:08:24 +01:00
Uwe Steinmann
950449ac04 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-12 18:03:01 +01:00
Uwe Steinmann
7e34053ece new version 4.3.32 2017-01-12 17:45:36 +01:00
Uwe Steinmann
2d2ebdc887 add ordering to all list in getDocumentList() 2017-01-10 21:25:15 +01:00
Uwe Steinmann
229ae54234 order groups by name in getAccessList() 2017-01-10 17:53:52 +01:00
Uwe Steinmann
e80987de9a order groups by name getAccessList() 2017-01-10 17:51:46 +01:00
Uwe Steinmann
6cb5dec1a9 fix search for documents with reception acknowledgement 2016-11-22 17:58:28 +01:00
Uwe Steinmann
662d9d0d85 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-11-22 10:34:15 +01:00
Uwe Steinmann
a4bec45158 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-11-22 10:28:29 +01:00
Uwe Steinmann
b3657b039a rename check() to checkForCycles() 2016-11-18 08:40:49 +01:00
Uwe Steinmann
3459f18c72 add check for cycles in workflow 2016-11-18 08:38:46 +01:00
Uwe Steinmann
c5a67874cf Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-11-14 11:27:18 +01:00
Uwe Steinmann
046f33f2e1 validate() is less strict on multi value attributes 
if the attribute has just one value the leading separator can be
omitted
 2016-11-14 11:26:26 +01:00
Uwe Steinmann
a8f5892562 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-11-14 11:11:11 +01:00
Uwe Steinmann
7d7bff7b22 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-11-14 11:11:00 +01:00
Uwe Steinmann
a1f6bd9a7d getAttributeValue() checks if value starts with seperator 2016-11-14 11:05:57 +01:00
Uwe Steinmann
530d75fdf0 getValueAsArray() checks if value starts with separator 
new funtion parseValue()
 2016-11-14 11:04:57 +01:00
Uwe Steinmann
106f849e82 minor documentation fix 2016-11-11 16:20:10 +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
b3571c360b new version 4.3.31 2016-11-08 11:27:28 +01:00
Uwe Steinmann
10a8b14eff take out search for reception 2016-11-04 20:28:22 +01:00
Uwe Steinmann
e5016cf4f1 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-11-03 19:46:07 +01:00
Uwe Steinmann
f1f970b0e0 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-11-02 18:13:18 +01:00
Uwe Steinmann
6c3a9c6734 add method getTransitions() to class SeedDMS_Core_Workflow[Action|State] 2016-11-02 17:57:23 +01:00
Uwe Steinmann
758ce0a24d validate() returns early if error was found 2016-10-27 17:47:47 +02:00
Uwe Steinmann
cc387a1f52 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-10-27 09:39:08 +02:00
Uwe Steinmann
f616256509 set check for boolean and date values, set more validation errors 2016-10-27 09:17:14 +02:00
Uwe Steinmann
04cb20a814 define and initialize $_ttreceiptid 2016-10-26 19:25:35 +02:00
Uwe Steinmann
d3c12a84fd Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-10-25 10:02:09 +02:00
Uwe Steinmann
11162ee2c5 add check for valid email address 2016-10-25 07:55:27 +02:00
Uwe Steinmann
622c6e134e Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-10-16 08:29:58 +02:00
Uwe Steinmann
e69fb26dcc prepare for new version 4.3.30 2016-10-07 16:11:29 +02:00
Uwe Steinmann
754d256532 prepare for next version 5.0.7 2016-10-07 16:10:49 +02:00
Uwe Steinmann
e77bec4419 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-10-07 16:08:56 +02:00
Uwe Steinmann
9bd1c111c8 clean up valueset in addAttributeDefintion() 
will remove all spaces from each value in the valueset
 2016-10-07 11:38:04 +02:00
Uwe Steinmann
e0880e8ebd add new method getValueSetSeparator() 2016-10-07 11:37:35 +02:00
Uwe Steinmann
2cc90ccbaf Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-10-06 15:29:11 +02:00
Uwe Steinmann
1541fc26ec Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-10-06 15:27:52 +02:00
Uwe Steinmann
f1bd74426e trim values in value set when retrieving it 2016-10-06 08:01:57 +02:00
Uwe Steinmann
500bbb552b Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-10-05 16:09:53 +02:00
Uwe Steinmann
aa62818e90 make sure $success has a value in validation method 2016-10-05 16:03:47 +02:00
Uwe Steinmann
489654c622 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-10-05 13:35:23 +02:00
Uwe Steinmann
e71f24f910 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-10-05 13:34:40 +02:00
Uwe Steinmann
bbc6376bcf fix setReceiptByGrp() 2016-10-05 12:39:16 +02:00
Uwe Steinmann
f5dc479714 fix error in addIndReceipt 2016-10-05 11:15:50 +02:00
Uwe Steinmann
d41937735e remove method login(), update documentation 2016-10-05 09:14:03 +02:00
Uwe Steinmann
8f851e1a3a search if only reception status is given 2016-10-04 21:28:53 +02:00
Uwe Steinmann
88d7f252b6 create temp table ttreceiptid 2016-09-28 21:28:51 +02:00
Uwe Steinmann
3e777f987d search for each reception status (no action, rejected, acknowledged) 2016-09-28 21:28:01 +02:00
Uwe Steinmann
be9f987342 search for documents with missing receptions 2016-09-28 20:22:16 +02:00
Uwe Steinmann
10f01c0fc6 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-09-16 11:29:06 +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
40e97f7363 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-09-15 17:04:28 +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
2fee305eb2 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-09-06 11:51:39 +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
813b265f6c Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-09-06 10:10:17 +02:00
Uwe Steinmann
84a65f0f32 implemented saving of layout data for workflows 2016-08-31 11:54:15 +02:00
Uwe Steinmann
a8fd2da7ea Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-08-25 17:10:01 +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
8126d6d3fe clean up parameters passed to getDocumentList() 2016-08-12 12:40:23 +02:00
Uwe Steinmann
eb2f3c7148 AppRevOwner list can ordered by passed parameter 2016-08-09 17:14:57 +02:00
Uwe Steinmann
eef3b28270 getDocumentList() accepts parameter for direction of order 2016-08-09 15:14:17 +02:00
Uwe Steinmann
d2e959e32e add command to set sql_mode as default by Ubuntu 16.04 (not active) 2016-08-08 20:28:35 +02:00
Uwe Steinmann
83dcd9da7b do not use '0000-00-00 00:00:00' as date anymore 
use NULL instead because '0000-00-00 00:00:00' in certain sql_modes
 2016-08-08 12:49:59 +02:00
Uwe Steinmann
dd1310871f Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-07-28 08:07:10 +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
13c3e15b4f Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-07-27 21:10:42 +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
303a114178 add field 'secret' for secret of 2-factor auth 2016-07-06 22:24:50 +02:00
Uwe Steinmann
a8c8dbf535 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-07-06 12:57:13 +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
a32a5c929a treat empty attribute value as no value in validate() 2016-05-30 19:24:43 +02:00
Uwe Steinmann
6380e028fa Merge branch 'seeddms-5.0.x' into develop 2016-05-03 07:09:26 +02:00
Uwe Steinmann
9fb4dfaa9b start new version 5.0.4 2016-05-03 06:44:50 +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
ad95fdecd9 add comment the getAccessMode() doesn't work in any case 2016-04-26 18:12:36 +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
cc685141e9 fix wrong variable name 2016-04-21 17:19:28 +02:00
Uwe Steinmann
b80cb91d54 check if parameter of setNoAccess() is set before using it 2016-04-13 18:29:21 +02:00
Uwe Steinmann
0511d06d63 add field for access restrictions by document status 2016-04-12 12:21:55 +02:00
Uwe Steinmann
130c894a35 check if version is accessible 
all functions which return a document version (e.g. getLatestVersion())
will check if access has been restricted by setting
SeedDMS_Core_DMS::noReadForStatus
 2016-04-12 07:46:37 +02:00
Uwe Steinmann
9786a51822 add variable noReadForStatus, method getLoggedInUser 
setting noReadForStatus will allow to check if a version may
be accessible in its status
 2016-04-12 07:44:48 +02:00
Uwe Steinmann
5224cbb9c6 Merge branch 'seeddms-5.0.x' into develop 2016-04-08 15:59:10 +02:00
Uwe Steinmann
94c3b635a6 use classname from $dms->_classnames for SeedDMS_Core_DocumentContent 2016-04-08 15:55:52 +02:00
Uwe Steinmann
0a87820f9a SeedDMS_Core_DocumentContent::getAccessMode() takes status into account 2016-04-08 15:10:43 +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
b2b3975b70 Merge branch 'seeddms-5.0.x' into develop 2016-04-04 12:21:19 +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
f5db1b66cb setStatus will not fail if status is unchanged, finishRevision() will no longer set state waіting 2016-03-24 15:40:25 +01:00
Uwe Steinmann
8b1effc2f3 Merge branch 'seeddms-5.0.x' into develop 2016-03-23 12:36:47 +01: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
e72e7f3f15 Merge branch 'seeddms-5.0.x' into develop 2016-03-22 15:22:19 +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
19793e41b9 add remove() 2016-03-18 22:47:15 +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
5139efd4d7 Merge branch 'develop' into seeddms-5.1.x 2016-03-09 06:46:55 +01:00
Uwe Steinmann
f859b48a57 Merge branch 'seeddms-5.0.x' into develop 2016-03-09 06:42:30 +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
4e32ce086e Merge branch 'develop' into seeddms-5.1.x 2016-03-08 10:46:34 +01:00
Uwe Steinmann
31017fee9d fix php error 2016-03-04 09:33:15 +01:00
Uwe Steinmann
42e168a1fc pass object of role to constructor in getAllInstances() 2016-03-04 09:23:55 +01:00
Uwe Steinmann
2721a43dde Merge branch 'develop' into seeddms-5.1.x 2016-02-24 14:43:10 +01:00
Uwe Steinmann
480aca1c80 add roles 2016-02-24 14:32:55 +01:00
Uwe Steinmann
f41210f2d7 new version 5.1.0 2016-02-22 14:18:42 +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
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
db8b5cc033 add 'WorkflowOwner' list to getDocumentList() 2016-02-10 13:33:56 +01:00
Uwe Steinmann
14f600da35 add 'WorkflowByMe' list in getDocumentList() 2016-02-10 12:30:51 +01:00
Uwe Steinmann
2a5a2cd61d Merge branch 'seeddms-5.0.x' into develop 2016-02-10 11:49:15 +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
2da2f0af9a Merge branch 'seeddms-5.0.x' into develop 2016-02-08 13:24:40 +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
3b8d7a5271 Merge branch 'seeddms-5.0.x' into develop 2016-02-04 19:22:59 +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
6b95229ff7 Merge branch 'seeddms-5.0.x' into develop 2015-12-09 21:54:02 +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
5351bd9596 create checkout filename from id, version and name 2015-11-30 20:47:19 +01:00
Uwe Steinmann
d04e65108d Merge branch 'seeddms-5.0.x' into develop 2015-11-19 08:00:10 +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
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
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
f78e02e7e8 Merge branch 'seeddms-5.0.x' into develop 2015-10-27 11:43:40 +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
031129a31c Merge branch 'seeddms-5.0.x' into develop 2015-10-20 18:21:47 +02: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
15bedc303e Merge branch 'seeddms-5.0.x' into develop 2015-09-28 14:54:03 +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
37f9771b97 Merge branch 'seeddms-5.0.x' into develop 2015-09-23 17:21:26 +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
b0edf297a2 Merge branch 'seeddms-5.0.x' into develop 2015-09-22 16:01:09 +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
e8b99cea70 replace all CURRENT_TIMESTAMP by $db->getCurrentTimestamp() 2015-09-22 09:01:18 +02:00
Uwe Steinmann
fcbb5f68fe Merge branch 'seeddms-5.0.x' into develop 2015-09-22 08:51:59 +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