Uwe Steinmann
|
2bc217b156
|
add files for 2 factor authentication
|
2016-07-12 17:39:10 +02:00 |
|
Uwe Steinmann
|
5e5951880f
|
Merge branch 'seeddms-5.0.x' into seeddms-5.1.x
|
2016-07-06 22:27:34 +02:00 |
|
Uwe Steinmann
|
27fe80f9f6
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2016-07-06 22:27:21 +02:00 |
|
Uwe Steinmann
|
8d1181e3a4
|
add new phrases for 2-factor auth
|
2016-07-06 22:26:57 +02:00 |
|
Uwe Steinmann
|
7f9f118fba
|
add qrcode and secret for 2-factor auth
|
2016-07-06 22:26:23 +02:00 |
|
Uwe Steinmann
|
4d7f228a4c
|
add field secret to tblUsers
|
2016-07-06 22:25:59 +02:00 |
|
Uwe Steinmann
|
825ef2898b
|
add enable2FactorAuthentication
|
2016-07-06 22:25:43 +02:00 |
|
Uwe Steinmann
|
303a114178
|
add field 'secret' for secret of 2-factor auth
|
2016-07-06 22:24:50 +02:00 |
|
Uwe Steinmann
|
3922d1706a
|
Merge branch 'seeddms-5.0.x' into seeddms-5.1.x
|
2016-07-06 13:35:31 +02:00 |
|
Uwe Steinmann
|
50772bd7a9
|
include missing files
|
2016-07-06 13:04:19 +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
|
dd616fdf8f
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2016-07-06 11:12:54 +02:00 |
|
Uwe Steinmann
|
3a3a5c24ae
|
some minor corrections
|
2016-07-06 10:31:10 +02:00 |
|
Uwe Steinmann
|
2b17ffc207
|
add warning on top of form
|
2016-07-06 10:30:53 +02:00 |
|
Uwe Steinmann
|
79ae595b7d
|
add ImportFS to menu
|
2016-07-06 10:30:32 +02:00 |
|
Uwe Steinmann
|
6578621a3c
|
add phrase import_fs_warning
|
2016-07-06 10:28:55 +02:00 |
|
Uwe Steinmann
|
e4dce2f3fa
|
completed for 4.3.27
|
2016-07-06 09:23:51 +02:00 |
|
Uwe Steinmann
|
ccbe4291c6
|
add phrase invalid_dropfolder_folder
|
2016-07-06 09:23:06 +02:00 |
|
Uwe Steinmann
|
ea5425a669
|
fix error message if the import object is not a folder but a file
|
2016-07-06 09:06:09 +02:00 |
|
Uwe Steinmann
|
db53cc518a
|
check id dropfolder exists
do not show the form but a warning if the drop folder doesn't exist
|
2016-07-06 09:05:21 +02:00 |
|
Uwe Steinmann
|
32d69b61d8
|
if $showfolders is set, only folders are shown
|
2016-07-06 09:04:15 +02:00 |
|
Uwe Steinmann
|
f8a6b7e599
|
distinguish between files and folders in printDropFolderChooser()
if $showfolders is set, only folders will be shown
|
2016-07-06 09:03:14 +02:00 |
|
Uwe Steinmann
|
54c295276b
|
add note
|
2016-07-06 09:02:16 +02:00 |
|
Uwe Steinmann
|
4b0787147f
|
check if cache dir exists before deleting it
|
2016-07-06 09:00:56 +02:00 |
|
Uwe Steinmann
|
58182119db
|
add new key dropfolderdir_missing, add ro translation
|
2016-07-06 08:25:27 +02:00 |
|
Uwe Steinmann
|
e5f8144268
|
make all functions static
|
2016-07-05 17:31:25 +02:00 |
|
Uwe Steinmann
|
7dcee81c51
|
make all functions static
|
2016-07-05 17:29:58 +02:00 |
|
Uwe Steinmann
|
4196e11792
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2016-07-04 21:13:41 +02:00 |
|
Uwe Steinmann
|
9b21d8a509
|
new version 1.0.6
|
2016-07-04 20:52:33 +02:00 |
|
Uwe Steinmann
|
b6a0d5f60d
|
add note
|
2016-07-04 20:52:17 +02:00 |
|
Uwe Steinmann
|
f6f9ad8c6d
|
fix calculation of timeout
|
2016-07-04 20:51:40 +02:00 |
|
Uwe Steinmann
|
5bd85e50f6
|
fix calculation of timeout
|
2016-07-04 20:51:17 +02:00 |
|
Uwe Steinmann
|
d7898f972e
|
new version 4.3.27
|
2016-07-04 09:17:35 +02:00 |
|
Uwe Steinmann
|
4bc20da017
|
add entry for 4.3.27
|
2016-07-04 09:15:55 +02:00 |
|
Uwe Steinmann
|
30a264a16a
|
add note for 4.3.27
|
2016-07-04 09:14:46 +02:00 |
|
Uwe Steinmann
|
0afbcc73d8
|
fix some sql statements to work with mysql 5.7.5 (Closes: #273)
|
2016-07-04 09:11:50 +02:00 |
|
Uwe Steinmann
|
ec2d983bb4
|
various updates
|
2016-06-09 20:31:25 +02:00 |
|
Uwe Steinmann
|
45538b32ff
|
set 'orig_filename' get return value of getDocument()
|
2016-06-09 19:31:18 +02:00 |
|
Uwe Steinmann
|
97d471bce1
|
Merge branch 'seeddms-5.0.x' into develop
|
2016-05-30 20:45:00 +02:00 |
|
Uwe Steinmann
|
c472db2aad
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2016-05-30 20:44:49 +02:00 |
|
Uwe Steinmann
|
ba85d4d59c
|
add some translations
|
2016-05-30 20:44:31 +02:00 |
|
Uwe Steinmann
|
1544912dbc
|
fix access checking
|
2016-05-30 20:41:36 +02:00 |
|
Uwe Steinmann
|
21b053cd0d
|
propperly get enableAcknowledgeWorkflow and enableRevisionWorkflow
|
2016-05-30 20:34:29 +02:00 |
|
Uwe Steinmann
|
50a837a05d
|
check if $settings->_converters['preview'] is set
|
2016-05-30 20:34:14 +02:00 |
|
Uwe Steinmann
|
95b332586c
|
add initial roles
|
2016-05-30 20:24:49 +02:00 |
|
Uwe Steinmann
|
86d775ff84
|
Merge branch 'develop' into seeddms-5.1.x
|
2016-05-30 19:30:57 +02:00 |
|
Uwe Steinmann
|
de793abb7b
|
use SeedDMS_Core_Attribute->validate()
|
2016-05-30 19:26:19 +02:00 |
|
Uwe Steinmann
|
21c1d1b7b9
|
check for min values of attribute
|
2016-05-30 19:25:55 +02:00 |
|