Commit Graph

371 Commits

Author SHA1 Message Date
Uwe Steinmann
031129a31c Merge branch 'seeddms-5.0.x' into develop 2015-10-20 18:21:47 +02: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
37f9771b97 Merge branch 'seeddms-5.0.x' into develop 2015-09-23 17:21:26 +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
42b5162ca4 Merge branch 'seeddms-5.0.x' into develop 2015-09-23 14:43:13 +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
fcbb5f68fe Merge branch 'seeddms-5.0.x' into develop 2015-09-22 08:51:59 +02:00
Uwe Steinmann
526607b839 reorder include files 2015-09-21 17:11:30 +02:00
Uwe Steinmann
6be0d179fc Merge branch 'seeddms-5.0.x' into develop 2015-09-21 16:58:25 +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
d54172d366 Merge branch 'seeddms-5.0.x' into develop 2015-09-18 08:00:06 +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
ab35650f0b check if settings->_libraryFolder is set before using it 2015-09-16 11:25:59 +02:00
Uwe Steinmann
850bb05481 add superfluous code 2015-09-16 11:10:11 +02:00
Uwe Steinmann
8d7bceefac pass preview parameters to view 2015-09-03 15:16:00 +02:00
Uwe Steinmann
b7de0f61c7 Merge branch 'seeddms-5.0.x' into develop 2015-08-20 22:38:08 +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
58413e5218 Merge branch 'seeddms-5.0.x' into develop 2015-08-19 09:24:20 +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
4c6eb18528 Merge branch 'seeddms-5.0.x' into develop 2015-08-19 06:09:20 +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
aa49c5b0b1 Merge branch 'seeddms-5.0.x' into develop 2015-08-10 21:58:16 +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
eeff55eb7d pass $dms to constructor of SeedDMS_AccessOperation 2015-08-07 13:15:13 +02:00
Uwe Steinmann
c4f7223293 Merge branch 'seeddms-5.0.x' into develop 2015-08-07 13:13:14 +02:00
Uwe Steinmann
482143c04f pass $dms to contructor of SeedDMS_AccessOperation 2015-08-07 13:11:50 +02:00
Uwe Steinmann
55ccf3e987 Merge branch 'seeddms-5.0.x' into develop 2015-08-05 21:14:35 +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
d653c516ea pass backup dir to view 2015-07-28 07:50:02 +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
26982d1da0 show preview image in list 2015-07-08 07:26:16 +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
d070f6da85 use access operations to check if operation is allowed
before, this was some own code which did not same the same
check as maySetReviewerApprover()
2015-06-26 12:23:09 +02:00
Uwe Steinmann
52559730d9 use new customizable preview converters 2015-06-25 19:52:02 +02:00
Uwe Steinmann
f78af97b4a check if library folder is readable, pass folder to view 2015-06-24 12:26:08 +02:00
Uwe Steinmann
5c43f191ce propperly check access rights 2015-06-15 14:20:51 +02:00