gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-07 15:44:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,211 Commits 7 Branches 80 Tags 38 MiB
854700183c
Commit Graph

59 Commits

Author SHA1 Message Date
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
4de2bf318d new version 4.3.9 2014-05-22 07:50:36 +02:00
Uwe Steinmann
0144c4c396 Merge branch 'seeddms-4.3.8' into develop 2014-04-10 11:22:05 +02:00
Uwe Steinmann
55a8d7275f make class variable _number public 2014-04-10 11:19:22 +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
caa8603435 set version to 4.3.7 2014-03-21 09:13:31 +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
f9c4c02fdc new version 4.3.5 2014-03-04 19:45:29 +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
2979fc9648 Merge branch 'develop' into hooks 
Conflicts:
	views/bootstrap/class.ViewFolder.php
 2013-07-19 23:14:29 +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
Uwe Steinmann
c4b1a9bc05 new version 4.3.0pre2 2013-06-07 22:02:12 +02:00
Uwe Steinmann
72010b1bc0 Merge branch 'develop' into hooks 2013-06-06 16:02:28 +02:00
Uwe Steinmann
8e7eae836c set version to 4.3.0pre1 2013-05-31 14:23:45 +02:00
Uwe Steinmann
17130cec5e Merge branch 'develop' into hooks 2013-05-22 20:31:57 +02:00
Uwe Steinmann
8c09b7fcb1 new versіon 4.3.0 2013-05-22 20:29:11 +02:00
Uwe Steinmann
df35579ea6 Merge branch 'develop' into hooks 2013-05-17 09:47:14 +02:00
Uwe Steinmann
60ea8fccb4 new version 4.2.2 2013-05-17 09:31:52 +02:00
Uwe Steinmann
2f5d9fd5a1 new method version() which just returns the version number 2013-05-03 11:33:38 +02:00
Uwe Steinmann
baf4b9a979 new version 4.2.1 2013-05-02 07:19:19 +02:00
Uwe Steinmann
aecd7a9083 solved conflict with branch seeddms-4.1.3 2013-04-17 11:15:19 +02:00
Uwe Steinmann
6277eb2f6c Merge branch 'seeddms-4.1.3' into develop 
Conflicts:
	Makefile
	inc/inc.Version.php
 2013-04-08 16:50:12 +02:00
Uwe Steinmann
be7e8f9a93 new version 4.1.3 2013-04-08 16:48:49 +02:00
Uwe Steinmann
ec349a143d set fileformat to unix 2013-04-08 08:23:03 +02:00
Uwe Steinmann
d88e907086 merge from seeddms-4.1.2 2013-04-08 08:18:19 +02:00
Uwe Steinmann
26798d7676 Merge branch 'seeddms-4.1.2' into develop 
Conflicts:
	Makefile
	inc/inc.Version.php
	install/install.php
 2013-04-08 08:17:46 +02:00
Uwe Steinmann
72200c5f96 prepare for new version 4.1.2 2013-04-08 07:58:28 +02:00
Uwe Steinmann
0ac6ff9a91 prepare for version 4.1.1 2013-04-05 16:54:48 +02:00
Uwe Steinmann
5d41aad78c prepare for next version 4.2.0 2013-04-05 13:08:37 +02:00
Uwe Steinmann
73c6ff9427 major name change from letodms to seeddms 2013-02-14 12:10:53 +01:00
steinm
6ac7e362e3 - added copyright notice 2013-02-06 13:49:58 +00:00
steinm
447d6ea175 new version 4.0.0 2012-12-19 10:30:47 +00:00
steinm
15e556192c - redid all changes in 3.4.x after project update at sf 2012-10-19 11:41:55 +00:00