Commit Graph

347 Commits

Author SHA1 Message Date
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
19c195a357 Merge branch 'seeddms-5.0.x' into develop 2015-11-11 06:52:36 +01:00
Uwe Steinmann
ac09780cad Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-11-11 06:27:58 +01:00
Uwe Steinmann
4dd2dc87af new version 4.3.22 2015-11-09 20:00: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
ea20501ed3 update date of new version 2015-09-28 14:34:19 +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
65133cb366 started new version 4.3.21 2015-09-22 07:55:28 +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
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
229d976113 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-21 16:58:14 +02:00
Uwe Steinmann
c385d86a60 add timeline over all documents 2015-09-21 16:46:17 +02:00
Uwe Steinmann
b6012ae428 set homefolder to NULL if not set 2015-09-21 12:51:37 +02:00
Uwe Steinmann
419af9880a initial version of getTimeline() 2015-09-21 12:42:58 +02:00