Commit Graph

5269 Commits

Author SHA1 Message Date
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
fc3548cca7 set pwdexpiration to 'now' and 'never' 2017-02-14 11:24:41 +01:00
Uwe Steinmann
586dffe403 setPwdExpiration() accepts keywords 'now' and 'never' 2017-02-14 11:24:11 +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
f251e30f5a fix sql error 2017-02-14 08:38:57 +01:00
Uwe Steinmann
9c7605d40a add method getSearchFields() ind ClassDocument and use in search() 2017-02-14 08:29:03 +01:00
Uwe Steinmann
f976bf0e83 check if temp table ttcontentid exists in sql statement 2017-02-14 07:15:14 +01:00
Uwe Steinmann
d9aaad16d3 add missing backticks around identifier in sql statement 2017-02-14 06:29:23 +01:00
Uwe Steinmann
0a6034a92e Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-14 06:23:49 +01:00
Uwe Steinmann
0fbc5cc289 do not use x,y syntax in limit clause 2017-02-14 06:22:36 +01:00
Uwe Steinmann
f0b710b266 change fullname to fullName 2017-02-13 20:21:22 +01:00
Uwe Steinmann
c785906ffb Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-13 18:23:46 +01:00
Uwe Steinmann
28af59db73 remove double backticks in sql statement 2017-02-13 18:23:24 +01:00
Uwe Steinmann
27a323a38f Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-13 18:20:49 +01:00
Uwe Steinmann
a4eac8affc remove double backticks in sql statement 2017-02-13 18:20:21 +01:00
Uwe Steinmann
602903de46 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-13 18:16:50 +01:00
Uwe Steinmann
572fabfd1a add missing backticks around identifier 2017-02-13 18:16:24 +01:00
Uwe Steinmann
e74a9a4295 add missing backticks around identifier 2017-02-13 17:32:22 +01:00
Uwe Steinmann
2b91fb06bc put backticks around identifier 2017-02-13 16:51:57 +01:00
Uwe Steinmann
89811361bb Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-13 12:49:09 +01:00
Uwe Steinmann
38ea469b12 add missing backticks 2017-02-13 12:48:54 +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
Uwe Steinmann
6a3bf35739 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-12 08:07:45 +01:00
Uwe Steinmann
a3a80f0a6b put backticks around identifier in sql statements 2017-02-12 08:07:14 +01:00
Uwe Steinmann
eae27d0646 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-11 16:33:48 +01:00
Uwe Steinmann
290ab91fc7 use 'fullName' instead of 'fullname' 2017-02-11 16:32:09 +01:00
Uwe Steinmann
6559706b15 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-11 15:21:45 +01:00
Uwe Steinmann
aa90fdaaf9 include LogInit.php 2017-02-11 15:20:52 +01:00
Uwe Steinmann
0229d329e3 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-10 08:07:17 +01:00
Uwe Steinmann
c74caf1d43 fix sql statement in setOwner() 2017-02-10 08:06:22 +01:00
Uwe Steinmann
6e41c58beb add backticks around identifier in sql statements 2017-02-10 08:04:19 +01:00
Uwe Steinmann
2f0cb09e31 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-09 17:49:21 +01:00
Uwe Steinmann
fd5b5034db add method rbt() 2017-02-09 16:45:58 +01:00
Uwe Steinmann
ba1d3c8c9b fix incluѕion of files 2017-02-08 16:38:04 +01:00
Uwe Steinmann
3efdea76c0 add '`' around table name 2017-02-08 16:22:49 +01:00
Uwe Steinmann
d5dc6b125d Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-08 15:52:00 +01:00
Uwe Steinmann
72e7e2aa20 add missing '`', do not create empty category 2017-02-08 15:47:44 +01:00
Uwe Steinmann
3a411b8461 add missing '`', do not create empty category 2017-02-08 15:47:07 +01:00
Uwe Steinmann
341aa12a05 call new hook 'documentPreview' 2017-02-07 11:52:38 +01:00
Uwe Steinmann
51b0131617 add entry for 4.3.33 2017-02-03 12:22:46 +01:00