lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2020-12-19 18:52:38 +01:00
commit 52b064a386
7 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
dev/namespacemig/README.md → dev/tools/test/namespacemig/README.md
View File

0
dev/namespacemig/aaa.class.php → dev/tools/test/namespacemig/aaa.class.php
View File

0
dev/namespacemig/bbb.class.php → dev/tools/test/namespacemig/bbb.class.php
View File

0
dev/namespacemig/bbb.php → dev/tools/test/namespacemig/bbb.php
View File

0
dev/namespacemig/main.inc.php → dev/tools/test/namespacemig/main.inc.php
View File

3
htdocs/install/fileconf.php
View File

@ -407,8 +407,7 @@ if (!empty($force_install_noedit)) {
<input type="password" <input type="password"
id="db_pass" autocomplete="off" id="db_pass" autocomplete="off"
name="db_pass" name="db_pass"
value=" value="<?php
<?php
// If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1. // If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1.
$autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*')); $autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*'));
if (!empty($dolibarr_main_prod)) { if (!empty($dolibarr_main_prod)) {

2
htdocs/langs/en_US/main.lang
View File

@ -86,7 +86,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
NbOfEntries=No. of entries NbOfEntries=No. of entries
GoToWikiHelpPage=Read online help (Internet access needed) GoToWikiHelpPage=Read online help (Internet access needed)
GoToHelpPage=Read help GoToHelpPage=Read help
DedicatedPageAvailable=This is a dedicated help page related to your current screen DedicatedPageAvailable=There is a dedicated help page related to your current screen
HomePage=Home Page HomePage=Home Page
RecordSaved=Record saved RecordSaved=Record saved
RecordDeleted=Record deleted RecordDeleted=Record deleted