pgAdmin 4 commit: Use Robocopy only to copy web directories, and XCOPY

2022-02-15 Thread Akshay Joshi 
Use Robocopy only to copy web directories, and XCOPY for all other operations.

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=d2efee594383a8eef3c3138657ba45aa4f056483

Modified Files
--
Make.bat | 20 +++-
1 file changed, 7 insertions(+), 13 deletions(-)

pgAdmin 4 commit: Rename the menu 'Disconnect Database' to 'Disconnect

2022-02-15 Thread Akshay Joshi 
Rename the menu 'Disconnect Database' to 'Disconnect from database'. Fixes #7180

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=677221cd9c91c5dce6aefc8ce522571a78892c9b

Modified Files
--
docs/en_US/release_notes_6_6.rst  | 1 +
.../browser/server_groups/servers/databases/static/js/database.js | 8 
2 files changed, 5 insertions(+), 4 deletions(-)

[PATCH] Change slash to backslash in make.bat

2022-02-15 Thread zhangj...@fujitsu.com 
Hi, all

In windows, backslash should be used in the path. 
In Linux, slash should be used in path.
But in pgadmin4\make.bat, slash is used in the path.

FOR /f "tokens=1 DELims=." %%G IN ('%PGADMIN_PYTHON_DIR%/python.exe -c 
"print('%APP_NAME%'.lower().replace(' ', ''))"') DO SET APP_SHORTNAME=%%G

FOR /f "tokens=1 DELims=." %%G IN ('%PGADMIN_PYTHON_DIR%/python.exe -c "import 
sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_MAJOR=%%G
FOR /f "tokens=2 DELims=." %%G IN ('%PGADMIN_PYTHON_DIR%/python.exe -c "import 
sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_MINOR=%%G
FOR /f "tokens=3 DELims=." %%G IN ('%PGADMIN_PYTHON_DIR%/python.exe -c "import 
sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_REVISION=%%G
--
Although the slash does not affect the compilation, I think it is better to 
modify it.

Here is a patch for make.bat.
Please review.

Best Regards!
Zhang Jie


make.patch
Description: make.patch

pgAdmin 4 commit: Added comments column for the functions collection no

2022-02-15 Thread Akshay Joshi 
Added comments column for the functions collection node. Fixes #7152

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5a8c916bc006af9edbea07ce52773385fcfb

Modified Files
--
docs/en_US/release_notes_6_6.rst| 1 +
.../servers/databases/schemas/functions/static/js/function.js   | 6 --
2 files changed, 5 insertions(+), 2 deletions(-)

[pgAdmin][Patch] Bug #6999 - A valid username that is not an email address will always flash warning "Email/Username is not valid"

2022-02-15 Thread Yogesh Mahajan 
Hi Team,

Attached patch fixes issue of warning shown while logging in with LDAP
authentication . Issue can be observed when authentication sources are
['internal','ldap']
Thanks,
Yogesh Mahajan
EnterpriseDB


RM_6999_v1.patch
Description: Binary data