Commit Graph

175 Commits

Author SHA1 Message Date
Uwe Steinmann
b27b8ba7fd check access rights in controller, not before 2017-01-10 06:58:07 +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
13bab66b6f Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-12-08 18:21:08 +01:00
Uwe Steinmann
902565fee4 merge notif. list to prevent duplicates 2016-12-08 18:14:24 +01:00
Uwe Steinmann
ce20c3fea9 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-12-02 11:35:57 +01:00
Uwe Steinmann
6494eda4eb send request for approval mail only if no review is needed
previously the approver was invited to approve the document, even if
the review hasn't been done
2016-12-01 08:25:16 +01:00
Uwe Steinmann
ba5a73df45 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-10-27 11:19:45 +02:00
Uwe Steinmann
3659ffbde5 use new attribute validation code 2016-10-27 10:56:21 +02:00
Uwe Steinmann
cc387a1f52 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-10-27 09:39:08 +02:00
Uwe Steinmann
02d641786b use same attribute validation
based on SeedDMS_Core::AttributeDefinition->validate() and getAttributeValidationText()
2016-10-27 09:19:35 +02:00
Uwe Steinmann
2cc90ccbaf Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-10-06 15:29:11 +02:00
Uwe Steinmann
1541fc26ec Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-10-06 15:27:52 +02:00
Uwe Steinmann
c670ca4639 fix typo 2016-10-05 16:23:22 +02:00
Uwe Steinmann
17c9556337 remove left over from git merge conflict 2016-08-11 12:11:09 +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
6303973618 fix copyright in header 2016-08-09 07:34:30 +02:00
Uwe Steinmann
138a6ce408 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-08-03 09:30:53 +02:00
Uwe Steinmann
b013553a3d Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-03 09:24:10 +02:00
Uwe Steinmann
04d7fdf258 update full text engine
also index content if file size is less the a configured size
(Closes: #270)
2016-08-02 17:09:49 +02:00
Uwe Steinmann
de793abb7b use SeedDMS_Core_Attribute->validate() 2016-05-30 19:26:19 +02:00
Uwe Steinmann
44dbf74c57 Merge branch 'seeddms-5.0.x' into develop 2016-05-30 11:20:47 +02:00
Uwe Steinmann
67474d1d88 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-05-30 11:16:52 +02:00
Uwe Steinmann
4bfc47f063 check if minimum number of attribute values is set 2016-05-26 10:45:40 +02:00
Uwe Steinmann
d76d54ce96 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-05-24 08:00:48 +02:00
Uwe Steinmann
6ba8013d40 add option to unlink file in drop folder once uploaded 2016-05-23 13:15:50 +02:00
Uwe Steinmann
b4e2224c3e Merge branch 'seeddms-5.0.x' into develop 2016-04-22 12:39:41 +02:00
Uwe Steinmann
10d5a2dca1 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-04-22 12:39:27 +02:00
Uwe Steinmann
258b58efd2 trim various fields from post request 2016-04-22 12:39:04 +02:00
Uwe Steinmann
6893b26818 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-04-21 13:34:47 +02:00
Uwe Steinmann
a6cdb2015a notify groups and users of new document as well 2016-04-21 13:34:13 +02:00
Uwe Steinmann
aee1ff2fcb inform notifier of new document too 2016-04-21 13:32:37 +02:00
Uwe Steinmann
0f1a0bece5 fix typo in hook function 2016-04-07 08:36:20 +02:00
Uwe Steinmann
3b8d7a5271 Merge branch 'seeddms-5.0.x' into develop 2016-02-04 19:22:59 +01:00
Uwe Steinmann
51f80c0930 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-01-27 17:23:22 +01:00
Uwe Steinmann
a68954725e get mandatory workflow from $_POST[workflows] 2016-01-27 16:19:35 +01:00
Uwe Steinmann
7d88617964 individual approver/reviewer can be take from group 2015-12-04 08:00:50 +01:00
Uwe Steinmann
1f77a749be Merge branch 'seeddms-5.0.x' into develop 2015-11-27 16:09:11 +01:00
Uwe Steinmann
250400a9cb Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-11-25 17:01:52 +01:00
Uwe Steinmann
eda80242ea some reorganization of email notification 2015-11-25 16:49:09 +01:00
Uwe Steinmann
19c195a357 Merge branch 'seeddms-5.0.x' into develop 2015-11-11 06:52:36 +01:00
Uwe Steinmann
ac09780cad Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-11-11 06:27:58 +01:00
Uwe Steinmann
0cb6d2df5a send appropriate mail to reviewer/approver
not just the 'new document' mail
2015-11-09 18:49:58 +01:00
Uwe Steinmann
a30b3b9505 Merge branch 'seeddms-5.0.x' into develop 2015-10-30 13:09:25 +01:00
Uwe Steinmann
50e0d2a885 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-30 08:41:40 +01:00
Uwe Steinmann
15b1414d6e set format in date field to yyyy-mm-dd 2015-10-30 08:02:57 +01: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
db3d563e3f do not use mimetype delivered by server if overrideMimeType is set 2015-06-23 07:47:03 +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
d46d2b265d do not use mimetype delivered by server if overrideMimeType is set 2015-06-23 07:45:18 +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
20f28bb7df use /tmp for tempnam() 2015-06-08 22:00:27 +02:00
Uwe Steinmann
5a29cde314 set initial document status 2015-06-02 10:03:34 +02:00
Uwe Steinmann
5b931afefb split AddDocument into stub and controller 2015-05-29 20:43:37 +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
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
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
e486254d80 include inc/inc.Init.php, new order of include files 2014-12-08 14:47:32 +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
Uwe Steinmann
834a8118e6 check for propper number of attribute values 2014-11-17 07:03:57 +01: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
48c3f24e01 get rid of some old code 2014-07-11 08:38:05 +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
3ebfd7aacf extract filetype by using pathinfo() 2014-06-13 17:29:40 +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
71fb34cbca check quota 2014-05-20 06:43:44 +02:00
Uwe Steinmann
3fc340f226 check for quota 2014-03-26 17:30:19 +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
bbd1fd6445 take enableAdminRevApp and enableOwnerRevApp into account
getReadAccessList() doesn't return the owner and administrators
unless explicitly requested by passing true for the first and second
parameter
2014-03-14 15:11:40 +01:00
Uwe Steinmann
0a070eef1f Merge branch 'seeddms-4.3.5' into develop
Conflicts:
	languages/en_GB/lang.inc
	views/bootstrap/class.Bootstrap.php
2014-03-04 11:20:02 +01:00
Uwe Steinmann
374250f344 replace ',' in $ѕequence by '.' 2014-03-03 14:42:58 +01:00
Uwe Steinmann
f753d9fa47 Merge branch 'develop' into hooks 2013-08-07 22:00:56 +02:00
Uwe Steinmann
857519033d do not allow to change workflow if it is mandatory 2013-08-06 14:21:40 +02:00
Uwe Steinmann
72010b1bc0 Merge branch 'develop' into hooks 2013-06-06 16:02:28 +02:00
Uwe Steinmann
d344eaea9a another switch for taking the comment for the version
if there is no version comment then the document comment can be taken
if the users forces it.
2013-06-06 14:05:03 +02:00
Uwe Steinmann
06e06a4ac0 add checking of attribute values against regular expression 2013-05-28 09:03:21 +02:00
Uwe Steinmann
b6ae2dcce6 place inclusion of inc.Extension.php before inc.ClassUI.php 2013-05-02 18:25:30 +02:00
Uwe Steinmann
08c0961a16 added hook before adding a document 2013-04-30 20:11:16 +02:00
Uwe Steinmann
0e631bd09e check if expires is set in POST request without php warning 2013-04-30 18:06:44 +02:00
Uwe Steinmann
19061c5c2b set expiration date if set 2013-04-30 17:14:21 +02:00
Uwe Steinmann
555214c8ed check if post var dropfolderfileform1 is set 2013-03-26 20:20:23 +01:00
Uwe Steinmann
9a72052744 check if $_POST["expires"] is set 2013-03-13 18:44:42 +01:00
Uwe Steinmann
34b72a17a1 reworked notification system
The notifaction will now be send in the language as specified in the
user's profile
2013-03-06 12:53:25 +01:00
Uwe Steinmann
73c6ff9427 major name change from letodms to seeddms 2013-02-14 12:10:53 +01:00
steinm
af54fcb645 - replace getApproversList() by getReadUserList() 2013-02-11 13:56:59 +00:00
steinm
8c0f37c7f6 - remove entry for uploaded file if drop folder file was selected 2013-02-08 14:55:26 +00:00
steinm
d34e207170 - check for 0 bytes files and issue an appropriate warning 2013-02-08 07:29:41 +00:00
steinm
a0a4a37b85 - list of categories is not longer a comma separated but an array 2013-01-29 08:13:35 +00:00