gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-04 15:12:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,471 Commits 7 Branches 76 Tags 30 MiB
4b55bc4fd8
Commit Graph

760 Commits

Author SHA1 Message Date
Uwe Steinmann
fea676c1d4 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-02-24 19:07:23 +01:00
Uwe Steinmann
f27e330ee3 take out extra inc/inc.DBInit.php 2017-02-24 13:46:03 +01:00
Uwe Steinmann
020f25052c index each document by calling ajax function 2017-02-24 12:13:51 +01:00
Uwe Steinmann
293091d13d fix includes 2017-02-22 09:44:47 +01:00
Uwe Steinmann
ce3c2d4f80 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-02-22 09:41:54 +01:00
Uwe Steinmann
bd345fee35 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-21 17:42:00 +01:00
Uwe Steinmann
13f3a0f373 pass current user to constructor of Calendar class 2017-02-21 17:29:38 +01:00
Uwe Steinmann
1a74c45cae put all calendar operations into class 2017-02-21 17:26:16 +01:00
Uwe Steinmann
37fb2e2c47 pass access object to view, don't use mode anymore 2017-02-21 15:37:29 +01:00
Uwe Steinmann
4c794381e6 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-02-20 17:34:43 +01:00
Uwe Steinmann
502b5c5414 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-16 15:26:46 +01:00
Uwe Steinmann
9dfea210d6 new calendar based on fullcalendar 2017-02-16 15:02:46 +01:00
Uwe Steinmann
7d82b73208 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-13 12:12:07 +01:00
Uwe Steinmann
6559706b15 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-11 15:21:45 +01:00
Uwe Steinmann
aa90fdaaf9 include LogInit.php 2017-02-11 15:20:52 +01:00
Uwe Steinmann
d5dc6b125d Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-08 15:52:00 +01:00
Uwe Steinmann
9e073c7111 pass strictformcheck to view 2017-01-31 17:20:05 +01:00
Uwe Steinmann
99a83c0d97 set showtree in view 2017-01-25 10:43:43 +01:00
Uwe Steinmann
69e1bb66ad list documents in revision/reception without access 2017-01-25 09:53:18 +01:00
Uwe Steinmann
b814b07e2a reorganize page like MyDocuments page 2017-01-24 14:20:43 +01:00
Uwe Steinmann
4108cf1696 add saving list of users and groupѕ 2017-01-23 07:53:01 +01:00
Uwe Steinmann
c63f994a5f Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-18 15:13:18 +01:00
Uwe Steinmann
47db85c175 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-18 15:11:45 +01:00
Uwe Steinmann
39bebbdcf6 switch to new access restrictions 2017-01-18 15:08:25 +01:00
Uwe Steinmann
8959a9e167 add searching for document id 2017-01-18 14:45:40 +01:00
Uwe Steinmann
66e6cec446 add filter for status 'S_DRAFT' 2017-01-11 17:49:21 +01:00
Uwe Steinmann
7d8f4f54c0 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-04 17:11:39 +01:00
Uwe Steinmann
a9a51adbb5 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-01 19:27:51 +01:00
Uwe Steinmann
5796ccdf06 add exit() after calling header('Location: ..') 2017-01-01 14:47:20 +01:00
Uwe Steinmann
4709e98429 remove some white space 2017-01-01 14:46:57 +01:00
Uwe Steinmann
c6d26ec3fa Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-12-15 06:42:15 +01:00
Uwe Steinmann
a8b7277759 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-12-06 18:06:19 +01:00
Uwe Steinmann
97ee39df99 replace last remaining call of sanitizeString() by preg_replace() 2016-12-05 10:24:36 +01:00
Uwe Steinmann
ca76b64ba8 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-11-08 12:00:44 +01:00
Uwe Steinmann
b5626c2cdf Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-11-07 09:27:28 +01:00
Uwe Steinmann
fbb198cd9f pass showFullPreview and convertToPdf to view 2016-11-07 09:26:19 +01:00
Uwe Steinmann
10a8b14eff take out search for reception 2016-11-04 20:28:22 +01:00
Uwe Steinmann
209b27ece7 passing missing parameter to SeedDMS_AccessOperation() 2016-11-02 13:56:18 +01:00
Uwe Steinmann
ef4b6578cc check if setting revisor is allowed, pass enableXXXRevApp to view 2016-10-27 14:21:57 +02:00
Uwe Steinmann
9ac66febee add config paramter enableAdminReceipt 
allows admins in list of possible recipients of documents
 2016-10-27 14:11:18 +02:00
Uwe Steinmann
e10b6974ae add new config flag which allows doc reception by owner 2016-10-27 12:17:04 +02:00
Uwe Steinmann
8592554ad7 set showtree in view 2016-10-16 09:56:19 +02:00
Uwe Steinmann
9d1f3b867f Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-10-04 20:55:33 +02:00
Uwe Steinmann
3d50543b66 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-10-04 20:48:51 +02:00
Uwe Steinmann
9fa5ececb7 add showSingleSearchHit config option 2016-10-04 16:54:16 +02:00
Uwe Steinmann
1989657c9a search for each status of reception 2016-09-28 21:29:16 +02:00
Uwe Steinmann
7937f73031 pass $missingreception to view 2016-09-28 20:22:42 +02:00
Uwe Steinmann
f768ad63f0 pass accessobj to view 2016-09-05 10:05:37 +02:00
Uwe Steinmann
e272d26f30 add access check 2016-09-05 10:05:16 +02:00
Uwe Steinmann
a1ccc60729 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-09-05 08:57:18 +02:00
Uwe Steinmann
fac5f44f65 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-09-05 07:48:09 +02:00
Uwe Steinmann
22dbfc9a32 pass list of transitions to workflow graph 2016-09-04 20:15:05 +02:00
Uwe Steinmann
8b9d4b98d5 set parameter $plain for exitError() in case of an ajax call 2016-08-22 17:03:29 +02:00
Uwe Steinmann
74f9a0209b add more access checks 2016-08-12 18:08:30 +02:00
Uwe Steinmann
224172f785 add access check 2016-08-12 15:57:47 +02:00
Uwe Steinmann
b90c9a379a major overhaul 
do not show backup space required, if backup is stored in content
direcotry. Add various role based access checks.
 2016-08-12 13:14:34 +02:00
Uwe Steinmann
4fa95bcd48 major overhaul, replace inProcess paramter by listtype 
most list where not correct and the code was way to complicated
 2016-08-12 12:41:07 +02:00
Uwe Steinmann
861776f9f0 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-08-11 16:42:00 +02:00
Uwe Steinmann
434c97e252 include Language.inc before Extension.inc 2016-08-11 16:41:19 +02:00
Uwe Steinmann
073bdf24bb add rss feed of timeline 2016-08-10 18:16:39 +02:00
Uwe Steinmann
f397558f75 set proper default value for orderdir 2016-08-09 17:15:41 +02:00
Uwe Steinmann
31fd01cc71 pass timeout to view 2016-08-09 17:15:26 +02:00
Uwe Steinmann
a87ae68c24 put list of all documents onto page with all other doc lists 2016-08-09 15:15:47 +02:00
Uwe Steinmann
148088f42a Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-08-09 07:55:52 +02:00
Uwe Steinmann
ffab03a8b8 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-09 07:55:35 +02:00
Uwe Steinmann
7c3e1c0807 fix copyright in header 2016-08-09 07:53:15 +02:00
Uwe Steinmann
e68a7b82b3 pass enable2fact to view 2016-07-12 17:43:27 +02:00
Uwe Steinmann
2bc217b156 add files for 2 factor authentication 2016-07-12 17:39:10 +02:00
Uwe Steinmann
d064d24903 include ../inc/inc.ClassAccessOperation.php 2016-07-06 13:00:30 +02:00
Uwe Steinmann
a8c8dbf535 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-07-06 12:57:13 +02:00
Uwe Steinmann
25c57db205 include missing inc/inc.Init.php 2016-07-06 11:28:56 +02:00
Uwe Steinmann
1544912dbc fix access checking 2016-05-30 20:41:36 +02:00
Uwe Steinmann
6ab00875a9 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-05-23 14:05:44 +02:00
Uwe Steinmann
281ea0df9c fix inclusion of files 2016-05-23 14:05:26 +02:00
Uwe Steinmann
b7a6bb2201 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-05-23 13:59:16 +02:00
Uwe Steinmann
239b750223 include Utils.php early 2016-05-23 13:58:42 +02:00
Uwe Steinmann
9bbf1cc519 no need to include Utils.php 2016-05-23 13:57:51 +02:00
Uwe Steinmann
38f02a149e Merge branch 'seeddms-5.0.x' into develop 2016-05-03 06:40:50 +02:00
Uwe Steinmann
129b725414 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-05-03 06:32:54 +02:00
Uwe Steinmann
5d25720ec9 add new operation to clear cache completely 2016-04-28 07:51:42 +02:00
Uwe Steinmann
6b2d4a4b75 set dms in view early, check for access on latest content 2016-04-26 18:14:38 +02:00
Uwe Steinmann
7e3cd7d6c4 move inclusion SeedDMS/Preview.php into view 2016-04-26 13:43:02 +02:00
Uwe Steinmann
fcf85a88e0 move inclusion of "SeedDMS/Preview.php" into view 2016-04-26 12:16:29 +02:00
Uwe Steinmann
281c4baeb3 some reorganization of code 2016-04-22 12:30:02 +02:00
Uwe Steinmann
e97b94d393 Merge branch 'seeddms-5.0.x' into develop 2016-04-22 12:28:57 +02:00
Uwe Steinmann
cde225bb44 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-04-22 12:28:45 +02:00
Uwe Steinmann
00e45dd63a use setParam() instead of passing array to view 2016-04-22 12:28:19 +02:00
Uwe Steinmann
c6121ff201 do not issue an error if access on library folder is forbitten 
just disable the upload from the library folder
 2016-04-22 12:25:26 +02:00
Uwe Steinmann
099c9aeee4 include missing files 2016-04-20 15:49:23 +02:00
Uwe Steinmann
9999f6d57c include missing files, set accessobject for view 2016-04-20 15:45:53 +02:00
Uwe Steinmann
5912354f09 set accessobject in view 2016-04-20 09:01:59 +02:00
Uwe Steinmann
8d8f3e51fb move excel export into view 2016-04-18 20:53:00 +02:00
Uwe Steinmann
4e2313d387 pass instance of Access Operation to view 2016-04-18 13:13:16 +02:00
Uwe Steinmann
f8adb0cecf show previews were possible, pass accessobject to view 2016-04-15 13:20:56 +02:00
Uwe Steinmann
28dc4d32ad check access rights 2016-04-13 18:42:58 +02:00
Uwe Steinmann
64470891ba set accessobject for view 2016-04-13 10:53:57 +02:00
Uwe Steinmann
a3e0f6eb7d fix inclusion of files 2016-04-13 08:56:51 +02:00
Uwe Steinmann
23e3011d82 use access check 2016-04-13 08:50:27 +02:00
Uwe Steinmann
5bdc6fe3cc filter result by new access restrictions derived from status 2016-04-12 12:23:26 +02:00
Uwe Steinmann
3e05cfe24f fix call of SeedDMS_AccessOperation() 2016-03-23 16:54:25 +01:00
Uwe Steinmann
353be72dc9 pass $document to mayApprove() 2016-03-23 16:54:03 +01:00
Uwe Steinmann
b8fc40f60f fix access check 2016-03-18 22:48:13 +01:00
Uwe Steinmann
d8e0ba840d fix syntax error 2016-03-18 22:47:51 +01:00
Uwe Steinmann
4dcd92b528 convert to new method of view invocation 2016-03-18 16:52:04 +01:00
Uwe Steinmann
361b63256f Merge branch 'seeddms-5.0.x' into develop 2016-03-18 16:17:17 +01:00
Uwe Steinmann
f7883f9154 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-18 16:07:47 +01:00
Uwe Steinmann
889a080339 fix syntax error 2016-03-18 15:32:49 +01:00
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
7bd77ba43e Merge branch 'seeddms-5.0.x' into develop 2016-03-15 08:50:32 +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
c5435e0a27 add acl check 2016-03-15 06:22:48 +01:00
Uwe Steinmann
3f6420a6d4 Merge branch 'seeddms-5.0.x' into develop 2016-03-14 18:20:03 +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
d317388d18 Merge branch 'seeddms-5.0.x' into develop 2016-03-09 08:10:15 +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
f859b48a57 Merge branch 'seeddms-5.0.x' into develop 2016-03-09 06:42:30 +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
64c0b37726 add access check 2016-03-04 16:02:03 +01:00
Uwe Steinmann
e4bc8d2180 add advanced access check 2016-03-04 09:36:08 +01:00
Uwe Steinmann
a3df77e713 take out access check 2016-03-04 09:35:27 +01:00
Uwe Steinmann
0909d43bcf minor code cleanup 2016-03-04 09:34:47 +01:00
Uwe Steinmann
51fa5d18e6 enhance AccessOperation by check_view_access() 
all methods in SeedDMS_AccessOperation take the object to be checked
as the first parameter. Add new method check_view_access() which
checks if a view may be accessed based on the tables tblAros, tblAcos,
tblArosAcos
 2016-03-03 07:39:04 +01:00
Uwe Steinmann
8985748f8a use new instanciation of view 2016-03-03 07:37:26 +01:00
Uwe Steinmann
677534c8ec add files for managing access control lists 2016-02-29 11:18:55 +01:00
Uwe Steinmann
5f610c4049 Merge branch 'seeddms-5.0.x' into develop 2016-02-26 09:22:25 +01:00
Uwe Steinmann
fe9ac278c7 list all registered hooks 2016-02-26 09:22:06 +01:00
Uwe Steinmann
3b18b4398c fix name of view parameter previewwidthdetail 2016-02-25 10:33:41 +01:00
Uwe Steinmann
e759b44d37 include inc.ClassAcl.php 2016-02-24 14:38:28 +01:00
Uwe Steinmann
3d76792239 add management of roles 2016-02-24 14:36:59 +01:00
Uwe Steinmann
49be0485c5 role is now an instance of SeedDMD_Core_Role 2016-02-24 14:35:37 +01:00
Uwe Steinmann
067890345e Merge branch 'seeddms-5.0.x' into develop 2016-02-17 11:44:25 +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
bc608eff07 Merge branch 'seeddms-5.0.x' into develop 2016-02-15 20:45:05 +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
2a5a2cd61d Merge branch 'seeddms-5.0.x' into develop 2016-02-10 11:49:15 +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
2da2f0af9a Merge branch 'seeddms-5.0.x' into develop 2016-02-08 13:24:40 +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
3b8d7a5271 Merge branch 'seeddms-5.0.x' into develop 2016-02-04 19:22:59 +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
5863d962ac Merge branch 'seeddms-5.0.x' into develop 2015-12-16 09:30:16 +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
d04e65108d Merge branch 'seeddms-5.0.x' into develop 2015-11-19 08:00:10 +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
f33f7ab41a Merge branch 'seeddms-5.0.x' into develop 2015-11-16 21:58:04 +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
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
Uwe Steinmann
3b0d239a00 propperly check for access right 2015-06-15 14:17:16 +02:00
Uwe Steinmann
80a49262f4 propperly check for sufficient access rights 2015-06-15 14:14:31 +02:00
Uwe Steinmann
67d10d10ae use access operation to check if document may be reviewed 2015-06-15 09:05:20 +02:00
Uwe Steinmann
15a708fbf2 use access operation to check if approval is allowed 
Conflicts:
	op/op.ApproveDocument.php

Conflicts:
	op/op.ApproveDocument.php
 2015-06-15 09:02:45 +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
0e8a385b6d allow context sensitive help files 2015-06-11 06:42: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