Commit Graph

38 Commits

Author SHA1 Message Date
Uwe Steinmann
480aca1c80 add roles 2016-02-24 14:32:55 +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
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
625462712d replace comment in german, fix typo 2016-02-10 10:03:21 +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
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
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
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
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
6be0d179fc Merge branch 'seeddms-5.0.x' into develop 2015-09-21 16:58:25 +02:00
Uwe Steinmann
b6012ae428 set homefolder to NULL if not set 2015-09-21 12:51:37 +02:00
Uwe Steinmann
832e760e03 use configured class names, remove old code 2015-07-15 08:20:55 +02:00
Uwe Steinmann
a0d0790a34 initialize return array 2015-06-18 17:36:47 +02:00
Uwe Steinmann
207f0b255f add method maySwitchToUser(), fix getReverseSubstitutes() 2015-05-19 19:42:29 +02:00
Uwe Steinmann
d4652a614c add functions for handling substitutes 2015-05-19 08:03:12 +02:00
Uwe Steinmann
0fab2df676 many changes on revision workflow 2015-05-11 09:29:34 +02:00
Uwe Steinmann
d7d4ab6390 use classnames in SeedDMS_Core_DMS when instanciating, new method
getDocumentCheckOuts()
2015-04-22 17:20:57 +02:00
Uwe Steinmann
a590fec967 add revision workflow 2015-04-22 10:31:36 +02:00
Uwe Steinmann
ca9715c3bc various error fixes in sql statements for ReceiptLog 2015-04-20 18:32:56 +02:00
Uwe Steinmann
8824aa4624 add administration of recipients of documents 2015-04-20 13:43:40 +02:00
Uwe Steinmann
ba5185eec8 fix wrong sql statement in getInstance() 2015-04-16 14:11:14 +02:00
Uwe Steinmann
7e8fb4451c add method getInstance() 2015-04-14 19:37:06 +02:00
Uwe Steinmann
1fcc786d25 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
	SeedDMS_Core/Core/inc.ClassUser.php
	op/op.AddDocument.php
	styles/bootstrap/application.css
	views/bootstrap/class.UsrMgr.php
2014-05-22 08:21:22 +02:00
Uwe Steinmann
a20043ff10 set pwdExperiation to a valid date before saving in database 2014-05-16 11:29:25 +02:00
Uwe Steinmann
12e36a3d13 add homefolder to user 2014-03-26 17:29:56 +01:00
Uwe Steinmann
856920a20a add management of homefolder 2014-03-26 08:16:53 +01:00
Uwe Steinmann
452330709b replace NOW() by CURRENT_TIMESTAMP in sql statements 2013-03-26 21:06:20 +01:00
Uwe Steinmann
73c6ff9427 major name change from letodms to seeddms 2013-02-14 12:10:53 +01:00