Commit Graph

165 Commits

Author SHA1 Message Date
Uwe Steinmann
9905a1ed75 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-09 10:22:58 +01:00
Uwe Steinmann
51942e2b54 fix typo in attribute name 2017-03-09 10:22:38 +01:00
Uwe Steinmann
d2bf22994d Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-09 09:34:32 +01:00
Uwe Steinmann
cae24d3d22 fix syntax error 2017-03-09 09:34:16 +01:00
Uwe Steinmann
e70cadf5dd Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-09 07:58:07 +01:00
Uwe Steinmann
62e1a02ae7 use version and public field from document files 2017-03-09 07:57:39 +01:00
Uwe Steinmann
caf35ad868 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-09 07:40:39 +01:00
Uwe Steinmann
dea2327089 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-03-09 07:40:28 +01:00
Uwe Steinmann
21a3a51d11 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-09 07:40:16 +01:00
Uwe Steinmann
453c410722 issue warning instead of info if object already exists 2017-03-09 07:39:46 +01:00
Uwe Steinmann
3853f0010f Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-08 13:17:29 +01:00
Uwe Steinmann
1cb7ad8e4f Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-03-06 13:49:01 +01:00
Uwe Steinmann
8af55380b0 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-06 13:48:48 +01:00
Uwe Steinmann
d1829dfe29 fix import of object type of attribute definitions 2017-03-06 13:47:38 +01:00
Uwe Steinmann
e5326430cb Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-06 11:42:56 +01:00
Uwe Steinmann
b675561d2f Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-03-06 11:42:41 +01:00
Uwe Steinmann
1f751f3a86 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-06 11:42:28 +01:00
Uwe Steinmann
62eb18f6a3 set keywords to '' if not set in xml file 2017-03-06 11:37:18 +01:00
Uwe Steinmann
322bef00a2 include inc/inc.ClassAcl.php 2017-03-06 10:56:16 +01:00
Uwe Steinmann
858b9b4b38 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-06 10:54:16 +01:00
Uwe Steinmann
3741587d2a Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-03-06 10:53:54 +01:00
Uwe Steinmann
f5b96b1d7a Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-06 10:53:41 +01:00
Uwe Steinmann
fc7cd1c944 take out include on missing file 2017-03-06 10:53:20 +01:00
Uwe Steinmann
132f146a9f Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-06 10:52:36 +01:00
Uwe Steinmann
4d2aec52fe Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-03-06 10:51:36 +01:00
Uwe Steinmann
cabe4371e7 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-06 10:51:24 +01:00
Uwe Steinmann
1436d3d969 check if SEEDDMS_HOME is set 2017-03-06 10:50:51 +01:00
Uwe Steinmann
478b88b514 check for SEEDDMS_HOME, issue warning if user has been removed from process 2017-03-06 10:49:04 +01:00
Uwe Steinmann
469270882c add receiptlog 2017-03-03 22:09:42 +01:00
Uwe Steinmann
5bdf7868d5 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-03 15:00:04 +01:00
Uwe Steinmann
89539bbcb8 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-03-03 14:59:49 +01:00
Uwe Steinmann
c1c7c66df8 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-03 14:59:36 +01:00
Uwe Steinmann
adf318abec wrap more fields with CData 2017-03-03 14:59:13 +01:00
Uwe Steinmann
df2d5f0407 wrapWithCData() attribute value set 2017-03-03 14:36:59 +01:00
Uwe Steinmann
706465a971 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-22 09:41:08 +01:00
Uwe Steinmann
7f28008d5d get and set secret of user 2017-02-21 08:16:22 +01:00
Uwe Steinmann
7fc7ffd708 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-02-21 06:16:32 +01:00
Uwe Steinmann
c0bc5cde15 export version and public of document files 2017-02-20 21:34:40 +01:00
Uwe Steinmann
76e816d290 replace echo with logger 2017-02-20 21:24:53 +01:00
Uwe Steinmann
a761b0b417 set pwdexpiration to '' if it is '0000-00-00' 2017-02-20 17:11:37 +01:00
Uwe Steinmann
ded86e7c0e turn off debugging 2017-02-16 15:41:04 +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
d3eefc41bc Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-09-22 18:24:32 +02:00
Uwe Steinmann
a28c9c6ab8 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-09-22 18:22:46 +02:00
Uwe Steinmann
a8f27ed0d5 prohibit access 2016-09-22 17:24:57 +02:00
Uwe Steinmann
df63e1bb7e insert acos and aros 2016-09-22 08:48:28 +02:00
Uwe Steinmann
159aa09636 dump acos, aros 2016-09-22 08:48:09 +02:00
Uwe Steinmann
556626501c Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-09-16 17:26:12 +02:00
Uwe Steinmann
e2dc18e536 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-09-16 17:25:59 +02:00
Uwe Steinmann
e6809d588e take out some old code 2016-09-16 17:23:43 +02:00