gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-10-31 13:18:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,320 Commits 7 Branches 90 Tags 55 MiB
9ef3b6aa37
Commit Graph

252 Commits

Author SHA1 Message Date
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
Uwe Steinmann
1d011feaf6 Merge branch 'seeddms-4.3.8' into develop 2014-03-26 07:29:28 +01:00
Uwe Steinmann
4249940e69 folder id can be passed for indexing sub folders 2014-03-26 07:26:01 +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
481c9ecc48 pass preview width to view 2014-03-18 10:06:07 +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
31ffad39a8 fix security hole 
missing check for passed parameters allows to read files on the server
 2014-02-26 22:32:19 +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
01f95b201e pass rootfolder to view 2014-02-21 21:25:56 +01:00
Uwe Steinmann
a4f26d3f68 Merge branch 'seeddms-4.3.3' into develop 
Conflicts:
	CHANGELOG
	languages/de_DE/lang.inc
	languages/en_GB/lang.inc
	views/bootstrap/class.ViewFolder.php
 2014-02-01 16:15:46 +01:00
Uwe Steinmann
94b107b7bd theme and language selector can be turn off on login page 2014-02-01 16:06:12 +01:00
Uwe Steinmann
3596a7a191 add support for configuring folder sort method of folders 2014-02-01 15:23:19 +01:00
Uwe Steinmann
077a990286 include inc/inc.Extension.php 2014-01-10 08:21:44 +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
a01087f083 pass list of unlinked folders/documents to view 2013-11-27 09:45:14 +01:00
Uwe Steinmann
9609ff4ac7 issue error if folder is moved into sub folder 2013-11-25 22:12:48 +01:00
Uwe Steinmann
58fdef13eb Merge branch 'seeddms-4.3.1' into develop 2013-09-20 13:45:33 +02:00
Uwe Steinmann
1b86aa6727 check for _enableOwnerRevApp before showing the approve/review button 2013-09-19 14:27:09 +02:00
Uwe Steinmann
ac7bd8cbdc Merge branch 'seeddms-4.3.1' into develop 2013-09-06 15:26:34 +02:00