Commit Graph

4351 Commits

Author SHA1 Message Date
Uwe Steinmann
13c3e15b4f Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-07-27 21:10:42 +02:00
Uwe Steinmann
6bebd3df5e Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-07-27 21:10:31 +02:00
Uwe Steinmann
f6c9b35def add entry for 4.3.28 2016-07-27 21:08:26 +02:00
Uwe Steinmann
953ccc1eb0 add expiration date to list of documents 2016-07-27 21:08:15 +02:00
Uwe Steinmann
8410ca9273 add spinner when initially loading content by ajax call 2016-07-27 21:02:49 +02:00
Uwe Steinmann
76e8d25f87 add style for sidebar 2016-07-27 21:02:30 +02:00
Uwe Steinmann
0434caa89a add side menu for selecting list 2016-07-27 21:02:02 +02:00
Uwe Steinmann
d167c565ce include Utils.php earlier 2016-07-27 08:57:51 +02:00
Uwe Steinmann
506e63f8d6 add fold marks 2016-07-27 08:29:52 +02:00
Uwe Steinmann
8a50145932 should not be in branch 5.1.x 2016-07-27 08:00:58 +02:00
Uwe Steinmann
53296bb330 add database changes for 5.2.0 2016-07-26 18:46:47 +02:00
Uwe Steinmann
b717e0bafd set version to 5.1.0 2016-07-19 11:08:03 +02:00
Uwe Steinmann
5f76b170b5 add '' as secret to insert into tblUsers statement 2016-07-19 08:01:14 +02:00
Uwe Steinmann
e384966172 fix errors in sql statements 2016-07-19 08:00:54 +02:00
Uwe Steinmann
b49790f48a Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-07-14 07:02:07 +02:00
Uwe Steinmann
11f6ddef13 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-07-14 07:01:55 +02:00
Uwe Steinmann
37b995d946 add phrases for 2-fact-auth, slovak, italien, polish updates 2016-07-14 07:00:45 +02:00
Uwe Steinmann
a964f20bdc fix migration sql statements
The changes still refer to the database used in mydms 1.7.2
2016-07-13 07:39:49 +02:00
Uwe Steinmann
9eb10d06b8 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-07-12 17:49:44 +02:00
Uwe Steinmann
fed863c26d Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-07-12 17:49:25 +02:00
Uwe Steinmann
f323d1cabf minor updates 2016-07-12 17:49:09 +02:00
Uwe Steinmann
65ec97c2ac show 2-fact-auth qrcode 2016-07-12 17:46:08 +02:00
Uwe Steinmann
4230df3c88 add input field for 2-fact-auth code 2016-07-12 17:44:56 +02:00
Uwe Steinmann
420586ea0a add out/out.Setup2Factor.php to menu 2016-07-12 17:43:51 +02:00
Uwe Steinmann
e68a7b82b3 pass enable2fact to view 2016-07-12 17:43:27 +02:00
Uwe Steinmann
b5b9a5eac3 check code from google authenticator 2016-07-12 17:42:39 +02:00
Uwe Steinmann
b8b1996fb4 redirekt to out/out.Setup2Auth.php if 2-fact-auth isn't setup
make sure user has not been substituted for setting up 2-fact-auth
or password change
2016-07-12 17:40:54 +02:00
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