gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-06 13:19:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,658 Commits 7 Branches 86 Tags 44 MiB
c739d37bf5
Commit Graph

1133 Commits

Author SHA1 Message Date
Uwe Steinmann
38f90b400d Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-08-24 08:35:19 +02:00
Uwe Steinmann
329aa59012 add command sendlogindata 2017-08-24 08:15:12 +02:00
Uwe Steinmann
94b79fcd09 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-08-23 13:47:18 +02:00
Uwe Steinmann
fa9e8d9d66 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-08-23 13:47:04 +02:00
Uwe Steinmann
99fe3a4ff7 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-08-23 13:46:52 +02:00
Uwe Steinmann
6858b98558 do not redirect with host and port (Closes #336) 2017-08-23 13:46:07 +02:00
Uwe Steinmann
9e4b80e25b Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-08-02 12:14:14 +02:00
Uwe Steinmann
5ec13f02af Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-08-02 10:57:20 +02:00
Uwe Steinmann
efbc30c0dd Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-08-02 10:57:10 +02:00
Uwe Steinmann
c54faf8f90 regard mandatory reviewers/approvers 
the owner of the document may not remove mandatory reviewers/approvers
anymore. Only admin may do that, it he/she is not the owner.
 2017-08-02 10:54:40 +02:00
Uwe Steinmann
8f59babaad Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-08-01 08:37:31 +02:00
Uwe Steinmann
85cc7c017f send mails to reviewer and approver 2017-08-01 08:36:17 +02:00
Uwe Steinmann
e8b09b3f03 do not send notification to owner anymore 
was sent when current user != owner
 2017-08-01 08:04:46 +02:00
Uwe Steinmann
05671428e1 file in drop folder can be shown in menu as item 2017-07-31 20:30:59 +02:00
Uwe Steinmann
2de7d8931a set status[receipt] and status[revision] to empty array if not set 2017-07-31 14:22:12 +02:00
Uwe Steinmann
596cb2afd6 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-07-31 14:18:18 +02:00
Uwe Steinmann
f307658290 do not remove from process when none is checked 2017-07-31 14:16:45 +02:00
Uwe Steinmann
afefe1d66c Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-07-31 11:49:43 +02:00
Uwe Steinmann
2d2dd8f1bf docs, folders etc. can be transferred 2017-07-31 11:28:39 +02:00
Uwe Steinmann
67f2d70ce4 fix uploading of attachments 2017-07-31 11:24:42 +02:00
Uwe Steinmann
e953d9dcbb Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-07-28 15:12:00 +02:00
Uwe Steinmann
d8ae673270 finish removal from process 2017-07-28 14:57:17 +02:00
Uwe Steinmann
dee74c96e6 add new action 'removefromprocesses' 2017-07-28 12:34:37 +02:00
Uwe Steinmann
26cb15fe21 verify status after setting revisors 2017-07-21 11:48:32 +02:00
Uwe Steinmann
09dd448b40 set right message when removing revisor 2017-07-20 18:22:33 +02:00
Uwe Steinmann
a846bcf633 replace sql statement by function in SeedDMS_Core_Document 2017-07-20 18:21:24 +02:00
Uwe Steinmann
7c01cadb2f Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-07-20 17:05:25 +02:00
Uwe Steinmann
2fe4724bfd set $indexconf to null if fulltext is disabled 2017-07-20 17:04:26 +02:00
Uwe Steinmann
b855389965 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-07-13 18:08:56 +02:00
Uwe Steinmann
a0651239dd Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-07-13 18:03:15 +02:00
Uwe Steinmann
e029e8e55a Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-07-13 17:56:31 +02:00
Uwe Steinmann
d6e10dddd6 pass $content to controller, not $latestContent 
$latestContent and $content are different objects. If $latestContent
is passed to the controller, its status will be updated in the object
but $content has still the old status. Getting the status later on
from $content, still returns the old content.
 2017-07-13 14:55:51 +02:00
Uwe Steinmann
6e37e1ded6 fix check for new content status 2017-07-13 14:11:04 +02:00
Uwe Steinmann
f1cfa81c39 set splash messages after succesful saving the data 2017-07-13 08:49:50 +02:00
Uwe Steinmann
c26d13484f fix regex expression 2017-07-10 10:32:21 +02:00
Uwe Steinmann
99682a11d1 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-07-10 07:50:33 +02:00
Uwe Steinmann
258c3fae0b change field name of attributes to 'attributes_version' 
makes much more sense because the attributes are version attributes.
 2017-06-29 16:32:42 +02:00
Uwe Steinmann
2a38d713b8 get approval status before sending notification mails 
the approval status was simply not known because part of the code
went into the controller
 2017-06-29 15:34:32 +02:00
Uwe Steinmann
919f4cb39c Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-06-26 10:20:48 +02:00
Uwe Steinmann
31ed9a729f remove old code 2017-06-24 07:16:13 +02:00
Uwe Steinmann
b59b6a0cfb pass initial status from settings to updateDocument 2017-06-14 14:04:38 +02:00
Uwe Steinmann
652e7a82af Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-06-13 14:48:55 +02:00
Uwe Steinmann
778f94f0d1 use AddDocument controller when uploading a document 
this will make sure all hooks are being called
 2017-06-09 12:29:20 +02:00
Uwe Steinmann
b406d31ea0 add menu tasks including checkbox in settings for enabling it 2017-05-12 18:09:53 +02:00
Uwe Steinmann
add8c5ae2e propperly set status in reject mail 2017-05-12 13:25:58 +02:00
Uwe Steinmann
092967004a Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-05-12 08:23:42 +02:00
Uwe Steinmann
8e69893e89 move updating document into controller 2017-05-04 13:48:07 +02:00
Uwe Steinmann
3cc572a1cd Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-05-02 06:47:42 +02:00
Uwe Steinmann
fe13c6cee1 move code into controller 2017-04-27 17:21:05 +02:00
Uwe Steinmann
6ee6e3fde2 take out enableAttachmentUpload 2017-04-27 17:19:49 +02:00
Uwe Steinmann
b1d5548853 also upload attachment if passed 2017-04-27 06:51:43 +02:00
Uwe Steinmann
d2fc9b534f add enableMultiUpload and enableAttachmentUpload 2017-04-27 06:50:12 +02:00
Uwe Steinmann
dae6b2afde fix parameter of hooks 2017-04-20 10:03:53 +02:00
Uwe Steinmann
5484c47ebd pass null as first parameter of hooks, will later be the controller 2017-04-20 10:01:15 +02:00
Uwe Steinmann
1a901f47f3 fix reges for mimetype 2017-04-20 09:59:23 +02:00
Uwe Steinmann
f33b70c0db fix regex for mimetypes 2017-04-20 09:58:46 +02:00
Uwe Steinmann
b67339a9c7 pass document to hooks 2017-04-20 09:56:37 +02:00
Uwe Steinmann
d70713d29e fix calling hooks 2017-04-20 09:55:46 +02:00
Uwe Steinmann
a04dac811e use new select menu for expiration date 2017-04-18 13:29:26 +02:00
Uwe Steinmann
a548710a55 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-04-11 17:08:59 +02:00
Uwe Steinmann
06db1ec603 session list can be turned on/off by settings 2017-04-11 08:33:33 +02:00
Uwe Steinmann
510067a714 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-04-11 06:42:27 +02:00
Uwe Steinmann
ca17bc0c8c pass null as first argument to all hooks (will later be the controller) 2017-04-05 22:08:25 +02:00
Uwe Steinmann
727f93eafa expiration date can be selected from list and entered by calendar 2017-04-05 22:00:54 +02:00
Uwe Steinmann
cb6dbd0c8d call hook 'approveDocument' after document has been approved or rejected 2017-04-05 21:59:45 +02:00
Uwe Steinmann
a65315c537 move all task output into own view 2017-03-20 12:41:21 +01:00
Uwe Steinmann
df27dcf878 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-20 11:54:55 +01:00
Uwe Steinmann
8afaf3c748 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-03-15 16:46:04 +01:00
Uwe Steinmann
c823981bd9 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-15 16:45:02 +01:00
Uwe Steinmann
2e3b9f474b add maxUploadSize 2017-03-15 16:39:05 +01:00
Uwe Steinmann
479ee94fd8 take out command 'view', is now covered by view classes 2017-03-10 20:08:32 +01:00
Uwe Steinmann
3853f0010f Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-08 13:17:29 +01:00
Uwe Steinmann
4c6ce8218a Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-03-08 11:34:17 +01:00
Uwe Steinmann
a528a3ce57 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-08 11:33:05 +01:00
Uwe Steinmann
3268603794 use utf8_basename() instead of basename() 2017-03-08 10:34:46 +01:00
Uwe Steinmann
0a8261fdcb Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-03 12:08:05 +01:00
Uwe Steinmann
44bfc43c47 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-03-03 10:35:20 +01:00
Uwe Steinmann
7d252d691b Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-03 10:35:09 +01:00
Uwe Steinmann
02e016d74c use utf8_basename() instead of basename() 2017-03-03 10:34:46 +01:00
Uwe Steinmann
29c5ae0f51 pass null for controller when calling hook preIndexDocument 2017-03-03 10:32:41 +01:00
Uwe Steinmann
012d4d9f8d Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-03 09:43:45 +01:00
Uwe Steinmann
b76448c3a4 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-03-03 08:58:09 +01:00
Uwe Steinmann
2843913f08 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-03 08:55:43 +01:00
Uwe Steinmann
78e0f0e0b7 use utf8_basename() instead of basename() 2017-03-03 08:54:18 +01:00
Uwe Steinmann
7e59084b25 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-03-02 08:21:53 +01:00
Uwe Steinmann
fbfa2a2132 allow '*' in mimetype for preview command 2017-03-02 07:17:42 +01:00
Uwe Steinmann
ebb0c71a3f allow '*' in mimetype 2017-03-02 06:58:02 +01:00
Uwe Steinmann
fea676c1d4 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-02-24 19:07:23 +01:00
Uwe Steinmann
a4fdc3ad95 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-24 19:02:26 +01:00
Uwe Steinmann
1794a3a5a3 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-24 14:16:11 +01:00
Uwe Steinmann
be40c980ba Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-24 12:15:27 +01:00
Uwe Steinmann
e85a9b83d7 pass null as first argument to preIndexDocument() 
this will later be replaced by the controller
 2017-02-24 12:14:22 +01:00
Uwe Steinmann
9802959e50 add command 'indexdocument' 2017-02-24 12:13:01 +01:00
Uwe Steinmann
811a8f14d2 add hook addDocument::preIndexDocument 2017-02-23 09:00:40 +01:00
Uwe Steinmann
cbd9b8fa83 add hooks updateDocument::(postUpdateDocument|preUpdateDocument|preIndexDocument) 2017-02-23 08:59:56 +01:00
Uwe Steinmann
31074ab8e7 fix calling hook after uploading document 2017-02-23 08:58:01 +01:00
Uwe Steinmann
10e94af144 not needed anymore for a long time 2017-02-23 07:55:25 +01:00
Uwe Steinmann
6b2deaea5b add script for retrieving a pdf file 2017-02-23 07:07:15 +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
706465a971 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-22 09:41:08 +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
4c794381e6 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-02-20 17:34:43 +01:00
Uwe Steinmann
410b36870a Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-20 17:22:26 +01:00
Uwe Steinmann
a6673fe908 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-20 17:21:24 +01:00
Uwe Steinmann
007f7c7f2c check if version is set 2017-02-20 15:34:23 +01:00
Uwe Steinmann
19f77a37c8 add missing changes which got lost during last rebase 2017-02-20 15:33:15 +01:00
Uwe Steinmann
6f0d9e5d5d move folders/documents propperly checks for access rights (Closes #309) 2017-02-18 07:55:40 +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
704fc28b34 comment, name must not be set, return json if requested 2017-02-16 14:54:55 +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
ba1d3c8c9b fix incluѕion of files 2017-02-08 16:38:04 +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
04a241111f remove imported folder if requested 2017-02-03 12:21:51 +01:00
Uwe Steinmann
8516d23684 add support for fine uploader 2017-01-31 17:27:53 +01:00
Uwe Steinmann
05e163a39d add support for fine uploader 2017-01-31 17:27:33 +01:00
Uwe Steinmann
3dd94a9eac do not check if file was uploaded, as this fails for fine uploader files 2017-01-31 17:19:12 +01:00
Uwe Steinmann
196725042d add support for fine-uploader as a replacement for the old jumploader 2017-01-30 13:17:58 +01:00
Uwe Steinmann
40956e9501 paѕs owner to controller 2017-01-25 12:24:47 +01:00
Uwe Steinmann
e280a6afa9 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-20 15:02:27 +01:00
Uwe Steinmann
cd745eb518 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-18 21:24:01 +01:00
Uwe Steinmann
6d9798753b set default access and owner 2017-01-18 20:58:52 +01:00
Uwe Steinmann
13973dd276 set default access for doc when uploading 2017-01-18 20:58:28 +01:00
Uwe Steinmann
88c06c2f37 add defaultAccessDocs 2017-01-18 20:58:03 +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
b8a7917c12 add '-' to allowed char in mimetype 2017-01-18 14:23:16 +01:00
Uwe Steinmann
56e7f567c7 enable turn off of updating document reception 2017-01-17 14:20:33 +01:00
Uwe Steinmann
f6d3e9785f Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-16 15:52:19 +01:00
Uwe Steinmann
c37910e473 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-16 15:12:16 +01:00
Uwe Steinmann
905eddabce add new configuration enableUpdateRevApp 2017-01-16 13:00:22 +01:00
Uwe Steinmann
b27b8ba7fd check access rights in controller, not before 2017-01-10 06:58:07 +01:00
Uwe Steinmann
95ebfe1657 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-09 21:13:42 +01:00
Uwe Steinmann
289e13b255 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-09 15:32:57 +01:00
Uwe Steinmann
60dd7f8516 check if preview and/or js cache is to be cleared 2017-01-09 10:56:32 +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
d529b2d4b2 fix syntax error (Closes #304) 2017-01-01 19:29:20 +01:00
Uwe Steinmann
8d20d39a07 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-12-22 09:36:15 +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
4147c29dd3 set availlanguages to empty array() if not set in configuration 2016-12-12 18:14:54 +01:00
Uwe Steinmann
7bf6ec003c Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-12-12 16:25:54 +01:00
Uwe Steinmann
6c7e634213 fix cleanup of new mimetype 2016-12-12 16:25:34 +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
dfc0db8bc5 no longer send notif. to owner 2016-12-08 18:14:54 +01:00
Uwe Steinmann
902565fee4 merge notif. list to prevent duplicates 2016-12-08 18:14:24 +01:00
Uwe Steinmann
3f6f0dd818 do not send extra notif. to owner, send notif. of src and target forlder 2016-12-08 18:13:12 +01:00
Uwe Steinmann
30d85e03fc remove old, already commented code 2016-12-08 18:12:25 +01:00
Uwe Steinmann
5937d98cb3 do not send notif. to old owner, send notif. if access rights are inherited again 2016-12-08 18:11:35 +01:00
Uwe Steinmann
70a1a20070 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-12-08 15:43:07 +01:00