Commit Graph

310 Commits

Author SHA1 Message Date
Uwe Steinmann
25d609d894 add changelog for 5.0.12 2017-07-10 15:08:16 +02:00
Uwe Steinmann
efd8273901 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-07-10 15:06:33 +02:00
Uwe Steinmann
b0a9767bfb Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-07-10 15:03:58 +02:00
Uwe Steinmann
aad36c0973 and changes for 5.0.12 2017-07-10 14:57:07 +02:00
Uwe Steinmann
99682a11d1 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-07-10 07:50:33 +02:00
Uwe Steinmann
bdcf9d8e93 add notes for 6.0.1 2017-07-05 10:48:03 +02:00
Uwe Steinmann
1db5675990 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-06-28 15:27:50 +02:00
Uwe Steinmann
4a590ef8e4 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-06-28 15:11:29 +02:00
Uwe Steinmann
17c8163972 add note for 4.3.35 2017-06-28 15:00:07 +02:00
Uwe Steinmann
8c0e832414 add note 2017-06-27 17:08:23 +02:00
Uwe Steinmann
919f4cb39c Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-06-26 10:20:48 +02:00
Uwe Steinmann
ae06028d20 add note 2017-06-24 07:16:54 +02:00
Uwe Steinmann
98e7615c5b Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-05-12 18:46:25 +02:00
Uwe Steinmann
b406d31ea0 add menu tasks including checkbox in settings for enabling it 2017-05-12 18:09:53 +02:00
Uwe Steinmann
092967004a Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-05-12 08:23:42 +02:00
Uwe Steinmann
ba44ee14a7 add note for 5.1.2 2017-05-12 08:17:45 +02:00
Uwe Steinmann
3cc572a1cd Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-05-02 06:47:42 +02:00
Uwe Steinmann
e9c0b679bc add changelog for 5.1.2 2017-04-24 16:48:38 +02:00
Uwe Steinmann
29d801cff9 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-04-20 10:03:13 +02:00
Uwe Steinmann
ce975fc86d Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-04-11 10:21:47 +02:00
Uwe Steinmann
0b2d663c56 add empty notes in latest version 2017-04-11 10:21:23 +02:00
Uwe Steinmann
a65101feb7 fix syntax error 2017-04-11 10:19:36 +02:00
Uwe Steinmann
ffb4f3179d add changes for 6.0.1 2017-04-04 07:33:58 +02:00
Uwe Steinmann
72c5bd237b Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-23 18:48:45 +01:00
Uwe Steinmann
6a7e23375c Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-03-23 18:08:23 +01:00
Uwe Steinmann
a001d32854 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-23 17:43:39 +01:00
Uwe Steinmann
6bb6662de4 start new version 4.3.35 2017-03-23 15:39:18 +01:00
Uwe Steinmann
c18f09d344 start new version 6.0.1 2017-03-23 15:22:55 +01:00
Uwe Steinmann
4c6ce8218a Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-03-08 11:34:17 +01:00
Uwe Steinmann
a528a3ce57 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-08 11:33:05 +01:00
Uwe Steinmann
be2a1c7f2d add changes for 4.3.34 2017-03-08 11:13:50 +01:00
Uwe Steinmann
6e9b840e45 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-02-28 17:06:58 +01:00
Uwe Steinmann
5bbce8ffee Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-28 07:31:26 +01:00
Uwe Steinmann
0319621497 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-28 07:13:13 +01:00
Uwe Steinmann
5bca4770d1 start new version 5.0.11 2017-02-28 07:09:30 +01:00
Uwe Steinmann
c3fea8b8bf new version 4.3.34 2017-02-28 06:39:32 +01:00
Uwe Steinmann
eab6552788 start new version 5.1.1 2017-02-28 06:35:36 +01:00
Uwe Steinmann
8d7c8a0bdf Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-02-22 13:22:51 +01:00
Uwe Steinmann
5b3ff3e4df Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-22 12:33:20 +01:00
Uwe Steinmann
2ef1a5896f Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-22 11:40:20 +01:00
Uwe Steinmann
473118b7bb new version 4.3.33 2017-02-22 11:31:59 +01:00
Uwe Steinmann
b03fcc5b6a fix versions 2017-02-21 06:20:03 +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
71892eba6c new version 5.1.0 2017-02-20 20:10:05 +01:00
Uwe Steinmann
864c56b54a Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-20 18:05:34 +01:00
Uwe Steinmann
09ef3a86ba new version 5.0.10 2017-02-20 17:43:51 +01:00
Uwe Steinmann
4c794381e6 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-02-20 17:34:43 +01:00
Uwe Steinmann
534e93d7d9 new version 5.1.0 2017-02-20 08:55:29 +01:00
Uwe Steinmann
247f27fa54 add more notes to 5.1.2 2017-01-25 14:58:41 +01:00
Uwe Steinmann
cf3dba89e0 add note to 5.1.2 2017-01-25 11:55:33 +01:00
Uwe Steinmann
86530371f4 add changes to 5.1.2 2017-01-25 09:55:15 +01:00
Uwe Steinmann
c1e38ec059 add note to 5.1.2 2017-01-20 14:30:26 +01:00
Uwe Steinmann
c63f994a5f Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-18 15:13:18 +01:00
Uwe Steinmann
47db85c175 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-18 15:11:45 +01:00
Uwe Steinmann
62c997db19 add note for 4.3.32 2017-01-18 14:46:24 +01:00
Uwe Steinmann
825c4378a0 add latest version 5.1.2 which somehow got lost 2017-01-18 11:08:17 +01:00
Uwe Steinmann
f6d3e9785f Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-16 15:52:19 +01:00
Uwe Steinmann
c37910e473 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-16 15:12:16 +01:00
Uwe Steinmann
57498f84a1 add optional parameter to filterDocumentLinks() 2017-01-16 12:59:02 +01:00
Uwe Steinmann
c09146796f Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-12 21:06:54 +01:00
Uwe Steinmann
deceea4494 new version 5.0.9 2017-01-12 21:05:15 +01:00
Uwe Steinmann
b832ace635 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-12 18:22:21 +01:00
Uwe Steinmann
25f23544d2 fix order of releases 2017-01-12 18:19:45 +01:00
Uwe Steinmann
662d6149b7 remove wrong entry in notes 2017-01-12 18:18:37 +01:00
Uwe Steinmann
d0662a6132 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-12 18:08:24 +01:00
Uwe Steinmann
950449ac04 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-12 18:03:01 +01:00
Uwe Steinmann
97fe1e5d38 new version 4.3.32 2017-01-12 17:44:29 +01:00
Uwe Steinmann
662d9d0d85 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-11-22 10:34:15 +01:00
Uwe Steinmann
a4bec45158 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-11-22 10:28:29 +01:00
Uwe Steinmann
f339a77227 add note on new method SeedDMS_Core_Workflow::checkForCycles() 2016-11-18 08:41:44 +01:00
Uwe Steinmann
a8f5892562 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-11-14 11:11:11 +01:00
Uwe Steinmann
7d7bff7b22 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-11-14 11:11:00 +01:00
Uwe Steinmann
38cdbe04d2 add notes 2016-11-14 11:07:03 +01:00
Uwe Steinmann
ba338191cb new version 5.1.2 2016-11-08 14:06:37 +01:00
Uwe Steinmann
e5016cf4f1 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-11-03 19:46:07 +01:00
Uwe Steinmann
f1f970b0e0 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-11-02 18:13:18 +01:00
Uwe Steinmann
e92dc2498b start new version 4.3.31 2016-11-02 18:07:30 +01:00
Uwe Steinmann
cc387a1f52 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-10-27 09:39:08 +02:00
Uwe Steinmann
0c1f318709 add note for 5.0.7 2016-10-27 09:18:01 +02:00
Uwe Steinmann
622c6e134e Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-10-16 08:29:58 +02:00
Uwe Steinmann
0904130f0f new version 5.0.7 2016-10-07 16:08:00 +02:00
Uwe Steinmann
3ea94f4159 new version 4.3.30 2016-10-07 16:05:19 +02:00
Uwe Steinmann
10f01c0fc6 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-09-16 11:29:06 +02:00
Uwe Steinmann
9fca3c0302 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-09-16 11:28:47 +02:00
Uwe Steinmann
a79652e824 add note for 4.3.29 2016-09-16 11:19:40 +02:00
Uwe Steinmann
6e7be7c751 another note for 4.3.29 2016-09-15 14:04:00 +02:00
Uwe Steinmann
74d785623e add note 2016-09-07 16:49:28 +02:00
Uwe Steinmann
2fee305eb2 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-09-06 11:51:39 +02:00
Uwe Steinmann
bf5ddaf9f7 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-09-06 11:43:31 +02:00
Uwe Steinmann
b2181441f3 new version 4.3.29 2016-09-06 11:34:29 +02:00
Uwe Steinmann
a8fd2da7ea Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-08-25 17:10:01 +02:00
Uwe Steinmann
05a7a897f2 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-24 11:17:17 +02:00
Uwe Steinmann
606b04bc55 new version 4.3.28 2016-08-24 10:19:41 +02:00
Uwe Steinmann
71e7d6f3e6 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-08-09 06:31:50 +02:00
Uwe Steinmann
e4d2d7e56c new version 5.0.5 2016-08-09 06:23:58 +02:00
Uwe Steinmann
6097b7b9a9 add dummy note 2016-08-02 11:29:48 +02:00
Uwe Steinmann
a8c8dbf535 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-07-06 12:57:13 +02:00
Uwe Steinmann
4196e11792 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-07-04 21:13:41 +02:00
Uwe Steinmann
30a264a16a add note for 4.3.27 2016-07-04 09:14:46 +02:00
Uwe Steinmann
1b0a972cdd set notes for 5.1.1 2016-05-23 13:43:18 +02:00
Uwe Steinmann
6380e028fa Merge branch 'seeddms-5.0.x' into develop 2016-05-03 07:09:26 +02:00
Uwe Steinmann
9fb4dfaa9b start new version 5.0.4 2016-05-03 06:44:50 +02:00
Uwe Steinmann
38f02a149e Merge branch 'seeddms-5.0.x' into develop 2016-05-03 06:40:50 +02:00
Uwe Steinmann
129b725414 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-05-03 06:32:54 +02:00
Uwe Steinmann
127ae5c487 start new version 4.3.27 2016-04-26 12:07:17 +02:00
Uwe Steinmann
5224cbb9c6 Merge branch 'seeddms-5.0.x' into develop 2016-04-08 15:59:10 +02:00
Uwe Steinmann
0b51aad25a add changes for 5.0.3 2016-04-08 15:57:13 +02:00
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