Commit Graph

247 Commits

Author SHA1 Message Date
Uwe Steinmann
3853f0010f Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-08 13:17:29 +01:00
Uwe Steinmann
4c6ce8218a Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-03-08 11:34:17 +01:00
Uwe Steinmann
a528a3ce57 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-08 11:33:05 +01:00
Uwe Steinmann
711520234d retrieve complete document when checking for duplicates 2017-03-08 11:08:35 +01:00
Uwe Steinmann
e9c029e8fc fix syntax error 2017-02-28 17:12:27 +01:00
Uwe Steinmann
6e9b840e45 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-02-28 17:06:58 +01:00
Uwe Steinmann
c32a2e7f53 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-28 09:19:11 +01:00
Uwe Steinmann
310ebf8708 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-28 09:19:01 +01:00
Uwe Steinmann
4cc7bfca20 make sql state more compatible across databases 2017-02-28 09:17:25 +01:00
Uwe Steinmann
5cf7611304 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-28 09:10:27 +01:00
Uwe Steinmann
c7fbcb80c8 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-28 09:10:14 +01:00
Uwe Steinmann
b6d63b8705 make LIMIT in sql more database independent 2017-02-28 09:08:20 +01:00
Uwe Steinmann
3635b92edb fix sql for add user when pwdexpiration has a date 2017-02-28 08:00:45 +01:00
Uwe Steinmann
5bca4770d1 start new version 5.0.11 2017-02-28 07:09:30 +01:00
Uwe Steinmann
c3fea8b8bf new version 4.3.34 2017-02-28 06:39:32 +01:00
Uwe Steinmann
eab6552788 start new version 5.1.1 2017-02-28 06:35:36 +01:00
Uwe Steinmann
fea676c1d4 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-02-24 19:07:23 +01:00
Uwe Steinmann
c6567b2f90 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-24 13:49:37 +01:00
Uwe Steinmann
b9a7f622d1 remove backticks in sql statement
for some strange reason a select `document` ... UNION select `document`
will result in a php array where '`document`' and not 'document' is
the key. This makes getTimeline() fail.
2017-02-24 13:46:58 +01:00
Uwe Steinmann
473118b7bb new version 4.3.33 2017-02-22 11:31:59 +01:00
Uwe Steinmann
09ef3a86ba new version 5.0.10 2017-02-20 17:43:51 +01:00
Uwe Steinmann
4c794381e6 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-02-20 17:34:43 +01:00
Uwe Steinmann
52deebbf6e Merge branch 'seeddms-5.0.x-attachment' into seeddms-5.1.x 2017-02-20 15:37:44 +01:00
Uwe Steinmann
32d484a924 remove mergeAccessList() 2017-02-20 15:21:06 +01:00
Uwe Steinmann
75f21ddf02 add filterDocumentFiles() 2017-02-20 15:21:06 +01:00
Uwe Steinmann
2b154cc468 set pwdExpiration to null 2017-02-20 15:01:58 +01:00
Uwe Steinmann
534e93d7d9 new version 5.1.0 2017-02-20 08:55:29 +01:00
Uwe Steinmann
5921b1e731 set default value for pwdExpiration when unsetting it 2017-02-18 07:38:26 +01:00
Uwe Steinmann
7c84cc1b52 set pwdexpiration to null if no date is set 2017-02-16 15:27:01 +01:00
Uwe Steinmann
0053213856 pass $dms to getSearchFields() and cast id to text 2017-02-16 15:27:01 +01:00
Uwe Steinmann
307abdf493 pass tablename to getInsertID(), add pgsql as new db driver 2017-02-16 15:27:01 +01:00
Uwe Steinmann
502b5c5414 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-16 15:26:46 +01:00
Uwe Steinmann
658d556c3d getTimeline() checks also for new attachments 2017-02-16 15:01:20 +01:00
Uwe Steinmann
7dfbad5451 add missing backticks around identifier in sql statement 2017-02-14 16:59:52 +01:00
Uwe Steinmann
05cf0b83f4 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-14 14:58:41 +01:00
Uwe Steinmann
83c498418b add field to group by, because it will be selected 2017-02-14 12:24:55 +01:00
Uwe Steinmann
c34ea0ed02 add another field to group by, because it shall be selected 2017-02-14 12:21:58 +01:00
Uwe Steinmann
823e57c4c2 take out order field as it is not needed 2017-02-14 12:13:03 +01:00
Uwe Steinmann
0bba1445c9 fix case of identifiers in sql statement 2017-02-14 12:07:23 +01:00
Uwe Steinmann
90982d5774 add missing backticks in sql statement 2017-02-14 12:00:08 +01:00
Uwe Steinmann
7f1dc2dfe1 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-14 11:43:17 +01:00
Uwe Steinmann
e6e0611937 pwdexpiration can be 'never' or 'now' 2017-02-14 11:34:10 +01:00
Uwe Steinmann
e58f0888b5 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-14 09:06:23 +01:00
Uwe Steinmann
9c7605d40a add method getSearchFields() ind ClassDocument and use in search() 2017-02-14 08:29:03 +01:00
Uwe Steinmann
f0b710b266 change fullname to fullName 2017-02-13 20:21:22 +01:00
Uwe Steinmann
e74a9a4295 add missing backticks around identifier 2017-02-13 17:32:22 +01:00
Uwe Steinmann
42c050588b Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-13 12:48:20 +01:00
Uwe Steinmann
a65f4d56b5 add missing backticks around identifiers in sql statements 2017-02-13 12:47:15 +01:00
Uwe Steinmann
f6aded2428 put backticks around identifiers in sql statements 2017-02-13 12:37:26 +01:00
Uwe Steinmann
7d82b73208 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-13 12:12:07 +01:00