gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-07 07:34:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,325 Commits 7 Branches 78 Tags 37 MiB
b8b1996fb4
Commit Graph

791 Commits

Author SHA1 Message Date
Uwe Steinmann
15b1414d6e set format in date field to yyyy-mm-dd 2015-10-30 08:02:57 +01:00
Uwe Steinmann
50ef190ae7 Merge branch 'seeddms-5.0.x' into develop 2015-10-27 09:03:45 +01:00
Uwe Steinmann
f2b1dd8fc8 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-27 09:03:33 +01:00
Uwe Steinmann
e35cc9f3c6 fix setting of Content-Type in header (Closes: #233) 2015-10-22 13:36:23 +02:00
Uwe Steinmann
ddfea8f3cb Merge branch 'seeddms-5.0.x' into develop 2015-09-28 12:35:18 +02:00
Uwe Steinmann
1ab19f6831 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-28 12:35:04 +02:00
Uwe Steinmann
7e507e6a9e fix searching in fulltext, number of hits and pages was often wrong 2015-09-28 12:32:41 +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
4206f5d32a log approval/reject 2015-09-16 17:31:09 +02:00
Uwe Steinmann
459739bd01 file for creating preview in list of files in dropfolder 2015-09-03 15:13:59 +02:00
Uwe Steinmann
022490e461 set propper content type for excel documents 2015-08-25 16:43:27 +02:00
Uwe Steinmann
e97de9c6df Merge branch 'seeddms-5.0.x' into develop 2015-08-19 20:16:40 +02:00
Uwe Steinmann
784081b5d3 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-19 20:16:26 +02:00
Uwe Steinmann
58d8d8dd9e set search time, document und folder count after fulltext search 2015-08-19 20:15:04 +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
b0413a0d46 engine for fulltext search can be configured 2015-08-10 21:41:51 +02:00
Uwe Steinmann
4c907dbf9e Merge branch 'seeddms-5.0.x' into develop 2015-08-07 20:08:29 +02:00
Uwe Steinmann
ae98b574b7 jump to homefolder of user 2015-08-07 15:44:06 +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
30ccf4f8f6 use backup dir if set 2015-07-28 07:49:35 +02:00
Uwe Steinmann
2bf7bd0a4e use backup dir if set 2015-07-28 07:30:24 +02:00
Uwe Steinmann
ff53a3e3e5 backup dir can be set 2015-07-28 07:29:08 +02:00
Uwe Steinmann
572927668a remove space in content type for excel sheet 2015-07-27 20:54:21 +02:00
Uwe Steinmann
0351305995 pass formkey when substituting user 2015-07-15 08:24:15 +02:00
Uwe Steinmann
9fee411f3f explicitly check for false returned by SeedDMS_Core_DMS::inList() 2015-07-15 08:22:39 +02:00
Uwe Steinmann
c4fdc6aee9 remove old code 2015-07-15 08:22:16 +02:00
Uwe Steinmann
4a034d395b pass previewer to mainClipboard() 2015-07-15 08:21:51 +02:00
Uwe Steinmann
f35ae2736a add new paramter autoLoginUser 2015-07-14 21:28:47 +02:00
Uwe Steinmann
a2179ca53e add new paramter autoLoginUser 2015-07-14 21:23:33 +02:00
Uwe Steinmann
e17bcc714a initialize all arrays for return value in menutasks 2015-07-10 10:51:56 +02:00
Uwe Steinmann
f25c090039 command mytasks also returns documents to receipt and revise 2015-07-09 18:28:08 +02:00
Uwe Steinmann
863d203133 add command 'mytasks' 2015-07-09 07:59:30 +02:00
Uwe Steinmann
cd3a239482 add new config parameter enableMenuTasks 2015-07-09 07:58:34 +02:00
Uwe Steinmann
3583962085 new task menutask in op/op.Ajax.php which calls menuTask() 2015-07-08 18:58:38 +02:00
Uwe Steinmann
84a1879c85 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-07-06 22:18:23 +02:00
Uwe Steinmann
51cae12fab fix setting expire date (Closes: #225) 2015-07-06 22:18:06 +02:00
Uwe Steinmann
a94614c39a fix setting expire date (Closes: #225) 2015-07-06 22:17:16 +02:00
Uwe Steinmann
94b3b8e6ee remove print_r() 2015-06-30 18:12:24 +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
88739db6e7 check if SeedDMS_Core_DMS::inList() returns boolean false 
inList() used to return true of false. It returns the index in the
array insteaf of true
 2015-06-29 10:28:52 +02:00
Uwe Steinmann
52559730d9 use new customizable preview converters 2015-06-25 19:52:02 +02:00
Uwe Steinmann
6b816f4d44 better handling of converters, added converters for preview 
commands can also be deleted
 2015-06-24 21:25:53 +02:00
Uwe Steinmann
2feeb560d1 pass $settings->_initialDocumentStatus to addContent() 2015-06-24 21:25:24 +02:00
Uwe Steinmann
3c2980dfdf pass $settings->_initialDocumentStatus to checkIn() 2015-06-24 20:35:42 +02:00
Uwe Steinmann
6fde8fe200 take out review and approval status 
currently not needed
 2015-06-23 08:01:52 +02:00
Uwe Steinmann
62ba9fe961 take out review and approval status 
currently not needed
 2015-06-23 08:00:31 +02:00
Uwe Steinmann
e5036548fb take out review and approval status 
currently not needed
 2015-06-23 07:59:39 +02:00
Uwe Steinmann
db3d563e3f do not use mimetype delivered by server if overrideMimeType is set 2015-06-23 07:47:03 +02:00
Uwe Steinmann
b95f7ed91a new parameter overrideMimeType 2015-06-23 07:47:00 +02:00
Uwe Steinmann
44ce6619c0 do not use mimetype delivered by server if overrideMimeType is set 2015-06-23 07:46:55 +02:00
Uwe Steinmann
f960bc81b4 new parameter overrideMimeType 2015-06-23 07:46:39 +02:00
Uwe Steinmann
d46d2b265d do not use mimetype delivered by server if overrideMimeType is set 2015-06-23 07:45:18 +02:00
Uwe Steinmann
515e95c227 new parameter overrideMimeType 2015-06-23 07:44:47 +02:00
Uwe Steinmann
28c39791dc finfo returns only mimetype 2015-06-23 07:03:11 +02:00
Uwe Steinmann
ec0816e825 finfo returns only mimetype 2015-06-23 07:03:02 +02:00
Uwe Steinmann
4d0d4e030b finfo returns only mimetype 2015-06-23 07:02:15 +02:00
Uwe Steinmann
9643c12429 log id and name of folder 2015-06-19 15:05:04 +02:00
Uwe Steinmann
7d28e2f6f5 log id and name of folder 2015-06-19 15:04:55 +02:00
Uwe Steinmann
6a9493a786 log id and name of folder 2015-06-19 15:04:25 +02:00
Uwe Steinmann
b96d75b97d check if expires and sequence is set 2015-06-18 17:32:24 +02:00
Uwe Steinmann
65aa3eca27 check if expires and sequence is set 2015-06-18 17:32:19 +02:00
Uwe Steinmann
31d0c49412 check if expires and sequence is set 2015-06-18 17:31:56 +02:00
Uwe Steinmann
ab72bb9f8c check if keywords, name, comment was posted 2015-06-18 17:29:05 +02:00
Uwe Steinmann
0d19b2d52e check if keywords, name, comment was posted 2015-06-18 17:29:01 +02:00
Uwe Steinmann
0ff5ade2b3 check if keywords, name, comment was posted 2015-06-18 17:28:32 +02:00
Uwe Steinmann
1a179c7dca check if includecontent is set 
if not set only the excel file is delivered
 2015-06-17 08:34:15 +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
77794294b1 download review/approval files 2015-06-12 09:01:57 +02:00
Uwe Steinmann
334c2accf4 download review/approval files 2015-06-12 09:01:13 +02:00
Uwe Steinmann
5df9b44d97 download review/approval files 2015-06-12 08:59:36 +02:00
Uwe Steinmann
fcddfb0162 allow to upload a file with each review/approval 
Conflicts:
	op/op.ApproveDocument.php
	op/op.ReviewDocument.php
 2015-06-11 21:37:41 +02:00
Uwe Steinmann
d36ba8d906 allow to upload a file with each review/approval 2015-06-11 21:32:29 +02:00
Uwe Steinmann
220329c1b8 allow to upload a file with each review/approval 2015-06-11 21:30:56 +02:00
Uwe Steinmann
01ce03ca5c redirect relative to http_root 2015-06-11 14:10:12 +02:00
Uwe Steinmann
4d0a64266e redirect relative to http_root 2015-06-11 14:09:50 +02:00
Uwe Steinmann
97fe703afb fix line endings 2015-06-11 14:06:59 +02:00
Uwe Steinmann
73650ae32e send end date to end of day 2015-06-10 19:15:10 +02:00
Uwe Steinmann
2cd37d90b1 send end date to end of day 2015-06-10 19:14:28 +02:00
Uwe Steinmann
9d4a219065 send end date to end of day 2015-06-10 19:14:07 +02:00
Uwe Steinmann
18e46f0d95 redirect to url with absolute path 
using a relative url won't work if the apache rewrites the url, e.g.
/Login/<hash> will be rewritten to /seeddms/op/op.Login.php
Redirecting to ../op/op.Login.php will result in a url /op/op.Login.php
which does not exists
 2015-06-10 08:31:13 +02:00
Uwe Steinmann
ad3a3b2c52 allow to add additional authentication before ldap 2015-06-10 08:24:00 +02:00
Uwe Steinmann
083e2a55a9 add currenttab to link when redirecting to out/out.ViewDocument.php 
Conflicts:
	op/op.AddDocumentLink.php
	op/op.ReceiptDocument.php
	op/op.RemoveDocumentLink.php
	op/op.ReviseDocument.php

Conflicts:
	op/op.AddDocumentLink.php
	op/op.RemoveDocumentLink.php
 2015-06-09 09:07:51 +02:00
Uwe Steinmann
d0b32e0fb8 add currenttab to link when redirecting to out/out.ViewDocument.php 
Conflicts:
	op/op.AddDocumentLink.php
	op/op.ReceiptDocument.php
	op/op.RemoveDocumentLink.php
	op/op.ReviseDocument.php
 2015-06-09 09:04:41 +02:00
Uwe Steinmann
380ac2f1bd add currenttab to link when redirecting to out/out.ViewDocument.php 2015-06-09 08:59:25 +02:00
Uwe Steinmann
bd85c0c25a set missing parameter [url] in email notification 2015-06-09 07:16:34 +02:00
Uwe Steinmann
ddf2ab1731 set missing parameter [url] in email notification 2015-06-09 07:15:53 +02:00
Uwe Steinmann
c2b2c34290 set missing parameter [url] in email notification 2015-06-09 07:15:18 +02:00
Uwe Steinmann
20f28bb7df use /tmp for tempnam() 2015-06-08 22:00:27 +02:00
Uwe Steinmann
46dc4ea6e3 add code for downloading file into contoller 2015-06-08 21:59:56 +02:00
Uwe Steinmann
8e2aeb7264 pass resultmode to view 2015-06-08 09:15:33 +02:00
Uwe Steinmann
4180e56690 check if resultmode is set before passing it to view 2015-06-08 09:13:47 +02:00
Uwe Steinmann
83cdedad51 pass resultmode to view 2015-06-08 09:12:25 +02:00
Uwe Steinmann
f7c8d39b5d pass resultmode to view 2015-06-08 09:08:32 +02:00
Uwe Steinmann
11bac92d2f if $_GE['export'] is set the search result will be downloaded as a 
zipfile
 2015-06-02 17:28:09 +02:00
Uwe Steinmann
1bc5e6116c document status S_DRAFT can be set 2015-06-02 10:04:01 +02:00
Uwe Steinmann
5a29cde314 set initial document status 2015-06-02 10:03:34 +02:00
Uwe Steinmann
d9d4d89a27 set initial document status 2015-06-02 10:02:46 +02:00
Uwe Steinmann
4814c5cefe search for documents/folders only 2015-06-02 08:53:21 +02:00
Uwe Steinmann
1150b5cc68 search for documents/folders only 2015-06-02 08:53:08 +02:00
Uwe Steinmann
bd08e9b125 search for documents/folders only 2015-06-02 08:52:36 +02:00
Uwe Steinmann
45d3ebab3d place business login into controller class 2015-06-01 16:05:03 +02:00
Uwe Steinmann
34bd22f40e separate busines logic into controller 2015-06-01 14:01:56 +02:00
Uwe Steinmann
4e15fee3fb set url for notifaction mail 2015-06-01 14:01:02 +02:00
Uwe Steinmann
bcff843186 set comment in notification mail 2015-06-01 07:36:14 +02:00
Uwe Steinmann
5246c3a329 place code for updating document content into controller 2015-06-01 07:21:16 +02:00
Uwe Steinmann
19b9888d34 place business logic into controller 2015-06-01 07:16:21 +02:00
Uwe Steinmann
570e0fa782 some code reorganisation 2015-05-30 07:32:36 +02:00
Uwe Steinmann
220fa8a8fc split file into stub and controller 2015-05-29 20:44:16 +02:00
Uwe Steinmann
5b931afefb split AddDocument into stub and controller 2015-05-29 20:43:37 +02:00
Uwe Steinmann
b8d06babee add setting for library folder 2015-05-29 20:42:37 +02:00
Uwe Steinmann
536ead64ac allow to substitute user for regular users 2015-05-19 19:44:18 +02:00
Uwe Steinmann
a80f4090af add filter for documents in revision 2015-05-19 19:41:40 +02:00
Uwe Steinmann
06c71cc332 add handling of substitutes 2015-05-19 08:06:24 +02:00
Uwe Steinmann
eb7f3613ca add scripts for adding content to a transmittal 2015-05-13 18:43:28 +02:00
Uwe Steinmann
6f3594d294 add cmd [remove|update]transmittalitem 2015-05-13 17:34:50 +02:00
Uwe Steinmann
d7232aa8cd fix key of phrase 2015-05-13 17:34:23 +02:00
Uwe Steinmann
4101a83639 better error checking 2015-05-12 19:11:17 +02:00
Uwe Steinmann
4c74bda247 add files to download content of transmittal 2015-05-12 19:06:23 +02:00
Uwe Steinmann
71da44c618 add missing files for revising documents 2015-05-12 19:05:02 +02:00
Uwe Steinmann
9859737668 fix typo in file 2015-05-11 09:32:10 +02:00
Uwe Steinmann
608a86d45c rename reviser to revisor, added revision workflow to document page 2015-05-11 09:30:13 +02:00
Uwe Steinmann
a5c27190c1 no need to pass document status to addWorkflowAction() 2015-05-04 07:02:51 +02:00
Uwe Steinmann
6e852f4eac no need to pass document status to addWorkflowAction() 2015-05-04 07:02:43 +02:00
Uwe Steinmann
b25184af17 no need to pass document status to addWorkflowAction() 2015-05-04 07:01:51 +02:00
Uwe Steinmann
fa43001824 use propper name of converters array in settings 2015-05-02 08:05:51 +02:00
Uwe Steinmann
15ce32ca24 use propper name of converters array in settings 2015-05-02 08:05:46 +02:00
Uwe Steinmann
a7763c8cc4 use propper name of converters array in settings 2015-05-02 08:04:41 +02:00
Uwe Steinmann
47d97e77d8 add files for transmittal management and receptions 2015-04-30 07:09:21 +02:00
Uwe Steinmann
52a2106155 include correct files in right direction 2015-04-29 20:08:46 +02:00
Uwe Steinmann
eefc346312 include correct files in right direction 2015-04-29 20:08:10 +02:00
Uwe Steinmann
c0ba8a6711 create checkout dir if required and allowed in the settings 2015-04-23 11:49:05 +02:00
Uwe Steinmann
08e768fc52 add missing files for document check out/іn 2015-04-22 17:23:54 +02:00
Uwe Steinmann
4f3c6ed090 add checkbox for creating checkout dir if it doesn't exists 2015-04-22 17:21:57 +02:00
Uwe Steinmann
0addaf56d3 add missing files for revision workflow and document reception 2015-04-22 10:33:49 +02:00
Uwe Steinmann
5611be5c7f set proper msg when approver was deleted or already assigned 2015-04-20 13:47:34 +02:00
Uwe Steinmann
387f67dad4 enable/disable Acknowledge and Revision workflow 2015-04-20 13:44:45 +02:00
Uwe Steinmann
4e5bf5912f set proper msg when approver was deleted or already assigned 2015-04-20 13:40:10 +02:00
Uwe Steinmann
e00f440717 set checkout dir 2015-04-17 20:12:29 +02:00
Uwe Steinmann
a796c85e01 add validation of attributes 2015-04-17 20:09:20 +02:00
Uwe Steinmann
1fda236179 pass proper array converters to SeedDMS_Lucence_IndexedDocument 2015-04-16 14:16:03 +02:00
Uwe Steinmann
1348cd008d first check for $_POST vars 
$_POST['notification_users'] and $_POST['notification_groups']
 2015-04-16 14:12:47 +02:00
Uwe Steinmann
a252f82f08 first check for $_POST vars 
$_POST['notification_users'] and $_POST['notification_groups']
 2015-04-16 14:12:01 +02:00
Uwe Steinmann
6481d230a6 pass proper array converters to SeedDMS_Lucence_IndexedDocument 2015-04-16 08:06:15 +02:00
Uwe Steinmann
a73d14e5a4 fix calling constructor of SeedDMS_Extension_Mgr 2015-04-16 08:04:15 +02:00
Uwe Steinmann
6af9a3a210 move setting error msg into controller 2015-04-15 16:13:47 +02:00
Uwe Steinmann
be990463bd validate attribute values 2015-04-15 16:13:22 +02:00
Uwe Steinmann
9c61ede57a remove old print_r() 2015-04-14 19:37:33 +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
645fbe7def check for workflow type when evaluating post vars 2015-03-27 17:21:37 +01:00
Uwe Steinmann
d2f4c24f08 set additional notification if set, send mails for each workflow step 2015-03-27 16:42:26 +01:00
Uwe Steinmann
cb81eb7db4 Merge branch 'seeddms-4.3.16' into develop 
Conflicts:
	Makefile
	views/bootstrap/class.UsrMgr.php
 2015-03-20 08:32:29 +01:00
Uwe Steinmann
d7d63ae129 fix calculation of totalPages 2015-03-20 07:57:02 +01:00
Uwe Steinmann
78cb252e9d do not send email twice to a user, do not send email if expiration 
hasn't changed
 2015-03-17 17:45:53 +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
a257c25277 fully obey permissions of documents 2015-03-17 06:36:33 +01:00
Uwe Steinmann
1f1e273c97 set url in email notification 2015-03-16 09:12:49 +01:00
Uwe Steinmann
b4195171f9 set mail to list of user and group reviewers/approvers 
not just users
 2015-03-16 08:57:29 +01:00
Uwe Steinmann
28f0d7e1cb send mail when workflow starts 2015-03-12 14:02:16 +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
dee7f03931 set mail to users/groups who need to take action in next workflow 
transition
 2015-03-11 18:12:52 +01:00
Uwe Steinmann
c3b80c1b5d add new option enableNotificationWorkflow 
turns on/off is mail is set to users/groups in next step of workflow
 2015-03-11 18:11:41 +01:00
Uwe Steinmann
083dad60e8 remove old code for email creation 2015-02-27 17:11:50 +01:00
Uwe Steinmann
46d7ecf80d do not even check for guest user, if disabled 2015-02-26 11:47:28 +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
f5d656bde0 set a group notification with setting a user works again (Bug #201) 2015-02-11 18:30:39 +01:00
Uwe Steinmann
f992adf775 do not used fixed classnames for SeedDMS_Core[Folder|Document] 
use classname returned by SeedDMЅ_Core_DMS::getClassname()
 2015-02-05 07:38:56 +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
f79f9acc78 reseting expiration date works again 2015-01-23 13:38:52 +01:00
Uwe Steinmann
a87d802dba take out second inclusion of inc/inc.Extension.php 2015-01-23 10:34:52 +01:00
Uwe Steinmann
e24439ff43 do not use global variables anymore 2015-01-08 14:53:53 +01:00
Uwe Steinmann
e486254d80 include inc/inc.Init.php, new order of include files 2014-12-08 14:47:32 +01:00
Uwe Steinmann
4a652ba1df fix line endings 2014-12-08 14:47:05 +01:00
Uwe Steinmann
1744479837 removed left overs from failed merge (Bug #190) 2014-12-08 14:46:01 +01:00
Uwe Steinmann
77b5abe6bf fix line endings, change sequence of include files 2014-12-08 14:44:59 +01:00
Uwe Steinmann
1de8e26289 fix line endings, change sequence of include files 2014-12-08 14:43:50 +01:00
Uwe Steinmann
1be9052c85 put controller code into controller/class.EditFolder.php 2014-12-08 14:43:04 +01:00
Uwe Steinmann
4483fb52cc fix line endingѕ, adjust sequence of include files 2014-12-08 14:41:47 +01:00
Uwe Steinmann
8809086014 Merge branch 'seeddms-4.3.13' into develop 2014-11-24 19:42:18 +01:00
Uwe Steinmann
b39b92e0b0 don't crash if folder/document was deleted (Bug #186) 2014-11-24 19:08:17 +01:00
Uwe Steinmann
0a3f4e1fd7 do not include inc/inc.ClassEmail.php twice 2014-11-24 19:00:04 +01:00
Uwe Steinmann
e9c3696466 Merge branch 'seeddms-4.3.13' into develop 
Conflicts:
	Makefile
 2014-11-19 17:04:56 +01:00
Uwe Steinmann
03359ca620 fix checking for attribute values 
checking for the number of values of a multi value attribute
disregards the maximum number of values if it is 0
 2014-11-19 17:00:55 +01:00