Commit Graph

103 Commits

Author SHA1 Message Date
Uwe Steinmann
b2b3975b70 Merge branch 'seeddms-5.0.x' into develop 2016-04-04 12:21:19 +02:00
Uwe Steinmann
2045060f78 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-04-04 08:59:28 +02:00
Uwe Steinmann
336b5f79d9 new version 4.3.26 2016-04-04 07:39:57 +02:00
Uwe Steinmann
8b1effc2f3 Merge branch 'seeddms-5.0.x' into develop 2016-03-23 12:36:47 +01:00
Uwe Steinmann
d398f7733f Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-23 12:34:50 +01:00
Uwe Steinmann
e0b55e8a0d add notes for 4.3.25 2016-03-23 08:31:08 +01:00
Uwe Steinmann
5139efd4d7 Merge branch 'develop' into seeddms-5.1.x 2016-03-09 06:46:55 +01:00
Uwe Steinmann
f859b48a57 Merge branch 'seeddms-5.0.x' into develop 2016-03-09 06:42:30 +01:00
Uwe Steinmann
dc3958b456 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-09 06:40:14 +01:00
Uwe Steinmann
79035cf187 new version 4.3.25 2016-03-08 18:39:32 +01:00
Uwe Steinmann
2721a43dde Merge branch 'develop' into seeddms-5.1.x 2016-02-24 14:43:10 +01:00
Uwe Steinmann
724dfd45e6 Merge branch 'seeddms-5.0.x' into develop 2016-02-24 14:40:41 +01:00
Uwe Steinmann
bc056c2003 new version 5.0.1 2016-02-22 14:37:27 +01:00
Uwe Steinmann
f41210f2d7 new version 5.1.0 2016-02-22 14:18:42 +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
0005d9ffaf another changelog entry for 4.3.24 2016-02-15 15:14:57 +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
528e911535 add note to 4.3.24 2016-02-10 11:32:40 +01:00
Uwe Steinmann
fc9ec1d3e3 add note 2016-02-09 13:13:02 +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
e87fe8a808 more notes for 4.3.24 2016-02-05 16:50:35 +01:00
Uwe Steinmann
3b8d7a5271 Merge branch 'seeddms-5.0.x' into develop 2016-02-04 19:22:59 +01:00
Uwe Steinmann
76f5a89f92 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-02 09:48:18 +01:00
Uwe Steinmann
383ad8391b add changes for 4.3.24 2016-02-01 20:49:04 +01:00
Uwe Steinmann
cb424bdba7 new version 4.3.24 2016-02-01 06:38:58 +01:00
Uwe Steinmann
6f4c1cb519 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-01-22 09:30:14 +01:00
Uwe Steinmann
f81eab28b4 new version 4.3.23 2016-01-21 07:41:09 +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
ea20501ed3 update date of new version 2015-09-28 14:34:19 +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
58413e5218 Merge branch 'seeddms-5.0.x' into develop 2015-08-19 09:24:20 +02:00
Uwe Steinmann
cde8e830f5 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-19 09:24:05 +02:00
Uwe Steinmann
7ae79bd09d new version 4.3.20 2015-08-19 08:30:51 +02:00
Uwe Steinmann
951a261030 new version 4.3.20 2015-08-19 08:22:07 +02:00
Uwe Steinmann
de8726cccf Merge branch 'seeddms-5.0.x' into develop 2015-07-28 09:01:02 +02:00
Uwe Steinmann
463e94ee8a Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
Conflicts:
	CHANGELOG
	Makefile
	SeedDMS_Core/Core/inc.ClassDMS.php
	SeedDMS_Core/package.xml
	inc/inc.Utils.php
	inc/inc.Version.php
	install/install.php
	op/op.ApproveDocument.php
	op/op.Login.php
	op/op.RemoveDocumentLink.php
	op/op.ReviewDocument.php
	out/out.SetReviewersApprovers.php
	views/bootstrap/class.Bootstrap.php
2015-06-30 07:05:27 +02:00
Uwe Steinmann
6c016f236a new version 4.3.19 2015-06-26 16:46:41 +02:00
Uwe Steinmann
4fed0eacc9 add notes for 4.3.19 2015-06-19 15:27:55 +02:00
Uwe Steinmann
d70a35a700 set release date 2015-06-09 11:26:26 +02:00
Uwe Steinmann
3cf724dea8 changes for 4.3.18 2015-06-02 10:32:49 +02:00
Uwe Steinmann
a6a335d481 add inc.ClassTransmittal.php 2015-05-08 07:55:07 +02:00
Uwe Steinmann
bac6810c2b changes for 4.3.18 2015-05-04 08:29:51 +02:00
Uwe Steinmann
55e3932912 changes in 5.0.0 2015-05-04 08:28:57 +02:00