gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-16 21:12:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,897 Commits 7 Branches 76 Tags 32 MiB
b3ffdd3b7d
Commit Graph

535 Commits

Author SHA1 Message Date
Uwe Steinmann
88fd6a1dc4 use new invocation of view 2016-03-16 20:09:48 +01:00
Uwe Steinmann
cfaa11a02c turn on csp by adding method js() 2016-03-16 15:11:33 +01:00
Uwe Steinmann
a758b29369 place javascript into external file 2016-03-16 15:04:17 +01:00
Uwe Steinmann
7c3bc05d6e some code reorganisation 2016-03-16 13:09:06 +01:00
Uwe Steinmann
71b8cd7311 place js into extra file 2016-03-16 12:58:18 +01:00
Uwe Steinmann
8a4e558f4b place all javascript into external file 2016-03-16 12:41:17 +01:00
Uwe Steinmann
fc0b7a4e16 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-15 08:48:03 +01:00
Uwe Steinmann
4d01346172 convert to invocation of view 2016-03-15 08:26:49 +01:00
Uwe Steinmann
77e579502e use new invocation of view 2016-03-15 08:26:13 +01:00
Uwe Steinmann
51e4458df4 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-14 18:19:47 +01:00
Uwe Steinmann
57f42ab523 use new invocation of view 2016-03-14 15:27:41 +01:00
Uwe Steinmann
9a319ef539 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-09 08:06:37 +01:00
Uwe Steinmann
cbb9317619 edit document versions online 2016-03-09 07:51:35 +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
7280668f91 add admin script for mass importing files from file system 2016-03-08 18:35:39 +01:00
Uwe Steinmann
2d04fc7d93 pass showfolders to view 2016-03-08 18:33:02 +01:00
Uwe Steinmann
fe9ac278c7 list all registered hooks 2016-02-26 09:22:06 +01:00
Uwe Steinmann
0f991c2dc1 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-17 11:39:09 +01:00
Uwe Steinmann
4d2ade4d7c do not call SeedDMS_Core_Folder::verifyLastestContentExpriry() on 
folders
 2016-02-16 12:21:48 +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
54df39ba81 pass timeout to view and previewer 2016-02-15 10:57:37 +01:00
Uwe Steinmann
a7c8d36720 use same var name as for all other views 2016-02-15 10:41:33 +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
86ee3fb13e pass workflowmode to view 2016-02-10 10:33:44 +01:00
Uwe Steinmann
75183a9d36 check experation and set status accordingly before listing documents 2016-02-09 17:33:23 +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
ae11964ca0 pass selected category to view 2016-02-05 17:26:24 +01:00
Uwe Steinmann
b04571da11 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-04 19:13:06 +01:00
Uwe Steinmann
072282140a include previewer, set selattrdef 2016-02-04 19:02:46 +01:00
Uwe Steinmann
2317c092d6 fix setting default search method 
the search form in the main menu will just set 'fulltext=1' if
fulltext is the default method. out/out.Search.php will not
check for the defaultSearchMethod
 2016-02-03 14:46:06 +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
4dce5d7ab3 help and default search method be set 2016-02-01 19:57:08 +01:00
Uwe Steinmann
0ca91816b5 pass strictformcheck to view, fix undefined variable error 2016-02-01 19:56:13 +01:00
Uwe Steinmann
5abe031222 put javascript into a separate file 2016-01-28 15:04:14 +01:00
Uwe Steinmann
3f0a455260 put javascript into separate file 2016-01-28 14:56:23 +01:00
Uwe Steinmann
e9be5cc115 put all javascript into its own file 2016-01-28 13:38:12 +01:00
Uwe Steinmann
e7a6ebb8ce put javascript into separate file 2016-01-28 13:37:16 +01:00
Uwe Steinmann
3bc3739213 call invoke function of view 2016-01-28 13:36:57 +01:00
Uwe Steinmann
36602ff54a add js() in view which turns CSP on 2016-01-27 17:33:40 +01:00
Uwe Steinmann
9da4d9f3db Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-16 07:17:32 +01:00
Uwe Steinmann
a71cb01c85 ??? 2015-12-16 07:14:04 +01:00
Uwe Steinmann
1acad75f83 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-15 21:04:45 +01:00
Uwe Steinmann
bdc3a28dcf seperate javascript from html 2015-12-15 21:02:47 +01:00
Uwe Steinmann
3f778f9a77 seperate html from javascript to make content security policy possible 2015-12-14 15:16:32 +01:00
Uwe Steinmann
ff447ba31f check if $_GET['pg'] is set 2015-12-14 12:53:32 +01:00
Uwe Steinmann
29f4ca0710 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-14 12:09:16 +01:00
Uwe Steinmann
1b8f515d7b fix division by zero if all hits are shown 2015-12-14 11:46:29 +01:00
Uwe Steinmann
8616ff5481 rename search script 2015-12-14 09:54:34 +01:00
Uwe Steinmann
3d7cd317e4 switch to new way to invoke the view 2015-12-14 09:47:51 +01:00
Uwe Steinmann
85e9dc25bb Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-11 20:35:20 +01:00
Uwe Steinmann
d76cc6d3d4 invoke $view and pass $_GET 2015-12-11 20:20:36 +01:00
Uwe Steinmann
238eed8810 pass previewer to group manager 2015-12-11 08:10:18 +01:00
Uwe Steinmann
e4ba3b44a8 rewrote using ajax (like UsrMgr) 2015-12-10 12:43:42 +01:00
Uwe Steinmann
9d763b60a5 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-11-19 07:59:34 +01:00
Uwe Steinmann
485d17b775 remove old code 2015-11-19 07:17:21 +01:00
Uwe Steinmann
bf6ddb71e6 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-11-16 09:19:11 +01:00
Uwe Steinmann
6d16946a19 show more information of selected document 2015-11-16 08:35:06 +01:00
Uwe Steinmann
2f9e015856 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-20 18:20:24 +02:00
Uwe Steinmann
2c79669c94 pass $_GET to view 2015-10-19 13:14:50 +02:00
Uwe Steinmann
002fa8df29 get timeline data in ajax call 2015-10-19 13:14:14 +02:00
Uwe Steinmann
42dbb30e22 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 16:03:15 +02:00
Uwe Steinmann
3c13873195 fix syntax error 2015-09-23 15:00:47 +02:00
Uwe Steinmann
ea3fe81a0e Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 14:56:59 +02:00
Uwe Steinmann
da168c3eec check if _GET[skip] is set 2015-09-23 14:56:28 +02:00
Uwe Steinmann
10c5086307 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 14:13:56 +02:00
Uwe Steinmann
6564861b92 pass skip array to view 2015-09-23 14:12:50 +02:00
Uwe Steinmann
526607b839 reorder include files 2015-09-21 17:11:30 +02:00
Uwe Steinmann
229d976113 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-21 16:58:14 +02:00
Uwe Steinmann
c385d86a60 add timeline over all documents 2015-09-21 16:46:17 +02:00
Uwe Steinmann
8ab6dda490 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-18 07:59:15 +02:00
Uwe Steinmann
8d7bceefac pass preview parameters to view 2015-09-03 15:16:00 +02:00
Uwe Steinmann
6e80f025cf Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-20 15:55:53 +02:00
Uwe Steinmann
d63b427822 use __invoke() when calling view 2015-08-20 15:54:17 +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
fb065f1a61 check if index could be created 2015-08-19 09:19:52 +02:00
Uwe Steinmann
83fbab5149 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-19 06:05:48 +02:00
Uwe Steinmann
bf05ef4f95 parameter 'action' can be set, to run a different method in the view class 2015-08-18 22:36:55 +02:00
Uwe Steinmann
65fda6daee Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-10 21:53:27 +02:00
Uwe Steinmann
8ffcfab6e4 use new fulltext index interface with support for sqlitefts 2015-08-10 21:43:15 +02:00
Uwe Steinmann
482143c04f pass $dms to contructor of SeedDMS_AccessOperation 2015-08-07 13:11:50 +02:00
Uwe Steinmann
122fcdb3c9 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-05 21:14:17 +02:00
Uwe Steinmann
7485a85077 set timeout for external commands when creating fulltext index 2015-08-05 21:11:21 +02:00
Uwe Steinmann
975012768e use _REQUEST instead of _GET for currenttab 2015-07-15 07:23:38 +02:00
Uwe Steinmann
40cd60f985 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-07-08 07:33:02 +02:00
Uwe Steinmann
dd13814139 show preview image in list 2015-07-08 07:24:50 +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
Uwe Steinmann
5c43f191ce propperly check access rights 2015-06-15 14:20:51 +02:00
Uwe Steinmann
3b0d239a00 propperly check for access right 2015-06-15 14:17:16 +02:00
Uwe Steinmann
efb9173815 use access operation to check if approval is allowed 
Conflicts:
	op/op.ApproveDocument.php
 2015-06-15 09:01:03 +02:00
Uwe Steinmann
ba74861ae7 use access operation to check if operation is allowed 
Conflicts:
	op/op.ReviewDocument.php
 2015-06-15 09:00:21 +02:00
Uwe Steinmann
48442f3947 use access operation to check if approval is allowed 2015-06-15 08:55:20 +02:00
Uwe Steinmann
4215532a9c use access operation to check if operation is allowed 2015-06-15 08:54:33 +02:00
Uwe Steinmann
269355bb43 allow context sensitive help files 2015-06-11 06:42:28 +02:00
Uwe Steinmann
e527862c9d allow context sensitive help files 2015-06-11 06:41:49 +02:00
Uwe Steinmann
e0fdb21986 check for currenttab 2015-06-09 09:18:57 +02:00
Uwe Steinmann
887690336d check for currenttab 2015-06-09 09:18:29 +02:00
Uwe Steinmann
a01241df06 pass version to url checking for new versions 2015-06-09 07:02:36 +02:00
Uwe Steinmann
d73052c362 pass version to url checking for new versions 2015-06-09 07:00:06 +02:00
Uwe Steinmann
330ea9a10f fix wrong access on settings array 
Conflicts:
	out/out.SetReviewersApprovers.php
 2015-06-01 14:06:34 +02:00
Uwe Steinmann
d32df44f7b fix wrong access on settings array 2015-06-01 14:03:16 +02:00
Uwe Steinmann
cb13a89c1a add checking for duplicates 2015-05-13 18:42:42 +02:00
Uwe Steinmann
259303fff1 add checking for duplicates 2015-05-13 17:38:20 +02:00
Uwe Steinmann
719a533c32 include all needed files 2015-05-04 08:34:23 +02:00
Uwe Steinmann
aa38261ebf check if version modification is allowed 2015-04-20 13:47:34 +02:00
Uwe Steinmann
db8e3bbfbb Merge branch 'seeddms-4.3.17' into develop 2015-04-14 06:21:12 +02:00
Uwe Steinmann
0994429edd issue warning if ordering of folder contents is != 's' 2015-04-08 06:43:31 +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
886bd0aaf8 pass sortusersinlist to view 2015-03-27 17:32:20 +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
4223777a6e no need to set view parameter enableClipboard anymore 
it is set in any case in the factory method when the view is created
 2015-03-13 09:30:48 +01:00
Uwe Steinmann
ed9fbe93e1 set current tab to last one selected when submitting data 2015-03-11 18:24:14 +01:00
Uwe Steinmann
0266c3a037 Merge branch 'seeddms-4.3.15' into develop 2015-02-24 19:53:59 +01:00
Uwe Steinmann
c4feea2664 all converters are only used for fulltext 2015-02-24 19:26:38 +01:00
Uwe Steinmann
061ed035cc Merge branch 'seeddms-4.3.14' into develop 2015-01-29 18:32:16 +01:00
Uwe Steinmann
8a6ff2f48a preset expiration date form settings 2015-01-29 18:31:37 +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
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
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
Uwe Steinmann
9f6cb6453c folder tree can be expanded again on default 2013-09-06 15:24:51 +02:00
Uwe Steinmann
c53c81880b pass $settings to view 2013-07-31 17:29:20 +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
77b0fdfd12 add new config option enableClipboard 2013-06-13 14:57:53 +02:00
Uwe Steinmann
72010b1bc0 Merge branch 'develop' into hooks 2013-06-06 16:02:28 +02:00
Uwe Steinmann
f3c1e5ae8e users that cannot be deleted can be specified in settings 2013-05-31 11:59:12 +02:00
Uwe Steinmann
447a89ff53 pass seeddms version to view 2013-05-03 11:33:21 +02:00
Uwe Steinmann
c2c8ea38bf pass httproot to view 2013-05-03 09:52:59 +02:00
Uwe Steinmann
e46fc9d024 include inc/inc.Extension.php 2013-05-02 22:33:02 +02:00
Uwe Steinmann
e7e89aba94 add files to manager extensions 2013-05-02 18:28:23 +02:00
Uwe Steinmann
0275621f7f include inc.Extension.php 2013-05-02 18:26:16 +02:00
Uwe Steinmann
d63ec26d8e add new feature to substitute user while being admin 2013-04-19 09:00:34 +02:00
Uwe Steinmann
6d86898c11 pass $settings->_workflowMode to view 2013-04-18 13:37:28 +02:00
Uwe Steinmann
2744149612 icon for showing required attention 2013-04-18 13:35:38 +02:00
Uwe Steinmann
35aa1b995d return to tab on LogManagement page which was previously selected 
after removing a log file and returning to the LogManagement page,
the same tab is selected as before (fixes Bug #30)
 2013-04-11 09:02:24 +02:00
Uwe Steinmann
a50964cb8f several log files can be delete in one go 2013-04-11 08:38:47 +02:00
Uwe Steinmann
02a8c52f33 pass parameters for recursive document count to view 2013-04-10 15:49:19 +02:00