Commit Graph

807 Commits

Author SHA1 Message Date
Uwe Steinmann
bae2baf3f5 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-10-27 19:44:07 +02:00
Uwe Steinmann
d4c6dc8962 fix getting last sessions
group by didn't work anymore in new mysql versions
2017-10-27 19:42:56 +02:00
Uwe Steinmann
5b2da28edd Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-09-27 07:02:38 +02:00
Uwe Steinmann
3e2d6e3f74 add preview width for dropfolder lists 2017-09-20 09:20:56 +02:00
Uwe Steinmann
4c5dc52fa0 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-09-05 09:35:23 +02:00
Uwe Steinmann
4ba5db88e9 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-09-05 09:32:03 +02:00
Uwe Steinmann
45d0c2618f start new version 4.3.37 2017-09-05 09:27:55 +02:00
Uwe Steinmann
ed1f74baca fix merge error 2017-08-02 12:15:13 +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
ea8a695551 maySetReviewersApprovers() checks if review/approval has been done already 2017-08-02 10:53:50 +02:00
Uwe Steinmann
13845065d4 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-08-02 07:06:16 +02:00
Uwe Steinmann
4aef48e5f7 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-08-02 07:02:58 +02:00
Uwe Steinmann
e0dcd86f5a add optional version number to mayEditOnline() 2017-08-02 06:46:44 +02:00
Uwe Steinmann
9fe0a39321 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-08-01 11:33:35 +02:00
Uwe Steinmann
00a91b621c Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-08-01 10:30:22 +02:00
Uwe Steinmann
5e640ad42b Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-08-01 10:30:09 +02:00
Uwe Steinmann
1339c36d67 do not add dir separator to contentDir if it is empty 2017-08-01 10:22:10 +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
05671428e1 file in drop folder can be shown in menu as item 2017-07-31 20:30:59 +02:00
Uwe Steinmann
1f701a84e4 group last access sessions by userid 2017-07-27 13:42:12 +02:00
Uwe Steinmann
05489891f7 getPermission() returns always an int 2017-07-27 12:36:20 +02:00
Uwe Steinmann
ee13f8d084 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-07-21 16:56:33 +02:00
Uwe Steinmann
407ef2097d pass regex to getValidationText 2017-07-21 16:54:17 +02:00
Uwe Steinmann
7259c668c4 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-07-20 15:09:39 +02:00
Uwe Steinmann
c44b7853b2 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-07-20 15:09:26 +02:00
Uwe Steinmann
c0797cc896 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-07-20 15:09:12 +02:00
Uwe Steinmann
61df93ba13 showtree() checks expandFolderTree (partially resolves #312) 2017-07-19 19:14:28 +02:00
Uwe Steinmann
78ba1c131b make sure contentDir ends with DIRECTORY_SEPERATOR (Closes #323) 2017-07-19 17:45:38 +02:00
Uwe Steinmann
00b4817bc7 add formatComment()
used to group comments entered for receiption of document
2017-07-18 13:35:35 +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
b43200703b start new version 4.3.36 2017-07-11 18:12:31 +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
01cd47401c more documentation on return value of callHook 2017-06-20 09:13:24 +02:00
Uwe Steinmann
e7b0e7bdde Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-06-19 12:52:12 +02:00
Uwe Steinmann
ed531dc35d fix inclusion of file 2017-06-19 11:08:06 +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
7d6fd23c6d check if return value of hook is != null 2017-06-13 14:47:16 +02:00
Uwe Steinmann
4b89d920cb check if returned array is not empty 2017-06-09 15:13:15 +02:00
Uwe Steinmann
883131d61e add method setErrorMsg() 2017-06-09 12:27:26 +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
092967004a Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-05-12 08:23:42 +02:00
Uwe Steinmann
19aa2b5e45 add __invoke() method 2017-05-12 08:15:26 +02:00
Uwe Steinmann
9801f5e481 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-05-02 21:02:00 +02:00
Uwe Steinmann
53f646114a set from_address as return path if set 2017-05-02 20:52:40 +02:00
Uwe Steinmann
9ab19afe03 check return value of hook
no return value will be discarded, array and objects are put into an array, strings are concatened
2017-05-02 18:29:47 +02:00
Uwe Steinmann
7c7dfc1411 handle hooks with two arguments 2017-05-02 18:28:56 +02:00
Uwe Steinmann
3cc572a1cd Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-05-02 06:47:42 +02:00