gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 08:55:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,466 Commits 7 Branches 82 Tags 41 MiB
1aa08781b2
Commit Graph

270 Commits

Author SHA1 Message Date
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
75ef47f6e1 expiration date of documents can be preset in settings 2015-01-29 17:28:40 +01:00
Uwe Steinmann
1c0a2f37b4 Merge branch 'seeddms-4.3.14' into develop 
Conflicts:
	SeedDMS_Core/Core/inc.ClassFolder.php
 2014-12-11 21:12:42 +01:00
Uwe Steinmann
9db48ea2d1 add missing access object (Bug #191) 2014-12-11 21:11:07 +01:00
Uwe Steinmann
d33b17f64c include inc/inc.Init.php, fix order of include files 2014-12-08 14:48:23 +01:00
Uwe Steinmann
2821e15867 add missing argument of checkQuota() (Bug #184) 2014-11-19 20:36:06 +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
25aa6983df use correct name for 'previewWidthList' (Closes #177) 2014-11-12 10:41:13 +01:00
Uwe Steinmann
2403b2f2a7 instanciate access object 2014-11-04 13:57:50 +01:00
Uwe Steinmann
a570a85fda Merge branch 'seeddms-4.3.11' into develop 2014-10-29 09:24:51 +01:00
Uwe Steinmann
3cf78a5d15 instanciate access restrictions and pass it to view 2014-10-29 09:08:39 +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
627c6f8248 use ClassAccessOperation 2014-10-22 14:00:50 +02:00
Uwe Steinmann
c1eeba573e Merge branch 'seeddms-4.3.10' into develop 2014-10-16 17:28:11 +02:00
Uwe Steinmann
76bb674a57 set accessobj for view (Closes Bug #168) 2014-08-21 21:33:00 +02:00
Uwe Steinmann
ca6b3c3795 add missing access operation check 2014-08-20 16:35:38 +02:00
Uwe Steinmann
42ab639a95 Merge branch 'seeddms-4.3.9' into develop 2014-07-28 09:54:52 +02:00
Uwe Steinmann
670247ae25 pass accessobject to view 2014-07-28 09:52:31 +02:00
Uwe Steinmann
31da6d4f5f Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
 2014-07-24 07:58:32 +02:00
Uwe Steinmann
9da8b713b8 pass SeedDMS_AccessOperation to view 2014-07-24 07:54:08 +02:00
Uwe Steinmann
e2974f2054 Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	views/bootstrap/class.ViewFolder.php
 2014-07-11 12:49:21 +02:00
Uwe Steinmann
289649b6ee add file upload via drag&drop 
can be enabled in the settings
 2014-07-11 08:41:25 +02:00
Uwe Steinmann
4d8f9731d5 Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	styles/bootstrap/application.js
	views/bootstrap/class.Bootstrap.php
 2014-07-08 08:49:14 +02:00
Uwe Steinmann
6c7aaa1800 user targetid instead of targetidform1 2014-07-08 08:32:19 +02:00
Uwe Steinmann
579946d455 Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	views/bootstrap/class.Bootstrap.php
 2014-07-03 12:07:27 +02:00
Uwe Steinmann
1ef5cb0444 pass access object to view 2014-06-16 14:29:46 +02:00
Uwe Steinmann
969bf56dbf instanziate access object 2014-06-11 11:03:20 +02:00
Uwe Steinmann
6325bd2844 Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	views/bootstrap/class.Bootstrap.php
	views/bootstrap/class.ViewFolder.php
 2014-06-06 14:15:39 +02:00
Uwe Steinmann
9e65ebc152 remove setting global variable $showtree 2014-06-06 14:02:24 +02:00
Uwe Steinmann
aa6bdf000b Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
 2014-06-04 21:25:30 +02:00
Uwe Steinmann
2c07910fa9 pass object for AccessOperation to view 2014-06-04 19:18:17 +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
51b84868a6 check if document is locked 2014-06-03 17:50:20 +02:00
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
d9c7b988f4 pass cachedir and previewWidthList to view 2014-05-22 07:33:24 +02:00
Uwe Steinmann
601386f6be pass password expiration to view 2014-05-22 06:43:51 +02:00
Uwe Steinmann
6e8af30e17 checkQuota() now takes the user as an argument 2014-05-20 06:31:12 +02:00
Uwe Steinmann
eaaa957166 pass quota checking to view 2014-05-20 06:25:25 +02:00
Uwe Steinmann
6b1c9c6829 pass quota settings to view 2014-05-20 06:24:53 +02:00
Uwe Steinmann
319b2cbe75 Merge branch 'seeddms-4.3.8' into develop 2014-04-15 18:53:21 +02:00
Uwe Steinmann
bd9ab4ac87 initialize $versions earlier 2014-04-11 11:11:38 +02:00
Uwe Steinmann
0144c4c396 Merge branch 'seeddms-4.3.8' into develop 2014-04-10 11:22:05 +02:00
Uwe Steinmann
e6d119ea26 better error checking 2014-04-10 11:20:54 +02:00
Uwe Steinmann
100909a910 check for new versions 2014-04-10 11:19:45 +02:00
Uwe Steinmann
c180f17f98 Merge branch 'seeddms-4.3.8' into develop 
Conflicts:
	styles/bootstrap/application.js
	views/bootstrap/class.Bootstrap.php
 2014-04-09 06:26:32 +02:00
Uwe Steinmann
38d054d842 rework data for docsperstatus chart 2014-04-02 08:42:21 +02:00
Uwe Steinmann
aa725b8dce new statistical output as pie charts 2014-04-01 21:02:32 +02:00
Uwe Steinmann
5c3a22dee1 return message when password was send 2014-04-01 17:14:57 +02:00
Uwe Steinmann
95cae18e88 regard settings for language and theme selector in profile 2014-03-28 18:40:06 +01:00
Uwe Steinmann
e1a49b1cf2 check for quota 2014-03-26 17:32:08 +01:00