Commit Graph

87 Commits

Author SHA1 Message Date
Uwe Steinmann
de8726cccf Merge branch 'seeddms-5.0.x' into develop 2015-07-28 09:01:02 +02:00
Uwe Steinmann
284f987783 build tbs_template extension 2015-07-08 15:36:05 +02:00
Uwe Steinmann
e158a873f5 add target apidoc 2015-06-24 12:41:55 +02:00
Uwe Steinmann
67f7cce7d5 add target apidoc 2015-06-24 12:41:47 +02:00
Uwe Steinmann
778e867618 new version 5.0.0 2015-05-19 08:24:09 +02:00
Uwe Steinmann
1717277684 set version to 5.0.0-pre3 2015-04-15 21:19:02 +02:00
Uwe Steinmann
72c3207a75 Merge branch 'seeddms-4.3.17' into develop
Conflicts:
	Makefile
2015-03-30 16:40:24 +02:00
Uwe Steinmann
35043b1cda new version 4.3.17 2015-03-27 17:34:28 +01:00
Uwe Steinmann
cb81eb7db4 Merge branch 'seeddms-4.3.16' into develop
Conflicts:
	Makefile
	views/bootstrap/class.UsrMgr.php
2015-03-20 08:32:29 +01:00
Uwe Steinmann
358c239c3a new version 4.3.16 2015-03-20 08:16:05 +01:00
Uwe Steinmann
0335cc8bcd Merge branch 'seeddms-4.3.15' into develop
Conflicts:
	Makefile
	views/bootstrap/class.Search.php
	views/bootstrap/class.Settings.php
2015-03-17 06:52:33 +01:00
Uwe Steinmann
558be76dae new version 4.3.15 2015-03-12 11:06:23 +01:00
Uwe Steinmann
1aa08781b2 Merge branch 'seeddms-4.3.14' into develop
Conflicts:
	Makefile
	SeedDMS_Core/Core/inc.ClassFolder.php
2015-01-29 18:22:19 +01:00
Uwe Steinmann
6516c7ff1a set version to 4.3.14 2015-01-29 18:20:03 +01:00
Uwe Steinmann
5c60726508 new version 4.3.13 2014-11-21 11:56:51 +01:00
Uwe Steinmann
e9c3696466 Merge branch 'seeddms-4.3.13' into develop
Conflicts:
	Makefile
2014-11-19 17:04:56 +01:00
Uwe Steinmann
76a4ad7e9c set PHPDOC and force rebuilding of documentation 2014-11-19 17:03:34 +01:00
Uwe Steinmann
93510320ec new version 4.3.12 2014-11-17 07:15:13 +01:00
Uwe Steinmann
15c5392ed8 Merge branch 'seeddms-4.3.11' into develop
Conflicts:
	Makefile
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
2014-11-13 09:21:08 +01:00
Uwe Steinmann
f76cb1afc1 new version 4.3.11 2014-11-07 08:42:55 +01:00
Uwe Steinmann
e364c3dd92 Merge branch 'seeddms-4.3.10' into develop
Conflicts:
	Makefile
2014-10-22 14:26:52 +02:00
Uwe Steinmann
ff3e41f988 new version 4.3.10 2014-10-22 14:15:28 +02:00
Uwe Steinmann
f13ef894b2 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	Makefile
	op/op.RemoveDocument.php
	op/op.UpdateDocument.php
	out/out.RemoveDocument.php
2014-06-04 07:58:06 +02:00
Uwe Steinmann
b5dfa63d0e new version 4.3.9 2014-05-22 13:27:49 +02:00
Uwe Steinmann
71fb0326e1 Merge branch 'seeddms-4.3.8' into develop
Conflicts:
	Makefile
2014-04-09 09:55:38 +02:00
Uwe Steinmann
8bb07f80b7 new version 4.3.8 2014-04-09 09:46:16 +02:00
Uwe Steinmann
468846b19f Merge branch 'seeddms-4.3.7' into develop
Conflicts:
	Makefile
	op/op.Download.php
2014-03-21 09:20:19 +01:00
Uwe Steinmann
e4411cadf1 new version 4.3.7 2014-03-21 09:04:23 +01:00
Uwe Steinmann
c1f5a31f13 Merge branch 'seeddms-4.3.6' into develop
Conflicts:
	Makefile
2014-03-18 16:55:06 +01:00
Uwe Steinmann
f919c4ae2f new version 4.3.6 2014-03-18 16:46:13 +01:00
Uwe Steinmann
386ac5f208 Merge branch 'seeddms-4.3.5' into develop
Conflicts:
	Makefile
2014-03-04 19:48:08 +01:00
Uwe Steinmann
6f48eb9ad0 new version 4.3.5 2014-03-04 19:45:16 +01:00
Uwe Steinmann
50d939cd8e Merge branch 'seeddms-4.3.4' into develop
Conflicts:
	Makefile
	op/op.RemoveFolder.php
2014-02-26 23:12:40 +01:00
Uwe Steinmann
a5945ff593 add restapi to distribution 2014-02-26 23:09:53 +01:00
Uwe Steinmann
5d879a3439 Merge branch 'seeddms-4.3.4' into develop
Conflicts:
	Makefile
	op/op.Ajax.php
	styles/bootstrap/application.js
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
2014-02-21 22:04:22 +01:00
Uwe Steinmann
4d44f549e9 set version to 4.3.4 2014-02-21 09:04:15 +01:00
Uwe Steinmann
6aa821490d Merge branch 'seeddms-4.3.3' into develop
Conflicts:
	Makefile
2014-02-01 16:46:34 +01:00
Uwe Steinmann
92554f64aa new version 4.3.3 2014-02-01 16:28:54 +01:00
Uwe Steinmann
39f19f25bb Merge branch 'seeddms-4.3.2' into develop
Conflicts:
	Makefile
2013-11-27 14:10:05 +01:00
Uwe Steinmann
99cb2503dc new version 4.3.2 2013-11-27 10:58:20 +01:00
Uwe Steinmann
4c514a23b6 Merge branch 'seeddms-4.3.1' into develop
Conflicts:
	Makefile
2013-09-20 21:40:22 +02:00
Uwe Steinmann
9b021e6e20 new version 4.3.1 2013-09-20 21:36:10 +02:00
Uwe Steinmann
6e6fb20244 Merge branch 'hooks' into develop
Conflicts:
	Makefile
2013-09-05 08:52:37 +02:00
Uwe Steinmann
b6ca77e261 new version 4.3.0 2013-09-05 07:44:22 +02:00
Uwe Steinmann
04dc5f95a4 new verson 4.3.0RC3 2013-08-14 08:12:34 +02:00
Uwe Steinmann
ef933079bc set version to 4.3.0RC2 2013-08-13 15:10:40 +02:00
Uwe Steinmann
899e972fb8 add extension login_action 2013-07-31 21:55:41 +02:00
Uwe Steinmann
3401024e2d add rules for packing extensions 2013-07-23 06:35:04 +02:00
Uwe Steinmann
c0961ae809 new version 4.3.0RC1 2013-07-19 23:08:28 +02:00
Uwe Steinmann
4ab841b09d new version 4.3.0pre3 2013-06-17 16:04:14 +02:00