Update message catalog and version for release.

While we're at it, fix the JSON handling in the maintenance/backup/restore routes.

.gitignore

@@ -41,4 +41,5 @@ web/regression/test_config.json
 node_modules/
 web/pgAdmin/static/js/generated
 web/pgadmin/static/js/generated
-web/yarn-error.log
+web/yarn-error.log
+/web/cacert.pem

Make.bat

@@ -1,399 +1,394 @@
-@ECHO off
-SETLOCAL
-
-SET WD=%CD%
-SET "PGBUILDPATH=%WD%\win-build"
-
-SET CMDOPTION=""
-IF "%1" == "clean"  SET CMDOPTION="VALID"
-IF "%1" == "x86"    SET CMDOPTION="VALID"
-
-IF NOT %CMDOPTION%=="VALID" (
-    GOTO USAGE
-)
-
-SET ARCHITECTURE=%1
-
-IF "%ARCHITECTURE%"=="clean" (
-    CALL :CLEAN
-    EXIT /B %ERRORLEVEL%
-)
-
-
-REM Main build sequence
-CALL :SET_ENVIRONMENT
-CALL :VALIDATE_ENVIRONMENT || EXIT /B 1
-CALL :CLEAN || EXIT /B 1
-CALL :CREATE_VIRTUAL_ENV || EXIT /B 1
-CALL :CREATE_RUNTIME_ENV || EXIT /B 1
-CALL :CREATE_PYTHON_ENV || EXIT /B 1
-CALL :CLEANUP_ENV || EXIT /B 1
-CALL :CREATE_INSTALLER || EXIT /B 1
-CALL :SIGN_INSTALLER || EXIT /B 1
-
-EXIT /B %ERRORLEVEL%
-REM Main build sequence Ends
-
-
-:CLEAN
-    ECHO Removing build directory...
-    IF EXIST "%PGBUILDPATH%" RD "%PGBUILDPATH%" /S /Q > nul || EXIT /B 1
-
-    ECHO Removing temp build directory...
-    IF EXIST "%WD%\pkg\win32\Output" rd "%WD%\pkg\win32\Output" /S /Q > nul || EXIT /B 1
-
-    ECHO Removing installer configuration script...
-    IF EXIST DEL /q "%WD%\pkg\win32\installer.iss" > nul || EXIT /B 1
-
-    EXIT /B 0
-
-
-:SET_ENVIRONMENT
-    ECHO Configuring the environment...
-    IF "%PYTHON_HOME%" == ""   SET "PYTHON_HOME=C:\Python27"
-    IF "%PYTHON_DLL%" == ""    SET "PYTHON_DLL=C:\Windows\SysWOW64\python27.dll"
-    IF "%QTDIR%" == ""         SET "QTDIR=C:\Qt\5.9.1\mingw53_32"
-    IF "%MAKE%" == ""          SET "MAKE=mingw32-make.exe"
-    IF "%PGDIR%" == ""         SET "PGDIR=C:\Program Files (x86)\PostgreSQL\10"
-    IF "%INNOTOOL%" == ""      SET "INNOTOOL=C:\Program Files (x86)\Inno Setup 5"
-    IF "%VCREDIST%" == ""      SET "VCREDIST=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\1033\vcredist_x86.exe"
-    IF "%SIGNTOOL%" == ""      SET "SIGNTOOL=C:\Program Files\Microsoft SDKs\Windows\v7.1A\Bin\signtool.exe"
-
-    REM Set VCREDISTNAME (the filename)
-    for /f "delims=" %%i in ("%VCREDIST%") do set "VCREDISTNAME=%%~nxi"
-
-    REM Set additional variables we need
-    SET "QMAKE=%QTDIR%\bin\qmake.exe"
-    FOR /F "tokens=4,5 delims=. " %%a IN ('%QMAKE% -v ^| findstr /B /C:"Using Qt version "') DO SET QT_VERSION=%%a.%%b
-
-    SET "VIRTUALENV=venv"
-    SET "TARGET_DIR=%WD%\dist"
-
-    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_RELEASE =" %WD%\web\config.py')    DO SET APP_MAJOR=%%a
-    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_REVISION =" %WD%\web\config.py')   DO SET APP_MINOR=%%a
-    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_SUFFIX =" %WD%\web\config.py')     DO SET APP_VERSION_SUFFIX=%%a
-    REM remove single quote from the string
-    SET APP_VERSION_SUFFIX=%APP_VERSION_SUFFIX:'=%
-    SET APP_NAME=""
-    FOR /F "tokens=2* DELims='" %%a IN ('findstr /C:"APP_NAME =" web\config.py')   DO SET APP_NAME=%%a
-    FOR /f "tokens=1 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "print('%APP_NAME%'.lower().replace(' ', ''))"') DO SET APP_SHORTNAME=%%G
-    SET APP_VERSION=%APP_MAJOR%.%APP_MINOR%
-    SET INSTALLERNAME=%APP_SHORTNAME%-%APP_MAJOR%.%APP_MINOR%-%APP_VERSION_SUFFIX%-%ARCHITECTURE%.exe
-    IF "%APP_VERSION_SUFFIX%" == "" SET INSTALLERNAME=%APP_SHORTNAME%-%APP_MAJOR%.%APP_MINOR%-%ARCHITECTURE%.exe
-
-    REM get Python version for the runtime build ex. 2.7.1 will be 27
-    FOR /f "tokens=1 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "import sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_MAJOR=%%G
-    FOR /f "tokens=2 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "import sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_MINOR=%%G
-    SET "PYTHON_VERSION=%PYTHON_MAJOR%%PYTHON_MINOR%"
-
-    EXIT /B 0
-
-
-:VALIDATE_ENVIRONMENT
-    ECHO ****************************************************************
-    ECHO                        S U M M A R Y
-    ECHO ****************************************************************
-    ECHO Build path:                %PGBUILDPATH%
-    ECHO Output directory:          %TARGET_DIR%
-    ECHO Installer name:            %INSTALLERNAME%
-    ECHO.
-    ECHO Python home:               %PYTHON_HOME%
-    ECHO Python DLL:                %PYTHON_DLL%
-    ECHO Python version:            %PYTHON_VERSION%
-    ECHO Python major version:      %PYTHON_MAJOR%
-    ECHO Python minor version:      %PYTHON_MINOR%
-    ECHO.
-    ECHO Qt home:                   %QTDIR%
-    ECHO qmake executable:          %QMAKE%
-    ECHO Qt version:                %QT_VERSION%
-    ECHO.
-    ECHO PostgreSQL home:           %PGDIR%
-    ECHO.
-    ECHO VC++ redistributable:      %VCREDIST%
-    ECHO VC++ redistributable file: %VCREDISTNAME%
-    ECHO.
-    ECHO innotool executable:       %INNOTOOL%
-    ECHO signtool executable:       %SIGNTOOL%
-    ECHO.
-    ECHO App major version:         %APP_MAJOR%
-    ECHO App minor version:         %APP_MINOR%
-    ECHO App version:               %APP_VERSION%
-    ECHO App version suffix:        %APP_VERSION_SUFFIX%
-    ECHO App short name:            %APP_SHORTNAME%
-    ECHO App name:                  %APP_NAME%
-    ECHO ****************************************************************
-
-    ECHO Checking the environment...
-    IF NOT EXIST "%INNOTOOL%" (
-        ECHO !INNOTOOL! does not exist
-        ECHO Please install Innotool and set the INNOTOOL environment variable.
-        EXIT /B 1
-    )
-
-    IF NOT EXIST "%VCREDIST%" (
-        ECHO !VCREDIST! does not exist
-        ECHO Please install Microsoft Visual studio and set the VCREDIST environment variable.
-        EXIT /B 1
-    )
-
-    IF NOT EXIST "%QTDIR%" (
-        ECHO !QTDIR! does not exist.
-        ECHO Please install Qt and set the QTDIR environment variable.
-        EXIT /B 1
-    )
-
-    IF NOT EXIST "%QMAKE%" (
-        ECHO !QMAKE! does not exist.
-        ECHO Please install Qt and set the QTDIR environment variable.
-        EXIT /B 1
-    )
-
-    IF NOT EXIST "%PYTHON_HOME%" (
-        ECHO !PYTHON_HOME! does not exist.
-        ECHO Please install Python and set the PYTHON_HOME environment variable.
-        EXIT /B 1
-    )
-
-    IF NOT EXIST "%PYTHON_DLL%" (
-        ECHO !PYTHON_DLL! does not exist.
-        ECHO Please install Python and set the PYTHON_DLL environment variable.
-        EXIT /B 1
-    )
-
-    IF NOT EXIST "%PGDIR%" (
-        ECHO !PGDIR! does not exist.
-        ECHO Please install PostgreSQL and set the PGDIR environment variable.
-        EXIT /B 1
-    )
-
-    IF NOT EXIST "%PYTHON_HOME%\Scripts\virtualenv.exe" (
-        ECHO !PYTHON_HOME!\Scripts\virtualenv.exe does not exist.
-        ECHO Please install the virtualenv package in Python.
-        EXIT /B 1
-    )
-
-    SET "PATH=%PGDIR%\bin;%PATH%"
-
-    EXIT /B 0
-
-
-:CREATE_VIRTUAL_ENV
-    ECHO Creating virtual environment...
-    IF NOT EXIST "%PGBUILDPATH%"  MKDIR "%PGBUILDPATH%"
-    
-    REM If we're using VC++, and this is Python 3.6+, we need a hack for PyCrypto
-    IF "%MAKE%" == "nmake" (
-        IF %PYTHON_VERSION% GEQ 36 SET CL=-FI"%VCINSTALLDIR%\INCLUDE\stdint.h"
-    )
-
-    CD "%PGBUILDPATH%"
-    "%PYTHON_HOME%\Scripts\virtualenv.exe" "%VIRTUALENV%"
-
-    ECHO Activating virtual environment -  %PGBUILDPATH%\%VIRTUALENV%...
-    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\activate" || EXIT /B 1
-
-    ECHO Installing dependencies...
-    CALL pip install -r "%WD%\requirements.txt" || EXIT /B 1
-    CALL pip install sphinx || EXIT /B 1
-
-    REM If we're using VC++, and this is Python 3.6+, we need to remove the hack
-    REM above or it will break qmake. Sigh.
-    IF "%MAKE%" == "nmake" (
-        IF %PYTHON_VERSION% GEQ 36 SET CL=
-    )
-
-    CD %WD%
-    EXIT /B 0
-
-
-:CREATE_RUNTIME_ENV
-    MKDIR "%PGBUILDPATH%\runtime"
-
-    CD "%WD%\web"
-
-    ECHO Installing javascript dependencies...
-    CALL yarn install || EXIT /B 1
-
-    ECHO Bundling javascript...
-    CALL yarn run bundle || EXIT /B 1
-
-    ECHO Removing webpack caches...
-    RD /Q /S "%WD%\web\pgadmin\static\js\generated\.cache" 1> nul 2>&1
-
-    ECHO Copying web directory...
-    XCOPY /S /I /E /H /Y "%WD%\web" "%PGBUILDPATH%\web" > nul || EXIT /B 1
-
-    ECHO Cleaning up unnecessary .pyc and .pyo files...
-    FOR /R "%PGBUILDPATH%\web" %%f in (*.pyc *.pyo) do DEL /q "%%f" 1> nul 2>&1
-    ECHO Removing tests, Python caches and node modules...
-    FOR /R "%PGBUILDPATH%\web" %%f in (tests feature_tests __pycache__ node_modules) do RD /Q /S "%%f" 1> nul 2>&1
-    ECHO Removing the test framework...
-    RD /Q /S "%PGBUILDPATH%\web\regression" 1> nul 2>&1
-    ECHO Removing tools...
-    RD /Q /S "%PGBUILDPATH%\web\tools" 1> nul 2>&1
-    ECHO Removing any existing configurations...
-    DEL /q "%PGBUILDPATH%\web\pgadmin4.db" 1> nul 2>&1
-    DEL /q "%PGBUILDPATH%\web\config_local.py" 1> nul 2>&1
-    
-    ECHO Creating config_distro.py
-    ECHO SERVER_MODE = False > "%PGBUILDPATH%\web\config_distro.py"
-    ECHO HELP_PATH = '../../../docs/en_US/html/' >> "%PGBUILDPATH%\web\config_distro.py"
-    ECHO DEFAULT_BINARY_PATHS = { >> "%PGBUILDPATH%\web\config_distro.py"
-    ECHO     'pg':   '$DIR/../runtime', >> "%PGBUILDPATH%\web\config_distro.py"
-    ECHO     'ppas': '' >> "%PGBUILDPATH%\web\config_distro.py"
-    ECHO } >> "%PGBUILDPATH%\web\config_distro.py"
-
-    ECHO Building docs...
-    MKDIR "%PGBUILDPATH%\docs\en_US\html"
-    CD "%WD%\docs\en_US"
-    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\python.exe" build_code_snippet.py || EXIT /B 1
-    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\sphinx-build.exe"   "%WD%\docs\en_US" "%PGBUILDPATH%\docs\en_US\html" || EXIT /B 1
-
-    ECHO Removing Sphinx
-    CALL pip uninstall -y sphinx Pygments alabaster colorama docutils imagesize requests snowballstemmer
-
-    IF %PYTHON_MAJOR% == 2 (
-        ECHO Fixing backports.csv for Python 2 by adding missing __init__.py
-        type nul >> "%PGBUILDPATH%\%VIRTUALENV%\Lib\site-packages\backports\__init__.py"
-    )
-    
-    IF %PYTHON_MAJOR% == 3 (
-        ECHO Fixing PyCrypto module for Python 3...
-        CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%PGBUILDPATH%\%VIRTUALENV%\Lib\site-packages\Crypto\Random\OSRNG\nt.py" "-o" "%PGBUILDPATH%\%VIRTUALENV%\Lib\site-packages\Crypto\Random\OSRNG\nt.py.new" "-s" "import winrandom" -r "from . import winrandom"
-        MOVE /Y "%PGBUILDPATH%\%VIRTUALENV%\Lib\site-packages\Crypto\Random\OSRNG\nt.py.new" "%PGBUILDPATH%\%VIRTUALENV%\Lib\site-packages\Crypto\Random\OSRNG\nt.py"
-    )
-
-    ECHO Assembling runtime environment...
-    CD "%WD%\runtime"
-
-    ECHO Running qmake...
-    CALL "%QMAKE%" || EXIT /B 1
-
-    ECHO Cleaning the build directory...
-    CALL %MAKE% clean || EXIT /B 1
-
-    ECHO Running make...
-    CALL %MAKE% || EXIT /B 1
-
-    ECHO Staging pgAdmin4.exe...
-    COPY "%WD%\runtime\release\pgAdmin4.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-
-    ECHO Staging Qt components...
-    COPY "%QTDIR%\bin\Qt5Core.dll"   "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    COPY "%QTDIR%\bin\Qt5Gui.dll"    "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    COPY "%QTDIR%\bin\Qt5Widgets.dll" "%PGBUILDPATH%\runtime" > nul  || EXIT /B 1
-    COPY "%QTDIR%\bin\Qt5Network.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    IF EXIST "%QTDIR%\bin\libgcc_s_dw2-1.dll" COPY "%QTDIR%\bin\libgcc_s_dw2-1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    IF EXIST "%QTDIR%\bin\libstdc++-6.dll" COPY "%QTDIR%\bin\libstdc++-6.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    IF EXIST "%QTDIR%\bin\libwinpthread-1.dll" COPY "%QTDIR%\bin\libwinpthread-1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    MKDIR "%PGBUILDPATH%\runtime\platforms" > nul || EXIT /B 1
-    COPY "%QTDIR%\plugins\platforms\qwindows.dll" "%PGBUILDPATH%\runtime\platforms" > nul || EXIT /B 1
-    ECHO [Paths] > "%PGBUILDPATH%\runtime\qt.conf"
-    ECHO Plugins=plugins >> "%PGBUILDPATH%\runtime\qt.conf"
-
-    ECHO Staging PostgreSQL components...
-    COPY "%PGDIR%\bin\libpq.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    COPY "%PGDIR%\bin\ssleay32.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    COPY "%PGDIR%\bin\libeay32.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    IF EXIST "%PGDIR%\bin\libintl-*.dll" COPY "%PGDIR%\bin\libintl-*.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    IF EXIST "%PGDIR%\bin\libiconv-*.dll" COPY "%PGDIR%\bin\libiconv-*.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    IF EXIST "%PGDIR%\bin\zlib.dll" COPY "%PGDIR%\bin\zlib.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    IF EXIST "%PGDIR%\bin\zlib1.dll" COPY "%PGDIR%\bin\zlib1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    COPY "%PGDIR%\bin\pg_dump.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    COPY "%PGDIR%\bin\pg_dumpall.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1L%
-    COPY "%PGDIR%\bin\pg_restore.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    COPY "%PGDIR%\bin\psql.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-
-    ECHO Staging VC++ runtime...
-    MKDIR "%PGBUILDPATH%\installer" || EXIT /B 1
-    COPY "%VCREDIST%" "%PGBUILDPATH%\installer" > nul || EXIT /B 1
-
-    CD %WD%
-    EXIT /B 0
-    
-
-:CREATE_PYTHON_ENV
-    ECHO Staging Python...
-    COPY %PYTHON_DLL% "%PGBUILDPATH%\runtime"  > nul || EXIT /B 1
-    COPY %PYTHON_HOME%\python.exe "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    COPY %PYTHON_HOME%\pythonw.exe "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-
-    XCOPY /S /I /E /H /Y "%PYTHON_HOME%\DLLs" "%PGBUILDPATH%\%VIRTUALENV%\DLLs" > nul || EXIT /B 1
-    XCOPY /S /I /E /H /Y "%PYTHON_HOME%\Lib" "%PGBUILDPATH%\%VIRTUALENV%\Lib" > nul || EXIT /B 1
-
-    ECHO Cleaning up unnecessary .pyc and .pyo files...
-    FOR /R "%PGBUILDPATH%\%VIRTUALENV%" %%f in (*.pyc *.pyo) do DEL /q "%%f" 1> nul 2>&1
-    ECHO Removing tests...
-    FOR /R "%PGBUILDPATH%\%VIRTUALENV%\Lib" %%f in (test tests) do RD /Q /S "%%f" 1> nul 2>&1
-    ECHO Removing TCL...
-    RD /Q /S "%PGBUILDPATH%\%VIRTUALENV%\tcl" 1> nul 2>&1
-
-    EXIT /B 0
-
-
-:CREATE_INSTALLER
-    ECHO Preparing for creation of windows installer...
-    IF NOT EXIST "%TARGET_DIR%" MKDIR "%TARGET_DIR%"
-
-    ECHO Copying icon file...
-    COPY "%WD%\pkg\win32\Resources\pgAdmin4.ico" "%PGBUILDPATH%" > nul || EXIT /B 1
-
-    CD "%WD%\pkg\win32"
-
-    ECHO Processing installer configuration script...
-    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in" "-o" "%WD%\pkg\win32\installer.iss.in_stage1" "-s" MYAPP_NAME -r """%APP_NAME%"""
-    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage1" "-o" "%WD%\pkg\win32\installer.iss.in_stage2" "-s" MYAPP_FULLVERSION -r """%APP_VERSION%"""
-    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage2" "-o" "%WD%\pkg\win32\installer.iss.in_stage3" "-s" MYAPP_VERSION -r """v%APP_MAJOR%"""
-
-    SET ARCMODE=
-    IF "%ARCHITECTURE%"=="amd64" (
-        set ARCMODE="x64"
-    )
-    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage3" "-o" "%WD%\pkg\win32\installer.iss.in_stage4" "-s" MYAPP_ARCHITECTURESMODE -r """%ARCMODE%"""
-    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage4" "-o" "%WD%\pkg\win32\installer.iss" "-s" MYAPP_VCDIST -r """%VCREDISTNAME%"""
-
-    ECHO Cleaning up...
-    DEL /s "%WD%\pkg\win32\installer.iss.in_stage*" > nul
-
-    ECHO Creating windows installer using INNO tool...
-    CALL "%INNOTOOL%\ISCC.exe" /q "%WD%\pkg\win32\installer.iss" || EXIT /B 1
-
-    ECHO Renaming installer...
-    MOVE "%WD%\pkg\win32\Output\Setup.exe" "%TARGET_DIR%\%INSTALLERNAME%" > nul || EXIT /B 1
-
-    ECHO Location - %TARGET_DIR%\%INSTALLERNAME%
-    ECHO Installer generated successfully.
-
-    CD %WD%
-    EXIT /B 0
-
-
-:SIGN_INSTALLER
-    ECHO Attempting to sign the installer...
-    CALL "%SIGNTOOL%" sign  /t http://timestamp.verisign.com/scripts/timstamp.dll "%TARGET_DIR%\%INSTALLERNAME%"
-    IF %ERRORLEVEL% NEQ 0 (
-        ECHO.
-        ECHO ************************************************************
-        ECHO * Failed to sign the installer
-        ECHO ************************************************************
-        PAUSE
-    )
-
-    EXIT /B 0
-
-
-:CLEANUP_ENV
-    ECHO Cleaning the build environment...
-    RD "%PGBUILDPATH%\%VIRTUALENV%\Include" /S /Q 1> nul 2>&1
-    DEL /s "%PGBUILDPATH%\%VIRTUALENV%\pip-selfcheck.json" 1> nul 2>&1
-
-    EXIT /B 0
-
-
-:USAGE
-    ECHO Invalid command line options.
-    ECHO Usage: "Make.bat <x86 | clean>"
-    ECHO.
-
-    EXIT /B 1
-
+@ECHO off
+SETLOCAL
+
+SET WD=%CD%
+SET "PGBUILDPATH=%WD%\win-build"
+
+SET CMDOPTION=""
+IF "%1" == "clean"  SET CMDOPTION="VALID"
+IF "%1" == "x86"    SET CMDOPTION="VALID"
+
+IF NOT %CMDOPTION%=="VALID" (
+    GOTO USAGE
+)
+
+SET ARCHITECTURE=%1
+
+IF "%ARCHITECTURE%"=="clean" (
+    CALL :CLEAN
+    EXIT /B %ERRORLEVEL%
+)
+
+
+REM Main build sequence
+CALL :SET_ENVIRONMENT
+CALL :VALIDATE_ENVIRONMENT || EXIT /B 1
+CALL :CLEAN || EXIT /B 1
+CALL :CREATE_VIRTUAL_ENV || EXIT /B 1
+CALL :CREATE_RUNTIME_ENV || EXIT /B 1
+CALL :CREATE_PYTHON_ENV || EXIT /B 1
+CALL :CLEANUP_ENV || EXIT /B 1
+CALL :CREATE_INSTALLER || EXIT /B 1
+CALL :SIGN_INSTALLER || EXIT /B 1
+
+EXIT /B %ERRORLEVEL%
+REM Main build sequence Ends
+
+
+:CLEAN
+    ECHO Removing build directory...
+    IF EXIST "%PGBUILDPATH%" RD "%PGBUILDPATH%" /S /Q > nul || EXIT /B 1
+
+    ECHO Removing temp build directory...
+    IF EXIST "%WD%\pkg\win32\Output" rd "%WD%\pkg\win32\Output" /S /Q > nul || EXIT /B 1
+
+    ECHO Removing installer configuration script...
+    IF EXIST DEL /q "%WD%\pkg\win32\installer.iss" > nul || EXIT /B 1
+
+    EXIT /B 0
+
+
+:SET_ENVIRONMENT
+    ECHO Configuring the environment...
+    IF "%PYTHON_HOME%" == ""   SET "PYTHON_HOME=C:\Python27"
+    IF "%PYTHON_DLL%" == ""    SET "PYTHON_DLL=C:\Windows\SysWOW64\python27.dll"
+    IF "%QTDIR%" == ""         SET "QTDIR=C:\Qt\5.9.1\mingw53_32"
+    IF "%MAKE%" == ""          SET "MAKE=mingw32-make.exe"
+    IF "%PGDIR%" == ""         SET "PGDIR=C:\Program Files (x86)\PostgreSQL\10"
+    IF "%INNOTOOL%" == ""      SET "INNOTOOL=C:\Program Files (x86)\Inno Setup 5"
+    IF "%VCREDIST%" == ""      SET "VCREDIST=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\1033\vcredist_x86.exe"
+    IF "%SIGNTOOL%" == ""      SET "SIGNTOOL=C:\Program Files\Microsoft SDKs\Windows\v7.1A\Bin\signtool.exe"
+
+    REM Set VCREDISTNAME (the filename)
+    for /f "delims=" %%i in ("%VCREDIST%") do set "VCREDISTNAME=%%~nxi"
+
+    REM Set additional variables we need
+    SET "QMAKE=%QTDIR%\bin\qmake.exe"
+    FOR /F "tokens=4,5 delims=. " %%a IN ('%QMAKE% -v ^| findstr /B /C:"Using Qt version "') DO SET QT_VERSION=%%a.%%b
+
+    SET "VIRTUALENV=venv"
+    SET "TARGET_DIR=%WD%\dist"
+
+    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_RELEASE =" %WD%\web\config.py')    DO SET APP_MAJOR=%%a
+    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_REVISION =" %WD%\web\config.py')   DO SET APP_MINOR=%%a
+    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_SUFFIX =" %WD%\web\config.py')     DO SET APP_VERSION_SUFFIX=%%a
+    REM remove single quote from the string
+    SET APP_VERSION_SUFFIX=%APP_VERSION_SUFFIX:'=%
+    SET APP_NAME=""
+    FOR /F "tokens=2* DELims='" %%a IN ('findstr /C:"APP_NAME =" web\config.py')   DO SET APP_NAME=%%a
+    FOR /f "tokens=1 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "print('%APP_NAME%'.lower().replace(' ', ''))"') DO SET APP_SHORTNAME=%%G
+    SET APP_VERSION=%APP_MAJOR%.%APP_MINOR%
+    SET INSTALLERNAME=%APP_SHORTNAME%-%APP_MAJOR%.%APP_MINOR%-%APP_VERSION_SUFFIX%-%ARCHITECTURE%.exe
+    IF "%APP_VERSION_SUFFIX%" == "" SET INSTALLERNAME=%APP_SHORTNAME%-%APP_MAJOR%.%APP_MINOR%-%ARCHITECTURE%.exe
+
+    REM get Python version for the runtime build ex. 2.7.1 will be 27
+    FOR /f "tokens=1 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "import sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_MAJOR=%%G
+    FOR /f "tokens=2 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "import sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_MINOR=%%G
+    SET "PYTHON_VERSION=%PYTHON_MAJOR%%PYTHON_MINOR%"
+
+    EXIT /B 0
+
+
+:VALIDATE_ENVIRONMENT
+    ECHO ****************************************************************
+    ECHO                        S U M M A R Y
+    ECHO ****************************************************************
+    ECHO Build path:                %PGBUILDPATH%
+    ECHO Output directory:          %TARGET_DIR%
+    ECHO Installer name:            %INSTALLERNAME%
+    ECHO.
+    ECHO Python home:               %PYTHON_HOME%
+    ECHO Python DLL:                %PYTHON_DLL%
+    ECHO Python version:            %PYTHON_VERSION%
+    ECHO Python major version:      %PYTHON_MAJOR%
+    ECHO Python minor version:      %PYTHON_MINOR%
+    ECHO.
+    ECHO Qt home:                   %QTDIR%
+    ECHO qmake executable:          %QMAKE%
+    ECHO Qt version:                %QT_VERSION%
+    ECHO.
+    ECHO PostgreSQL home:           %PGDIR%
+    ECHO.
+    ECHO VC++ redistributable:      %VCREDIST%
+    ECHO VC++ redistributable file: %VCREDISTNAME%
+    ECHO.
+    ECHO innotool executable:       %INNOTOOL%
+    ECHO signtool executable:       %SIGNTOOL%
+    ECHO.
+    ECHO App major version:         %APP_MAJOR%
+    ECHO App minor version:         %APP_MINOR%
+    ECHO App version:               %APP_VERSION%
+    ECHO App version suffix:        %APP_VERSION_SUFFIX%
+    ECHO App short name:            %APP_SHORTNAME%
+    ECHO App name:                  %APP_NAME%
+    ECHO ****************************************************************
+
+    ECHO Checking the environment...
+    IF NOT EXIST "%INNOTOOL%" (
+        ECHO !INNOTOOL! does not exist
+        ECHO Please install Innotool and set the INNOTOOL environment variable.
+        EXIT /B 1
+    )
+
+    IF NOT EXIST "%VCREDIST%" (
+        ECHO !VCREDIST! does not exist
+        ECHO Please install Microsoft Visual studio and set the VCREDIST environment variable.
+        EXIT /B 1
+    )
+
+    IF NOT EXIST "%QTDIR%" (
+        ECHO !QTDIR! does not exist.
+        ECHO Please install Qt and set the QTDIR environment variable.
+        EXIT /B 1
+    )
+
+    IF NOT EXIST "%QMAKE%" (
+        ECHO !QMAKE! does not exist.
+        ECHO Please install Qt and set the QTDIR environment variable.
+        EXIT /B 1
+    )
+
+    IF NOT EXIST "%PYTHON_HOME%" (
+        ECHO !PYTHON_HOME! does not exist.
+        ECHO Please install Python and set the PYTHON_HOME environment variable.
+        EXIT /B 1
+    )
+
+    IF NOT EXIST "%PYTHON_DLL%" (
+        ECHO !PYTHON_DLL! does not exist.
+        ECHO Please install Python and set the PYTHON_DLL environment variable.
+        EXIT /B 1
+    )
+
+    IF NOT EXIST "%PGDIR%" (
+        ECHO !PGDIR! does not exist.
+        ECHO Please install PostgreSQL and set the PGDIR environment variable.
+        EXIT /B 1
+    )
+
+    IF NOT EXIST "%PYTHON_HOME%\Scripts\virtualenv.exe" (
+        ECHO !PYTHON_HOME!\Scripts\virtualenv.exe does not exist.
+        ECHO Please install the virtualenv package in Python.
+        EXIT /B 1
+    )
+
+    SET "PATH=%PGDIR%\bin;%PATH%"
+
+    EXIT /B 0
+
+
+:CREATE_VIRTUAL_ENV
+    ECHO Creating virtual environment...
+    IF NOT EXIST "%PGBUILDPATH%"  MKDIR "%PGBUILDPATH%"
+    
+    REM If we're using VC++, and this is Python 3.6+, we need a hack for PyCrypto
+    IF "%MAKE%" == "nmake" (
+        IF %PYTHON_VERSION% GEQ 36 SET CL=-FI"%VCINSTALLDIR%\INCLUDE\stdint.h"
+    )
+
+    CD "%PGBUILDPATH%"
+    "%PYTHON_HOME%\Scripts\virtualenv.exe" "%VIRTUALENV%"
+
+    XCOPY /S /I /E /H /Y "%PYTHON_HOME%\DLLs" "%PGBUILDPATH%\%VIRTUALENV%\DLLs" > nul || EXIT /B 1
+    XCOPY /S /I /E /H /Y "%PYTHON_HOME%\Lib" "%PGBUILDPATH%\%VIRTUALENV%\Lib" > nul || EXIT /B 1
+
+    ECHO Activating virtual environment -  %PGBUILDPATH%\%VIRTUALENV%...
+    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\activate" || EXIT /B 1
+
+    ECHO Installing dependencies...
+    CALL pip install -r "%WD%\requirements.txt" || EXIT /B 1
+    CALL pip install sphinx || EXIT /B 1
+
+    REM If we're using VC++, and this is Python 3.6+, we need to remove the hack
+    REM above or it will break qmake. Sigh.
+    IF "%MAKE%" == "nmake" (
+        IF %PYTHON_VERSION% GEQ 36 SET CL=
+    )
+
+    CD %WD%
+    EXIT /B 0
+
+
+:CREATE_RUNTIME_ENV
+    MKDIR "%PGBUILDPATH%\runtime"
+
+    CD "%WD%\web"
+
+    ECHO Installing javascript dependencies...
+    CALL yarn install || EXIT /B 1
+
+    ECHO Bundling javascript...
+    CALL yarn run bundle || EXIT /B 1
+
+    ECHO Removing webpack caches...
+    RD /Q /S "%WD%\web\pgadmin\static\js\generated\.cache" 1> nul 2>&1
+
+    ECHO Copying web directory...
+    XCOPY /S /I /E /H /Y "%WD%\web" "%PGBUILDPATH%\web" > nul || EXIT /B 1
+
+    ECHO Cleaning up unnecessary .pyc and .pyo files...
+    FOR /R "%PGBUILDPATH%\web" %%f in (*.pyc *.pyo) do DEL /q "%%f" 1> nul 2>&1
+    ECHO Removing tests, Python caches and node modules...
+    FOR /R "%PGBUILDPATH%\web" %%f in (tests feature_tests __pycache__ node_modules) do RD /Q /S "%%f" 1> nul 2>&1
+    ECHO Removing the test framework...
+    RD /Q /S "%PGBUILDPATH%\web\regression" 1> nul 2>&1
+    ECHO Removing tools...
+    RD /Q /S "%PGBUILDPATH%\web\tools" 1> nul 2>&1
+    ECHO Removing any existing configurations...
+    DEL /q "%PGBUILDPATH%\web\pgadmin4.db" 1> nul 2>&1
+    DEL /q "%PGBUILDPATH%\web\config_local.py" 1> nul 2>&1
+    
+    ECHO Creating config_distro.py
+    ECHO SERVER_MODE = False > "%PGBUILDPATH%\web\config_distro.py"
+    ECHO HELP_PATH = '../../../docs/en_US/html/' >> "%PGBUILDPATH%\web\config_distro.py"
+    ECHO DEFAULT_BINARY_PATHS = { >> "%PGBUILDPATH%\web\config_distro.py"
+    ECHO     'pg':   '$DIR/../runtime', >> "%PGBUILDPATH%\web\config_distro.py"
+    ECHO     'ppas': '' >> "%PGBUILDPATH%\web\config_distro.py"
+    ECHO } >> "%PGBUILDPATH%\web\config_distro.py"
+
+    ECHO Building docs...
+    MKDIR "%PGBUILDPATH%\docs\en_US\html"
+    CD "%WD%\docs\en_US"
+    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\python.exe" build_code_snippet.py || EXIT /B 1
+    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\sphinx-build.exe"   "%WD%\docs\en_US" "%PGBUILDPATH%\docs\en_US\html" || EXIT /B 1
+
+    ECHO Removing Sphinx
+    CALL pip uninstall -y sphinx Pygments alabaster colorama docutils imagesize requests snowballstemmer
+
+    IF %PYTHON_MAJOR% == 3 (
+        ECHO Fixing PyCrypto module for Python 3...
+        CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%PGBUILDPATH%\%VIRTUALENV%\Lib\site-packages\Crypto\Random\OSRNG\nt.py" "-o" "%PGBUILDPATH%\%VIRTUALENV%\Lib\site-packages\Crypto\Random\OSRNG\nt.py.new" "-s" "import winrandom" -r "from . import winrandom"
+        MOVE /Y "%PGBUILDPATH%\%VIRTUALENV%\Lib\site-packages\Crypto\Random\OSRNG\nt.py.new" "%PGBUILDPATH%\%VIRTUALENV%\Lib\site-packages\Crypto\Random\OSRNG\nt.py"
+    )
+
+    ECHO Assembling runtime environment...
+    CD "%WD%\runtime"
+
+    ECHO Running qmake...
+    CALL "%QMAKE%" || EXIT /B 1
+
+    ECHO Cleaning the build directory...
+    CALL %MAKE% clean || EXIT /B 1
+
+    ECHO Running make...
+    CALL %MAKE% || EXIT /B 1
+
+    ECHO Staging pgAdmin4.exe...
+    COPY "%WD%\runtime\release\pgAdmin4.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+
+    ECHO Staging Qt components...
+    COPY "%QTDIR%\bin\Qt5Core.dll"   "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%QTDIR%\bin\Qt5Gui.dll"    "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%QTDIR%\bin\Qt5Widgets.dll" "%PGBUILDPATH%\runtime" > nul  || EXIT /B 1
+    COPY "%QTDIR%\bin\Qt5Network.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    IF EXIST "%QTDIR%\bin\libgcc_s_dw2-1.dll" COPY "%QTDIR%\bin\libgcc_s_dw2-1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    IF EXIST "%QTDIR%\bin\libstdc++-6.dll" COPY "%QTDIR%\bin\libstdc++-6.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    IF EXIST "%QTDIR%\bin\libwinpthread-1.dll" COPY "%QTDIR%\bin\libwinpthread-1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    MKDIR "%PGBUILDPATH%\runtime\platforms" > nul || EXIT /B 1
+    COPY "%QTDIR%\plugins\platforms\qwindows.dll" "%PGBUILDPATH%\runtime\platforms" > nul || EXIT /B 1
+    ECHO [Paths] > "%PGBUILDPATH%\runtime\qt.conf"
+    ECHO Plugins=plugins >> "%PGBUILDPATH%\runtime\qt.conf"
+
+    ECHO Staging PostgreSQL components...
+    COPY "%PGDIR%\bin\libpq.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGDIR%\bin\ssleay32.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGDIR%\bin\libeay32.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    IF EXIST "%PGDIR%\bin\libintl-*.dll" COPY "%PGDIR%\bin\libintl-*.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    IF EXIST "%PGDIR%\bin\libiconv-*.dll" COPY "%PGDIR%\bin\libiconv-*.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    IF EXIST "%PGDIR%\bin\zlib.dll" COPY "%PGDIR%\bin\zlib.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    IF EXIST "%PGDIR%\bin\zlib1.dll" COPY "%PGDIR%\bin\zlib1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGDIR%\bin\pg_dump.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGDIR%\bin\pg_dumpall.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1L%
+    COPY "%PGDIR%\bin\pg_restore.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGDIR%\bin\psql.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+
+    ECHO Staging VC++ runtime...
+    MKDIR "%PGBUILDPATH%\installer" || EXIT /B 1
+    COPY "%VCREDIST%" "%PGBUILDPATH%\installer" > nul || EXIT /B 1
+
+    CD %WD%
+    EXIT /B 0
+    
+
+:CREATE_PYTHON_ENV
+    ECHO Staging Python...
+    COPY %PYTHON_DLL% "%PGBUILDPATH%\runtime"  > nul || EXIT /B 1
+    COPY %PYTHON_HOME%\python.exe "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY %PYTHON_HOME%\pythonw.exe "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+
+    ECHO Cleaning up unnecessary .pyc and .pyo files...
+    FOR /R "%PGBUILDPATH%\%VIRTUALENV%" %%f in (*.pyc *.pyo) do DEL /q "%%f" 1> nul 2>&1
+    ECHO Removing tests...
+    FOR /R "%PGBUILDPATH%\%VIRTUALENV%\Lib" %%f in (test tests) do RD /Q /S "%%f" 1> nul 2>&1
+    ECHO Removing TCL...
+    RD /Q /S "%PGBUILDPATH%\%VIRTUALENV%\tcl" 1> nul 2>&1
+
+    EXIT /B 0
+
+
+:CREATE_INSTALLER
+    ECHO Preparing for creation of windows installer...
+    IF NOT EXIST "%TARGET_DIR%" MKDIR "%TARGET_DIR%"
+
+    ECHO Copying icon file...
+    COPY "%WD%\pkg\win32\Resources\pgAdmin4.ico" "%PGBUILDPATH%" > nul || EXIT /B 1
+
+    CD "%WD%\pkg\win32"
+
+    ECHO Processing installer configuration script...
+    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in" "-o" "%WD%\pkg\win32\installer.iss.in_stage1" "-s" MYAPP_NAME -r """%APP_NAME%"""
+    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage1" "-o" "%WD%\pkg\win32\installer.iss.in_stage2" "-s" MYAPP_FULLVERSION -r """%APP_VERSION%"""
+    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage2" "-o" "%WD%\pkg\win32\installer.iss.in_stage3" "-s" MYAPP_VERSION -r """v%APP_MAJOR%"""
+
+    SET ARCMODE=
+    IF "%ARCHITECTURE%"=="amd64" (
+        set ARCMODE="x64"
+    )
+    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage3" "-o" "%WD%\pkg\win32\installer.iss.in_stage4" "-s" MYAPP_ARCHITECTURESMODE -r """%ARCMODE%"""
+    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage4" "-o" "%WD%\pkg\win32\installer.iss" "-s" MYAPP_VCDIST -r """%VCREDISTNAME%"""
+
+    ECHO Cleaning up...
+    DEL /s "%WD%\pkg\win32\installer.iss.in_stage*" > nul
+
+    ECHO Creating windows installer using INNO tool...
+    CALL "%INNOTOOL%\ISCC.exe" /q "%WD%\pkg\win32\installer.iss" || EXIT /B 1
+
+    ECHO Renaming installer...
+    MOVE "%WD%\pkg\win32\Output\Setup.exe" "%TARGET_DIR%\%INSTALLERNAME%" > nul || EXIT /B 1
+
+    ECHO Location - %TARGET_DIR%\%INSTALLERNAME%
+    ECHO Installer generated successfully.
+
+    CD %WD%
+    EXIT /B 0
+
+
+:SIGN_INSTALLER
+    ECHO Attempting to sign the installer...
+    CALL "%SIGNTOOL%" sign  /t http://timestamp.verisign.com/scripts/timstamp.dll "%TARGET_DIR%\%INSTALLERNAME%"
+    IF %ERRORLEVEL% NEQ 0 (
+        ECHO.
+        ECHO ************************************************************
+        ECHO * Failed to sign the installer
+        ECHO ************************************************************
+        PAUSE
+    )
+
+    EXIT /B 0
+
+
+:CLEANUP_ENV
+    ECHO Cleaning the build environment...
+    RD "%PGBUILDPATH%\%VIRTUALENV%\Include" /S /Q 1> nul 2>&1
+    DEL /s "%PGBUILDPATH%\%VIRTUALENV%\pip-selfcheck.json" 1> nul 2>&1
+
+    EXIT /B 0
+
+
+:USAGE
+    ECHO Invalid command line options.
+    ECHO Usage: "Make.bat <x86 | clean>"
+    ECHO.
+
+    EXIT /B 1
+

Makefile

@@ -92,6 +92,8 @@ docs:
 docs-pdf:
 	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx latexpdf
 
+messages: msg-extract msg-update msg-compile
+
 msg-compile:
 	cd web && pybabel compile --statistics -d pgadmin/translations
 

README

@@ -27,7 +27,7 @@ Building the Runtime
 To build the runtime, the following packages must be installed:
 
 - QT 4.6 or above
-- Python 2.6, 2.7 or 3.3+ (2.7 only on Windows)
+- Python 2.7 or 3.4+
 
 Assuming both qmake and python-config are in the path:
 
@@ -88,7 +88,7 @@ Configuring the Python Environment
 ----------------------------------
 
 In order to run the Python code, a suitable runtime environment is required.
-Python versions - Python 2.6, 2.7 or 3.3+ are currently supported. It is
+Python versions - Python 2.7 or 3.4+ are currently supported. It is
 recommended that a Python Virtual Environment is setup for this purpose,
 rather than using the system Python environment. On Linux and Mac systems, the
 process is fairly simple - adapt as required for your distribution:

docs/en_US/backup_dialog.rst

@@ -58,13 +58,15 @@ Click the *Dump options* tab to continue. Use the box fields in the *Dump option
 
 * Move switches in the **Do not save** field box to select the objects that will not be included in the backup.
 
-   * Move the switch next to *Owner* to the *Yes* position to include commands that set object ownership.
+   * Move the switch next to *Owner* to the *Yes* position to exclude commands that set object ownership.
 
-   * Move the switch next to *Privilege* to the *Yes* position to include commands that create access privileges.
+   * Move the switch next to *Privilege* to the *Yes* position to exclude commands that create access privileges.
 
-   * Move the switch next to *Tablespace* to the *Yes* position to include tablespaces.
+   * Move the switch next to *Tablespace* to the *Yes* position to exclude tablespaces.
 
-   * Move the switch next to *Unlogged table data* to the *Yes* position to include the contents of unlogged tables.
+   * Move the switch next to *Unlogged table data* to the *Yes* position to exclude the contents of unlogged tables.
+
+   * Move the switch next to *Comments* to the *Yes* position to exclude commands that set the comments. **Note:** This option is visible only for database server greater than or equal to 11.
 
 .. image:: images/backup_queries.png
     :alt: Queries option on backup dialog
@@ -79,6 +81,8 @@ Click the *Dump options* tab to continue. Use the box fields in the *Dump option
 
    * Move the switch next to *Include DROP DATABASE statement* to the *Yes* position to include a command in the backup that will drop any existing database object with the same name before recreating the object during a backup.
 
+   * Move the switch next to *Load Via Partition Root* to the *Yes* position, so when dumping a COPY or INSERT statement for a partitioned table, target the root of the partitioning hierarchy which contains it rather than the partition itself. **Note:** This option is visible only for database server greater than or equal to 11.
+
 .. image:: images/backup_disable.png
     :alt: Disable option on backup dialog
 
@@ -109,6 +113,8 @@ When you’ve specified the details that will be incorporated into the pg_dump c
 .. image:: images/backup_messages.png
     :alt: Backup success notification popup
 
+Use the **Stop Process** button to stop the Backup process.
+
 If the backup is successful, a popup window will confirm success. Click *Click here for details* on the popup window to launch the *Process Watcher*. The *Process Watcher* logs all the activity associated with the backup and provides additional information for troubleshooting.
 
 .. image:: images/backup_process_watcher.png

docs/en_US/backup_globals_dialog.rst

@@ -24,6 +24,8 @@ Click the *Backup* button to build and execute a command based on your selection
 .. image:: images/backup_globals_messages.png
     :alt: Backup globals success notification popup
 
+Use the **Stop Process** button to stop the Backup process.
+
 If the backup is successful, a popup window will confirm success. Click *Click here for details* on the popup window to launch the *Process Watcher*. The *Process Watcher* logs all the activity associated with the backup and provides additional information for troubleshooting.
 
 .. image:: images/backup_globals_process_watcher.png

docs/en_US/backup_server_dialog.rst

@@ -12,18 +12,74 @@ Use the *Backup Server* dialog to create a plain-text script that will recreate
 Use the fields in the *General* tab to specify the following:
 
 * Enter the name of the backup file in the *Filename* field.  Optionally, select the *Browser* icon (ellipsis) to the right to navigate into a directory and select a file that will contain the archive.
+* Use the *Encoding* drop-down listbox to select the character encoding method that should be used for the archive. **Note:** This option is visible only for database server greater than or equal to 11.
 * Use the drop-down listbox next to *Role name* to specify a role with connection privileges on the selected server.  The role will be used for authentication during the backup.
 
-Move switches in the *Miscellaneous* box to specify the type of statements that should be included in the backup.
+.. image:: images/backup_server_objects.png
+    :alt: Type of objects option on backup server dialog
 
-* Move the *Verbose messages* switch to the *No* position to exclude status messages from the backup. The default is *Yes*.
-* Move the *Force double quote on identifiers* switch to the *Yes* position to name identifiers without changing case. The default is *No*.
+* Move switches in the **Type of objects** field box to specify details about the type of objects that will be backed up.
+
+   * Move the switch next to *Only data* to the *Yes* position to limit the back up to data.
+
+   * Move the switch next to *Only schema* to limit the back up to schema-level database objects.
+
+.. image:: images/backup_server_do_not_save.png
+    :alt: Do not save option on backup server dialog
+
+* Move switches in the **Do not save** field box to select the objects that will not be included in the backup.
+
+   * Move the switch next to *Owner* to the *Yes* position to exclude commands that set object ownership.
+
+   * Move the switch next to *Privilege* to the *Yes* position to exclude commands that create access privileges.
+
+   * Move the switch next to *Tablespace* to the *Yes* position to exclude tablespaces.
+
+   * Move the switch next to *Unlogged table data* to the *Yes* position to exclude the contents of unlogged tables.
+
+   * Move the switch next to *Comments* to the *Yes* position to exclude commands that set the comments. **Note:** This option is visible only for database server greater than or equal to 11.
+
+.. image:: images/backup_server_queries.png
+    :alt: Queries option on backup server dialog
+
+* Move switches in the **Queries** field box to specify the type of statements that should be included in the backup.
+
+   * Move the switch next to *Use Column Inserts* to the *Yes* position to dump the data in the form of INSERT statements and include explicit column names.  Please note: this may make restoration from backup slow.
+
+   * Move the switch next to *Use Insert commands* to the *Yes* position to dump the data in the form of INSERT statements rather than using a COPY command.  Please note: this may make restoration from backup slow.
+
+   * Move the switch next to *Include DROP DATABASE statement* to the *Yes* position to include a command in the backup that will drop any existing database object with the same name before recreating the object during a backup.
+
+
+.. image:: images/backup_server_disable.png
+    :alt: Disable option on backup server dialog
+
+* Move switches in the **Disable** field box to specify the type of statements that should be excluded from the backup.
+
+   * Move the switch next to *Trigger* (active when creating a data-only backup) to the *Yes* position to include commands that will disable triggers on the target table while the data is being loaded.
+
+   * Move the switch next to *$ quoting* to the *Yes* position to enable dollar quoting within function bodies; if disabled, the function body will be quoted using SQL standard string syntax.
+
+.. image:: images/backup_server_miscellaneous.png
+    :alt: Miscellaneous option on backup server dialog
+
+* Move switches in the **Miscellaneous** field box to specify miscellaneous backup options.
+
+   * Move the switch next to *With OIDs* to the *Yes* position to include object identifiers as part of the table data for each table.
+
+   * Move the switch next to *Verbose messages* to the *No* position to instruct *pg_dump* to exclude verbose messages.
+
+   * Move the switch next to *Force double quotes on identifiers* to the *Yes* position to force the quoting of all identifiers.
+
+   * Move the switch next to *Use SET SESSION AUTHORIZATION* to the *Yes* position to include a statement that will use a SET SESSION AUTHORIZATION command to determine object ownership (instead of an ALTER OWNER command).
 
 Click the *Backup* button to build and execute a command based on your selections; click the *Cancel* button to exit without saving work.
 
 .. image:: images/backup_server_messages.png
     :alt: Backup server success notification popup
 
+Use the **Stop Process** button to stop the Backup process.
+
 If the backup is successful, a popup window will confirm success. Click *Click here for details* on the popup window to launch the *Process Watcher*. The *Process Watcher* logs all the activity associated with the backup and provides additional information for troubleshooting.
 
 .. image:: images/backup_server_process_watcher.png

docs/en_US/clear_saved_passwords.rst

@@ -0,0 +1,19 @@
+.. _clear_saved_passwords:
+
+******************************
+`Clear Saved Passwords`:index:
+******************************
+
+Use *Clear Saved Password* functionality to clear the saved password for the database server.
+
+.. image:: images/clear_saved_password.png
+
+*Clear Saved Password* shows in the context menu for the selected server as well as under the *Object* menu on the top menu bar.
+
+Use *Clear SSH Tunnel Password* functionality to clear the saved password of SSH Tunnel to connect to the database server.
+
+.. image:: images/clear_tunnel_password.png
+
+*Clear SSH Tunnel Password* shows in the context menu for the selected server as well as under the *Object* menu on the top menu bar.
+
+**Note:** It will be enabled/visible when the password for the selected database server is already saved.

docs/en_US/code_review.rst

@@ -16,7 +16,7 @@ review process for any patches submitted for inclusion in pgAdmin.
   bulk updates every year). The start date should always be 2013, and the end year
   the current year, e.g.
 
-    Copyright (C) 2013 - 2018, The pgAdmin Development Team
+    Copyright (C) 2013 - 2019, The pgAdmin Development Team
  
 * Ensure there's a blank line immediately following any copyright headers.
 

docs/en_US/coding_standards.rst

@@ -170,7 +170,7 @@ with the required file header is shown below::
     #
     # pgAdmin 4 - PostgreSQL Tools
     #
-    # Copyright (C) 2013 - 2018, The pgAdmin Development Team
+    # Copyright (C) 2013 - 2019, The pgAdmin Development Team
     # This software is released under the PostgreSQL Licence
     #
     ##########################################################################

docs/en_US/connect_to_server.rst

@@ -14,6 +14,16 @@ Provide authentication information for the selected server:
  * Use the *Password* field to provide the password of the user that is associated with the defined server.
  * Check the box next to *Save Password* to instruct the server to save the password for future connections; if you save the password, you will not be prompted when reconnecting to the database server with this server definition.
 
+In case of SSH Tunneling, *Connect to Server* dialog will prompt for SSH Tunnel and Database server passwords if not already saved.
+
+.. image:: images/connect_to_tunneled_server.png
+    :alt: Connect to server dialog
+
+Provide authentication information for the selected server:
+
+ * Use the *Password* field to provide the password of the user that is associated with the defined server.
+ * Check the box next to respective *Save Password* to instruct the server to save the password for future connections; if you save the password, you will not be prompted when reconnecting to the database server with this server definition.
+
 The pgAdmin client displays a message in a green status bar in the lower right corner when the server connects successfully.
 
 If you receive an error message while attempting a connection, verify that your network is allowing the pgAdmin host and the host of the database server to communicate. For detailed information about a specific error message, please see the :ref:`Connection Error <connect_error>` help page.

docs/en_US/connecting.rst

@@ -4,7 +4,12 @@
 `Connecting to a Server`:index:
 *******************************
 
-Before you can use the pgAdmin client to manage the objects that reside on your Postgres server, you must define a connection to the server.  You can (optionally) use the *Server Group* dialog to create server groups to organize the server connections within the tree control for easier management. To open the *Server Group* dialog, right-click on the *Servers* node of the tree control, and select *Server Group* from the *Create* menu.
+Before you can use the pgAdmin client to manage the objects that reside on your
+Postgres server, you must define a connection to the server.  You can
+(optionally) use the *Server Group* dialog to create server groups to organize
+the server connections within the tree control for easier management. To open
+the *Server Group* dialog, right-click on the *Servers* node of the tree
+control, and select *Server Group* from the *Create* menu.
 
 Contents:
 
@@ -12,7 +17,10 @@ Contents:
 
    server_group_dialog
 
-Use the fields on the *Server* dialog to define the connection properties for each new server that you wish to manage with pgAdmin.  To open the *Server* dialog, right-click on the *Servers* node of the tree control, and select *Server* from the *Create* menu. 
+Use the fields on the *Server* dialog to define the connection properties for
+each new server that you wish to manage with pgAdmin.  To open the *Server*
+dialog, right-click on the *Servers* node of the tree control, and select
+*Server* from the *Create* menu.
 
 Contents:
 
@@ -20,11 +28,21 @@ Contents:
 
    server_dialog
 
-After defining a server connection, right-click on the server name, and select *Connect to server* to authenticate with the server, and start using pgAdmin to manage objects that reside on the server.
+After defining a server connection, right-click on the server name, and select
+*Connect to server* to authenticate with the server, and start using pgAdmin to
+manage objects that reside on the server.
 
 Contents:
 
 .. toctree::
 
    connect_to_server   
-   connect_error
+   connect_error
+
+Server definitions (and their groups) can be exported to a JSON file and
+re-imported to the same or a different system to enable easy pre-configuration
+of pgAdmin.
+
+.. toctree::
+
+   export_import_servers

docs/en_US/container_deployment.rst

@@ -0,0 +1,117 @@
+.. _container_deployment:
+
+**************************************
+`Container Deployment`:index:
+**************************************
+
+pgAdmin can be deployed in a container using the image at:
+
+    https://hub.docker.com/r/dpage/pgadmin4/
+
+Environment Variables
+*********************
+
+The container will accept the following variables at startup:
+
+*PGADMIN_DEFAULT_EMAIL*
+
+This is the email address used when setting up the initial administrator account
+to login to pgAdmin. This variable is required and must be set at launch time.
+
+*PGADMIN_DEFAULT_PASSWORD*
+
+This is the password used when setting up the initial administrator account to
+login to pgAdmin. This variable is required and must be set at launch time.
+
+*PGADMIN_ENABLE_TLS*
+
+Default: <null>
+
+If left un-set, the container will listen on port 80 for connections in plain
+text. If set to any value, the container will listen on port 443 for TLS
+connections.
+
+When TLS is enabled, a certificate and key must be provided. Typically these
+should be stored on the host file system and mounted from the container. The
+expected paths are /certs/server.crt and /certs/server.key
+
+*PGADMIN_LISTEN_PORT*
+
+Default: 80 or 443 (if TLS is enabled)
+
+Allows the port that the server listens on to be set to a specific value rather
+than using the default.
+
+*GUNICORN_THREADS*
+
+Default: 25
+
+Adjust the number of threads the Gunicorn server uses to handle incoming
+requests. This should typically be left as-is, except in highly loaded systems
+where it may be increased.
+
+Mapped Files and Directories
+****************************
+
+The following files or directories can be mapped from the container onto the
+host machine to allow configuration to be customised and shared between
+instances:
+
+*/var/lib/pgadmin*
+
+This is the working directory in which pgAdmin stores session data, user files,
+configuration files, and it's configuration database. Mapping this directory
+onto the host machine gives you an easy way to maintain configuration between
+
+invocations of the container.
+
+*/pgadmin4/config_local.py*
+
+This file can be used to override configuration settings in pgAdmin. Settings
+found in config.py can be overridden with deployment specific values if
+required.
+
+*/pgadmin4/servers.json*
+
+If this file is mapped, server definitions found in it will be loaded at launch
+time. This allows connection information to be pre-loaded into the instance of
+pgAdmin in the container.
+
+*/certs/server.cert*
+
+If TLS is enabled, this file will be used as the servers TLS certificate.
+
+*/certs/server.key*
+
+If TLS is enabled, this file will be used as the key file for the servers TLS
+certificate.
+
+Examples
+********
+
+Run a simple container over port 80:
+
+.. code-block:: bash
+
+    docker pull dpage/pgadmin4
+    docker run -p 80:80 \
+        -e "PGADMIN_DEFAULT_EMAIL=user@domain.com" \
+        -e "PGADMIN_DEFAULT_PASSWORD=SuperSecret" \
+        -d dpage/pgadmin4
+
+Run a TLS secured container using a shared config/storage directory in
+/private/var/lib/pgadmin on the host, and servers pre-loaded from
+/tmp/servers.json on the host:
+
+.. code-block:: bash
+
+    docker pull dpage/pgadmin4
+    docker run -p 443:443 \
+        -v "/private/var/lib/pgadmin:/var/lib/pgadmin" \
+        -v "/path/to/certificate.cert:/certs/server.cert" \
+        -v "/path/to/certificate.key:/certs/server.key" \
+        -v "/tmp/servers.json:/servers.json" \
+        -e "PGADMIN_DEFAULT_EMAIL=user@domain.com" \
+        -e "PGADMIN_DEFAULT_PASSWORD=SuperSecret" \
+        -e "PGADMIN_ENABLE_TLS=True" \
+        -d dpage/pgadmin4

docs/en_US/deployment.rst

@@ -4,7 +4,11 @@
 `pgAdmin Deployment`:index:
 ***************************
 
-Pre-compiled and configured installation packages for pgAdmin 4 are available for a number of desktop environments; we recommend using an installer whenever possible.  If you are interested in learning more about the project, or if a pgAdmin installer is not available for your environment, the pages listed below will provide detailed information about creating a custom deployment.  
+Pre-compiled and configured installation packages for pgAdmin 4 are available
+for a number of desktop environments; we recommend using an installer whenever
+possible.  If you are interested in learning more about the project, or if a
+pgAdmin installer is not available for your environment, the pages listed below
+will provide detailed information about creating a custom deployment.
 
 Contents:
 
@@ -12,4 +16,5 @@ Contents:
    :maxdepth: 2
    
    desktop_deployment
-   server_deployment
+   server_deployment
+   container_deployment

docs/en_US/desktop_deployment.rst

@@ -81,13 +81,10 @@ The configuration settings:
 +==========================+====================+===============================================================+
 | ApplicationPath          | String             | The directory containing pgAdmin4.py                          |
 +--------------------------+--------------------+---------------------------------------------------------------+
+| BrowserCommand           | String             | An alternate command to run instead of the default browser.   |
++--------------------------+--------------------+---------------------------------------------------------------+
 | ConnectionTimeout        | Integer            | The number of seconds to wait for application server startup. |
 +--------------------------+--------------------+---------------------------------------------------------------+
 | PythonPath               | String             | The Python module search path                                 |
 +--------------------------+--------------------+---------------------------------------------------------------+
-| Browser/Geometry         | Binary             | The runtime window's size/shape                               |
-+--------------------------+--------------------+---------------------------------------------------------------+
-| Browser/WindowState      | Binary             | The runtime window's state                                    |
-+--------------------------+--------------------+---------------------------------------------------------------+
-| Browser/Zoom             | String             | The runtime window's zoom level (zoom % / 100)                |
-+--------------------------+--------------------+---------------------------------------------------------------+
+

docs/en_US/editgrid.rst

@@ -38,7 +38,7 @@ Hover over an icon to display a tooltip that describes the icon's functionality.
 +----------------------+---------------------------------------------------------------------------------------------------+-------------+
 | *Paste Row*          | Click the *Paste Row* icon to paste the content that is currently on the clipboard.               |             |
 +----------------------+---------------------------------------------------------------------------------------------------+-------------+
-| *Delete Row*         | Use the *Delete Row* icon to add a new row in the output panel.                                   |             |
+| *Delete Row*         | Use the *Delete Row* icon to delete all the selected rows from the output panel.                  |             |
 +----------------------+---------------------------------------------------------------------------------------------------+-------------+
 | *Filter*             | Click the *Filter* icon to open a dialog that allows you to write and apply a filter for the      |             |
 |                      | content currently displayed in the output panel.  Click the down arrow to open the *Filter* drop- |             |
@@ -67,7 +67,7 @@ Hover over an icon to display a tooltip that describes the icon's functionality.
 +----------------------+---------------------------------------------------------------------------------------------------+-------------+
 | *Stop*               | Click the *Stop* icon to cancel the execution of the currently running query.                     |             |
 +----------------------+---------------------------------------------------------------------------------------------------+-------------+
-| *Clear query window* | Use the *Clear query window* drop-down menu to erase the contents of the *History* tab.           |             |
+| *Clear History*      | Use the *Clear History* drop-down menu to erase the contents of the *History* tab.                |             |
 +----------------------+---------------------------------------------------------------------------------------------------+-------------+
 | *Download as CSV*    | Click the *Download as CSV* icon to download the result set of the current query to a             | F8          |
 |                      | comma-separated list. You can control the CSV settings through                                    |             |
@@ -95,6 +95,28 @@ To delete a row, press the *Delete* toolbar button.  A popup will open, asking y
 
 To commit the changes to the server, select the *Save* toolbar button.  Modifications to a row are written to the server automatically when you select a different row.
 
+**Geometry Data Viewer**
+
+If PostGIS is installed, you can view GIS objects in a map by selecting row(s) and clicking the 'View Geometry' button in the column. If no rows are selected, the entire data set will be rendered:
+
+.. image:: images/geometry_viewer.png
+    :alt: Geometry Viewer Button
+
+You can adjust the layout by dragging the title of the panel. To view the properties of the geometries directly in map, just click the specific geometry:
+
+.. image:: images/geometry_viewer_property_table.png
+    :alt: Geometry Viewer Property Table
+
+Notes:
+
+- *Supported data types:* The Geometry Viewer supports 2D and 3DM geometries in EWKB format including `Point, LineString, Polygon MultiPoint, MultiLineString, MultiPolygon and GeometryCollection`.
+
+- *SRIDs:* If there are geometries with different SRIDs in the same column, the viewer will render geometries with the same SRID in the map. If SRID=4326 the OSM tile layer will be added into the map.
+
+- *Data size:* For performance reasons, the viewer will render no more than 100000 geometries, totaling up to 20MB.
+
+- *Internet access:* An internet connection is required for the Geometry Viewer to function correctly.
+
 **Sort/Filter options dialog**
 
 You can access *Sort/Filter options dialog* by clicking on Sort/Filter button. This allows you to specify an SQL Filter to limit the data displayed and data sorting options in the edit grid window:
@@ -120,4 +142,3 @@ To delete a row from the grid, click the trash icon.
 * Click the *Help* button (?) to access online help.
 * Click the *Ok* button to save work.
 * Click the *Close* button to discard current changes and close the dialog.
-

docs/en_US/exclusion_constraint_dialog.rst

@@ -48,6 +48,8 @@ Use the fields in the *Columns* tab to to specify the column(s) to which the con
 * Use the *NULLs order* column to specify the placement of NULL values (when sorted).  Specify *FIRST* or *LAST*.
 * Use the drop-down list next to *Operator* to specify a comparison or conditional operator.
 
+Use *Include columns* field to specify columns for *INCLUDE* clause of the constraint. This option is available in Postgres 11 and later.
+
 Click the *SQL* tab to continue.
 
 Your entries in the *Exclusion Constraint* dialog generate a SQL command (see an example below). Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command.

docs/en_US/export_import_servers.rst

@@ -0,0 +1,117 @@
+.. _export_import_servers:
+
+****************************************
+`Exporting and importing Servers`:index:
+****************************************
+
+Server definitions (and their groups) can be exported to a JSON file and
+re-imported to the same or a different system to enable easy pre-configuration
+of pgAdmin. The ``setup.py`` script is used for this purpose.
+
+.. note:: To export or import servers, you must use the Python interpreter that
+        is normally used to run pgAdmin to ensure that the required Python
+        packages are available. In most packages, this can be found in the
+        Python Virtual Environment that can be found in the installation
+        directory. When using platform-native packages, the system installation
+        of Python may be the one used by pgAdmin.
+
+**Exporting Servers**
+
+To export the servers defined in an installation, simply invoke ``setup.py`` with
+the ``--dump-servers`` command line option, followed by the name (and if required,
+path) to the desired output file. By default, servers owned by the desktop mode
+user will be dumped (pgadmin4@pgadmin.org by default - see the DESKTOP_USER
+setting in ``config.py``). This can be overridden with the ``--user`` command
+line option. For example:
+
+.. code-block:: bash
+
+    /path/to/python /path/to/setup.py --dump-servers output_file.json
+
+    # or, to specify a non-default user name:
+
+    /path/to/python /path/to/setup.py --dump-servers output_file.json --user user@example.com
+
+To export only certain servers, use the ``--servers`` option and list one or
+more server IDs. For example:
+
+.. code-block:: bash
+
+    /path/to/python /path/to/setup.py --dump-servers output_file.json --server 1 2 5
+
+**Importing Servers**
+
+To import the servers defined in a JSON file, simply invoke ``setup.py`` with
+the ``--load-servers`` command line option, followed by the name (and if required,
+path) of the JSON file containing the server definitions. Servers will be owned
+by the desktop mode user (pgadmin4@pgadmin.org by default - see the DESKTOP_USER
+setting in ``config.py``). This can be overridden with the ``--user`` command
+line option. For example:
+
+.. code-block:: bash
+
+    /path/to/python /path/to/setup.py --load-servers input_file.json
+
+    # or, to specify a non-default user name to own the new servers:
+
+    /path/to/python /path/to/setup.py --load-servers input_file.json --user user@example.com
+
+If any Servers are defined with a Server Group that is not already present in
+the configuration database, the required Group will be created.
+
+**JSON format**
+
+The JSON file format used when importing or exporting servers is quite
+straightforward and simply contains a list of servers, with a number of
+attributes. The following attributes are required to be present in every server
+definition: Name, Group, Port, Username, SSLMode, MaintenanceDB and one of Host,
+HostAddr or Service.
+
+Password fields cannot be imported or exported.
+
+The following example shows both a minimally defined and a fully defined server:
+
+.. code-block:: python
+
+    {
+        "Servers": {
+            "1": {
+                "Name": "Minimally Defined Server",
+                "Group": "Server Group 1",
+                "Port": 5432,
+                "Username": "postgres",
+                "Host": "localhost",
+                "SSLMode": "prefer",
+                "MaintenanceDB": "postgres"
+            },
+            "2": {
+                "Name: "Fully Defined Server",
+                "Group": "Server Group 2",
+                "Host": "host.domain.com",
+                "HostAddr": "192.168.1.2",
+                "Port": 5432,
+                "MaintenanceDB": "postgres",
+                "Username": "postgres",
+                "Role": "my_role_name",
+                "SSLMode": "require",
+                "Comment": "This server has every option configured in the JSON",
+                "DBRestriction": "live_db test_db",
+                "PassFile": "/path/to/pgpassfile",
+                "SSLCert": "/path/to/sslcert.crt",
+                "SSLKey": "/path/to/sslcert.key",
+                "SSLRootCert": "/path/to/sslroot.crt",
+                "SSLCrl": "/path/to/sslcrl.crl",
+                "SSLCompression": 1,
+                "BGColor": "#ff9900",
+                "FGColor": "#000000",
+                "Service": "postgresql-10",
+                "Timeout": 60,
+                "UseSSHTunnel": 1,
+                "TunnelHost": "192.168.1.253",
+                "TunnelPort": 22,
+                "TunnelUsername": "username",
+                "TunnelAuthentication": 0
+            }
+        }
+    }
+

docs/en_US/getting_started.rst

@@ -74,16 +74,12 @@ Contents:
 
    browser
    pgadmin_menu_bar
+   pgadmin_toolbar
    pgadmin_tabbed_browser
    pgadmin_tree_control
    preferences
    keyboard_shortcuts
 
 Before using pgAdmin to manage objects that reside on a server, you must define a
-connection to the server; for more information please see *Connecting to a Server*:
-
-Contents:
-
-.. toctree::
-
-   connecting
+connection to the server; for more information please see *Connecting to a Server*
+in the next section.

docs/en_US/import_export_data.rst

@@ -53,6 +53,8 @@ After completing the *Import/Export data* dialog, click the *OK* button to perfo
 .. image:: images/import_export_complete.png
     :alt: Import Export data completion notification
 
+Use the **Stop Process** button to stop the Import/Export process.
+
 Use the *Click here for details* link on the notification to open the *Process Watcher* and review detailed information about the execution of the command that performed the import or export:
 
 .. image:: images/import_export_pw.png

docs/en_US/index_dialog.rst

@@ -55,6 +55,8 @@ Use the context-sensitive fields in the *Columns* panel to specify which column(
 
 * Use the drop-down listbox in the *Collation* field to select a collation to use for the index.
 
+Use *Include columns* field to specify columns for *INCLUDE* clause of the index. This option is available in Postgres 11 and later.
+
 Click the *SQL* tab to continue.
 
 Your entries in the *Index* dialog generate a SQL command (see an example below). Use the *SQL* tab for review; revisit or switch tabs to make any changes to the SQL command.

docs/en_US/maintenance_dialog.rst

@@ -34,6 +34,8 @@ pgAdmin will inform you when the background process completes:
 .. image:: images/maintenance_complete.png
     :alt: Maintenance completion notification
 
+Use the **Stop Process** button to stop the Maintenance process.
+
 Use the *Click here for details* link on the notification to open the *Process Watcher* and review detailed information about the execution of the command that performed the import or export:
 
 .. image:: images/maintenance_pw.png

docs/en_US/pgadmin_menu_bar.rst

@@ -13,15 +13,13 @@ The pgAdmin menu bar provides drop-down menus for access to options, commands, a
 
 Use the *File* menu to access the following options:
 
-+----------------------+---------------------------------------------------------------------------------------------------------+
-| Option               | Action                                                                                                  |
-+======================+=========================================================================================================+
-| *Change Password...* | Click to open the :ref:`Change Password... <change_password_dialog>` dialog to change your password.    |
-+----------------------+---------------------------------------------------------------------------------------------------------+
-| *Preferences*        | Click to open the :ref:`Preferences <preferences>` dialog to to customize your pgAdmin settings.        |
-+----------------------+---------------------------------------------------------------------------------------------------------+
-| *Reset Layout*       | If you have modified the workspace, click to restore the default layout.                                |
-+----------------------+---------------------------------------------------------------------------------------------------------+
++-------------------------+---------------------------------------------------------------------------------------------------------+
+| Option                  | Action                                                                                                  |
++=========================+=========================================================================================================+
+| *Preferences*           | Click to open the :ref:`Preferences <preferences>` dialog to to customize your pgAdmin settings.        |
++-------------------------+---------------------------------------------------------------------------------------------------------+
+| *Reset Layout*          | If you have modified the workspace, click to restore the default layout.                                |
++-------------------------+---------------------------------------------------------------------------------------------------------+
 
 **The Object Menu**
 
@@ -30,33 +28,41 @@ Use the *File* menu to access the following options:
 
 The *Object* menu is context-sensitive. Use the *Object* menu to access the following options (in alphabetical order):
 
-+------------------------+--------------------------------------------------------------------------------------------------------------------------+
-| Option                 | Action                                                                                                                   |
-+========================+==========================================================================================================================+
-| *Connect Server...*    | Click to open the :ref:`Connect to Server <connect_to_server>` dialog to establish a connection with a server.           |
-+------------------------+--------------------------------------------------------------------------------------------------------------------------+
-| *Create*               | Click *Create* to access a context menu that provides context-sensitive selections.                                      |
-|                        | Your selection opens a *Create* dialog for creating a new object.                                                        |
-+------------------------+--------------------------------------------------------------------------------------------------------------------------+
-| *Delete/Drop*          | Click to delete the currently selected object from the server.                                                           |
-+------------------------+--------------------------------------------------------------------------------------------------------------------------+
-| *Disconnect Server...* | Click to refresh the currently selected object.                                                                          |
-+------------------------+--------------------------------------------------------------------------------------------------------------------------+
-| *Drop Cascade*         | Click to delete the currently selected object and all dependent objects from the server.                                 |
-+------------------------+--------------------------------------------------------------------------------------------------------------------------+
-| *Properties...*        | Click to review or modify the currently selected object's properties.                                                    |
-+------------------------+--------------------------------------------------------------------------------------------------------------------------+
-| *Refresh...*           | Click to refresh the currently selected object.                                                                          |
-+------------------------+--------------------------------------------------------------------------------------------------------------------------+
-| *Scripts*              | Click to open the :ref:`Query tool <query_tool>` to edit or view the selected script from the flyout menu.               |
-+------------------------+--------------------------------------------------------------------------------------------------------------------------+
-| *Trigger(s)*           | Click to *Disable* or *Enable* trigger(s) for the currently selected table. Options are displayed on the flyout menu.    |
-+------------------------+--------------------------------------------------------------------------------------------------------------------------+
-| *Truncate*             | Click to remove all rows from a table (*Truncate*) or to remove all rows from a table and its child tables               |
-|                        | (*Truncate Cascade*). Options are displayed on the flyout menu.                                                          |
-+------------------------+--------------------------------------------------------------------------------------------------------------------------+
-| *View Data*            | Click to access a context menu that provides several options for viewing data (see below).                               |
-+------------------------+--------------------------------------------------------------------------------------------------------------------------+
++-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
+| Option                      | Action                                                                                                                   |
++=============================+==========================================================================================================================+
+| *Change Password...*        | Click to open the :ref:`Change Password... <change_password_dialog>` dialog to change your password.                     |
++-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
+| *Clear Saved Password*      | If you have saved the database server password, click to clear the saved password.                                       |
+|                             | Enable only when password is already saved.                                                                              |
++-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
+| *Clear SSH Tunnel Password* | If you have saved the ssh tunnel password, click to clear the saved password.                                            |
+|                             | Enable only when password is already saved.                                                                              |
++-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
+| *Connect Server...*         | Click to open the :ref:`Connect to Server <connect_to_server>` dialog to establish a connection with a server.           |
++-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
+| *Create*                    | Click *Create* to access a context menu that provides context-sensitive selections.                                      |
+|                             | Your selection opens a *Create* dialog for creating a new object.                                                        |
++-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
+| *Delete/Drop*               | Click to delete the currently selected object from the server.                                                           |
++-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
+| *Disconnect Server...*      | Click to refresh the currently selected object.                                                                          |
++-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
+| *Drop Cascade*              | Click to delete the currently selected object and all dependent objects from the server.                                 |
++-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
+| *Properties...*             | Click to review or modify the currently selected object's properties.                                                    |
++-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
+| *Refresh...*                | Click to refresh the currently selected object.                                                                          |
++-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
+| *Scripts*                   | Click to open the :ref:`Query tool <query_tool>` to edit or view the selected script from the flyout menu.               |
++-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
+| *Trigger(s)*                | Click to *Disable* or *Enable* trigger(s) for the currently selected table. Options are displayed on the flyout menu.    |
++-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
+| *Truncate*                  | Click to remove all rows from a table (*Truncate*) or to remove all rows from a table and its child tables               |
+|                             | (*Truncate Cascade*). Options are displayed on the flyout menu.                                                          |
++-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
+| *View Data*                 | Click to access a context menu that provides several options for viewing data (see below).                               |
++-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
 
 **The Tools Menu**
 

docs/en_US/pgadmin_tabbed_browser.rst

@@ -31,11 +31,17 @@ You can use icons in the *Sessions* table to review or control the state of a se
 .. image:: images/main_properties_table.png
     :alt: Properties panel
 
-The *Properties* tab displays information about the object selected. Click the *Edit* icon in the toolbar under the browser tabs to launch the *Properties* dialog for the selected object.
+The *Properties* tab displays information about the object selected.
+
+Click the *Delete* icon in the toolbar under the browser tab to delete the selected objects in the Properties panel.
+
+Click the *Drop Cascade* icon in the toolbar under the browser tab to delete the selected objects and all dependent objects in the Properties panel.
 
 .. image:: images/main_properties_icons.png
     :alt: Object editor icon
 
+Click the *Edit* icon in the toolbar under the browser tabs to launch the *Properties* dialog for the selected object.
+
 To preserve any changes to the *Properties* dialog, click the *Save* icon; your modifications will be displayed in the updated *Properties* tab.
 
 .. image:: images/main_properties_edit.png
@@ -136,4 +142,4 @@ The *Dependents* tab displays a table of objects that depend on the object curre
 
 Additional tabs open when you access the extended functionality offered by pgAdmin tools (such as the Query tool, Debugger, or SQL editor). Use the close icon (X) located in the upper-right corner of each tab to close the tab when you are finished using the tool. Like permanent tabs, these tabs may be repositioned in the pgAdmin client window.
 
-By default, each time you open a tool, pgAdmin will open a new browser tab. You can control this behavior by modifying the *Display* node of the *Preferences* dialog for each tool. To open the *Preferences* dialog, select *Preferences* from the *File* menu.
+By default, each time you open a tool, pgAdmin will open a new browser tab. You can control this behavior by modifying the *Display* node of the *Preferences* dialog for each tool. To open the *Preferences* dialog, select *Preferences* from the *File* menu.

docs/en_US/pgadmin_toolbar.rst

@@ -0,0 +1,16 @@
+.. _pgadmin_toolbar:
+
+*************************
+`pgAdmin Toolbar`:index:
+*************************
+
+The pgAdmin toolbar provides shortcut buttons for frequently used features like View Data and the Query Tool
+which are most frequently used in pgAdmin.
+This toolbar is visible on the Browser panel. Buttons get enabled/disabled based on the selected browser node.
+
+.. image:: /images/pgadmin_toolbar.png
+    :alt: pgAdmin Toolbar
+
+* Use the :ref:`Query Tool <query_tool>` button to open the Query Tool in the current database context.
+* Use the :ref:`View Data <editgrid>` button to view/edit the data stored in a selected table.
+* Use the :ref:`Filtered Rows <editgrid>` button to access the Data Filter popup to apply a filter to a set of data for viewing/editing.

docs/en_US/preferences.rst

@@ -69,9 +69,13 @@ Use the fields on the *Graphs* panel to specify your display preferences for the
 .. image:: images/preferences_dashboard_display.png
     :alt: Preferences dialog dashboard display options
 
+* When the *Show activity?* switch is set to *True*, activity tables will be displayed on dashboards.
+
+* When the *Show graph data points?* switch is set to *True*, data points will be visible on graph lines.
+
 * When the *Show graphs?* switch is set to *True*, graphs will be displayed on dashboards.
 
-* When the *Show activity?* switch is set to *True*, activity tables will be displayed on dashboards.
+* When the *Show mouse hover tooltip?* switch is set to *True*, a tooltip will appear on mouse hover on the graph lines giving the data point details.
 
 
 **The Debugger Node**
@@ -123,9 +127,9 @@ Use the fields on the *Help* panel to specify the location of help files.
 
 Please note: the default help paths include the *VERSION* placeholder; the $VERSION$ placeholder will be replaced by the current database version.
 
-**The SQL Editor Node**
+**The Query Tool Node**
 
-Expand the *SQL Editor* node to access panels that allow you to specify your preferences for the SQL Editor tool.
+Expand the *Query Tool* node to access panels that allow you to specify your preferences for the Query Editor tool.
 
 .. image:: images/preferences_sql_auto_completion.png
     :alt: Preferences dialog sqleditor auto completion option
@@ -142,17 +146,18 @@ Use the fields on the *CSV Output* panel to control the CSV output.
 * Use the *CSV field separator* drop-down listbox to specify the separator character that will be used in CSV output.
 * Use the *CSV quote character* drop-down listbox to specify the quote character that will be used in CSV output.
 * Use the *CSV quoting* drop-down listbox to select the fields that will be quoted in the CSV output; select *Strings*, *All*, or *None*.
+* Use the *Replace null values with* option to replace null values with specified string in the output file. Default is set to 'NULL'.
 
 .. image:: images/preferences_sql_display.png
     :alt: Preferences dialog sqleditor display options
 
-Use the fields on the *Display* panel to specify your preferences for the SQL Editor display.
+Use the fields on the *Display* panel to specify your preferences for the Query Tool display.
 
-* When the *Connection status* switch is set to *True*, each new instance of the SQL Editor will display connection and transaction status.
+* When the *Connection status* switch is set to *True*, each new instance of the Query Tool will display connection and transaction status.
 
 * Use the *Connection status refresh rate* field to specify the number of seconds between connection/transaction status updates.
 
-* When the *Open in new browser tab* switch is set to *True*, each new instance of the SQL Editor will open in a new browser tab.
+* When the *Open in new browser tab* switch is set to *True*, each new instance of the Query Tool will open in a new browser tab.
 
 * Use the *Query info notifier timeout* field to control the behaviour of the notifier that is displayed when query execution completes. A value of *-1* will disable the notifier, and a value of 0 will display it until clicked. If a positive value above zero is specified, the notifier will be displayed for the specified number of seconds. The default is *5*.
 
@@ -203,7 +208,7 @@ Use the fields on the *Results grid* panel to specify your formatting preference
 * Use the *Result copy quote character* drop-down listbox to select the quote character for copied data.
 * Use the *Result copy quoting* drop-down listbox to select which type of fields require quoting; select *All*, *None*, or *Strings*.
 
-Use the fields on the *Keyboard shortcuts* panel to configure shortcuts for the sql editor window navigation:
+Use the fields on the *Keyboard shortcuts* panel to configure shortcuts for the query tool window navigation:
 
 .. image:: images/preferences_sql_keyboard_shortcuts.png
     :alt: Preferences dialog sql keyboard shortcuts section

docs/en_US/primary_key_dialog.rst

@@ -23,6 +23,7 @@ Click the *Definition* tab to continue.
 Use the fields in the *Definition* tab to define the primary key constraint:
 
 * Click inside the *Columns* field and select one or more column names from the drop-down listbox. To delete a selection, click the *x* to the left of the column name. The primary key constraint should be different from any unique constraint defined for the same table; the selected column(s) for the constraints must be distinct.
+* Use *Include columns* field to specify columns for *INCLUDE* clause of the index. This option is available in Postgres 11 and later.
 * Select the name of the tablespace in which the primary key constraint will reside from the drop-down listbox in the *Tablespace* field.
 * Select the name of an index from the drop-down listbox in the *Index* field. This field is optional. Adding a primary key will automatically create a unique B-tree index on the column or group of columns listed in the primary key, and will force the column(s) to be marked NOT NULL.
 * Use the *Fill Factor* field to specify a fill factor for the table and index. The fill factor for a table is a percentage between 10 and 100. 100 (complete packing) is the default.

docs/en_US/query_tool.rst

@@ -178,6 +178,9 @@ Use the *Explain* tab to view a graphical representation of a query:
 
 To generate a graphical explain diagram, open the *Explain* tab, and select *Explain*, *Explain Analyze*, or one or more options from the *Explain options* menu on the *Execute/Refresh* drop-down. Please note that *EXPLAIN VERBOSE* cannot be displayed graphically. Hover over an icon on the *Explain* tab to review information about that item; a popup window will display information about the selected object:
 
+Use the download button on top left corner of the *Explain* canvas to download the plan as an SVG file.
+**Note:** Download as SVG is not supported on Internet Explorer.
+
 .. image:: images/query_output_explain_details.png
     :alt: Query tool graphical explain plan
 

docs/en_US/release_notes.rst

@@ -9,6 +9,13 @@ for it.
 
 .. toctree::
 
+   release_notes_4_1
+   release_notes_4_0
+   release_notes_3_6
+   release_notes_3_5
+   release_notes_3_4
+   release_notes_3_3
+   release_notes_3_2
    release_notes_3_1
    release_notes_3_0
    release_notes_2_1

docs/en_US/release_notes_3_2.rst

@@ -0,0 +1,41 @@
+***********
+Version 3.2
+***********
+
+Release date: 2018-08-09
+
+This release contains a number of features and fixes reported since the release of pgAdmin4 3.1
+
+
+Features
+********
+
+| `Feature #2136 <https://redmine.postgresql.org/issues/2136>`_ - Added version number for URL's to ensure that files are only cached on a per-version basis.
+| `Feature #2214 <https://redmine.postgresql.org/issues/2214>`_ - Add support for SCRAM password changes (requires psycopg2 >= 2.8).
+| `Feature #3074 <https://redmine.postgresql.org/issues/3074>`_ - Add support for reset saved password.
+| `Feature #3397 <https://redmine.postgresql.org/issues/3397>`_ - Add support for Trigger and JIT stats in the graphical query plan viewer.
+| `Feature #3412 <https://redmine.postgresql.org/issues/3412>`_ - Add support for primary key, foreign key, unique key, indexes and triggers on partitioned tables for PG/EPAS 11.
+| `Feature #3506 <https://redmine.postgresql.org/issues/3506>`_ - Allow the user to specify a fixed port number in the runtime to aid cookie whitelisting etc.
+| `Feature #3510 <https://redmine.postgresql.org/issues/3510>`_ - Add a menu option to the runtime to copy the appserver URL to the clipboard.
+
+
+Bug fixes
+*********
+
+| `Bug #3185 <https://redmine.postgresql.org/issues/3185>`_ - Fix the upgrade check on macOS.
+| `Bug #3191 <https://redmine.postgresql.org/issues/3191>`_ - Fix a number of debugger execution issues.
+| `Bug #3294 <https://redmine.postgresql.org/issues/3294>`_ - Infrastructure (and changes to the Query Tool, Dashboards and Debugger) for realtime preference handling.
+| `Bug #3309 <https://redmine.postgresql.org/issues/3309>`_ - Fix Directory format support for backups.
+| `Bug #3316 <https://redmine.postgresql.org/issues/3316>`_ - Support running on systems without a system tray.
+| `Bug #3319 <https://redmine.postgresql.org/issues/3319>`_ - Cleanup and fix handling of Query Tool Cancel button status.
+| `Bug #3363 <https://redmine.postgresql.org/issues/3363>`_ - Fix restoring of restore options for sections.
+| `Bug #3371 <https://redmine.postgresql.org/issues/3371>`_ - Don't create a session when the /misc/ping test endpoint is called.
+| `Bug #3446 <https://redmine.postgresql.org/issues/3446>`_ - Various procedure/function related fixes for EPAS/PG 11.
+| `Bug #3448 <https://redmine.postgresql.org/issues/3448>`_ - Exclude system columns in Import/Export.
+| `Bug #3457 <https://redmine.postgresql.org/issues/3457>`_ - Fix debugging of procedures in EPAS packages.
+| `Bug #3458 <https://redmine.postgresql.org/issues/3458>`_ - pgAdmin4 should work with python 3.7.
+| `Bug #3468 <https://redmine.postgresql.org/issues/3468>`_ - Support SSH tunneling with keys that don't have a passphrase.
+| `Bug #3471 <https://redmine.postgresql.org/issues/3471>`_ - Ensure the SSH tunnel port number is honoured.
+| `Bug #3511 <https://redmine.postgresql.org/issues/3511>`_ - Add support to save and clear SSH Tunnel password.
+| `Bug #3526 <https://redmine.postgresql.org/issues/3526>`_ - COST statement should not be automatically duplicated after creating trigger function.
+| `Bug #3527 <https://redmine.postgresql.org/issues/3527>`_ - View Data->Filtered Rows dialog should be displayed.

docs/en_US/release_notes_3_3.rst

@@ -0,0 +1,37 @@
+***********
+Version 3.3
+***********
+
+Release date: 2018-09-06
+
+This release contains a number of features and fixes reported since the release of pgAdmin4 3.2
+
+
+Features
+********
+
+| `Feature #1407 <https://redmine.postgresql.org/issues/1407>`_ - Add a geometry viewer that can render PostGIS data on a blank canvas or various map sources.
+| `Feature #3503 <https://redmine.postgresql.org/issues/3503>`_ - Added new backup/restore options for PostgreSQL 11. Added dump options for 'pg_dumpall'.
+| `Feature #3553 <https://redmine.postgresql.org/issues/3553>`_ - Add a Spanish translation.
+
+Bug fixes
+*********
+
+| `Bug #3136 <https://redmine.postgresql.org/issues/3136>`_ - Stabilise feature tests for continuous running on CI systems.
+| `Bug #3191 <https://redmine.postgresql.org/issues/3191>`_ - Fixed debugger execution issues.
+| `Bug #3313 <https://redmine.postgresql.org/issues/3313>`_ - Ensure 'select all' and 'unselect all' working properly for pgAgent schedule.
+| `Bug #3325 <https://redmine.postgresql.org/issues/3325>`_ - Fix sort/filter dialog issue where it incorrectly requires ASC/DESC.
+| `Bug #3347 <https://redmine.postgresql.org/issues/3347>`_ - Ensure backup should work with '--data-only' and '--schema-only' for any format.
+| `Bug #3407 <https://redmine.postgresql.org/issues/3407>`_ - Fix keyboard shortcuts layout in the preferences panel.
+| `Bug #3420 <https://redmine.postgresql.org/issues/3420>`_ - Merge pgcli code with version 1.10.3, which is used for auto complete feature.
+| `Bug #3461 <https://redmine.postgresql.org/issues/3461>`_ - Ensure that refreshing a node also updates the Property list.
+| `Bug #3525 <https://redmine.postgresql.org/issues/3525>`_ - Ensure that refresh button on dashboard should refresh the table.
+| `Bug #3528 <https://redmine.postgresql.org/issues/3528>`_ - Handle connection errors properly in the query tool.
+| `Bug #3547 <https://redmine.postgresql.org/issues/3547>`_ - Make session implementation thread safe
+| `Bug #3548 <https://redmine.postgresql.org/issues/3548>`_ - Ensure external table node should be visible only for GPDB.
+| `Bug #3554 <https://redmine.postgresql.org/issues/3554>`_ - Fix auto scrolling issue in debugger on step in and step out.
+| `Bug #3558 <https://redmine.postgresql.org/issues/3558>`_ - Fix sort/filter dialog editing issue.
+| `Bug #3561 <https://redmine.postgresql.org/issues/3561>`_ - Ensure sort/filter dialog should display proper message after losing database connection.
+| `Bug #3578 <https://redmine.postgresql.org/issues/3578>`_ - Ensure sql for Role should be visible in SQL panel for GPDB.
+| `Bug #3579 <https://redmine.postgresql.org/issues/3579>`_ - When building the Windows installer, copy system Python packages before installing dependencies to ensure we don't end up with older versions than intended.
+| `Bug #3604 <https://redmine.postgresql.org/issues/3604>`_ - Correct the documentation of View/Edit data.

docs/en_US/release_notes_3_4.rst

@@ -0,0 +1,28 @@
+***********
+Version 3.4
+***********
+
+Release date: 2018-10-04
+
+This release contains a number of features and fixes reported since the release of pgAdmin4 3.3
+
+
+Features
+********
+
+| `Feature #2927 <https://redmine.postgresql.org/issues/2927>`_ - Move all CSS into SCSS files for consistency and ease of colour maintenance etc.
+| `Feature #3514 <https://redmine.postgresql.org/issues/3514>`_ - Add optional data point markers and mouse-over tooltips to display values on graphs.
+| `Feature #3564 <https://redmine.postgresql.org/issues/3564>`_ - Add shortcuts for View Data and the Query tool to the Browser header bar.
+
+Bug fixes
+*********
+
+| `Bug #3464 <https://redmine.postgresql.org/issues/3464>`_ - Ensure the runtime can startup properly if there are wide characters in the logfile path on Windows.
+| `Bug #3551 <https://redmine.postgresql.org/issues/3551>`_ - Fix handling of backslashes in the edit grid.
+| `Bug #3576 <https://redmine.postgresql.org/issues/3576>`_ - Ensure queries are no longer executed when dashboards are closed.
+| `Bug #3596 <https://redmine.postgresql.org/issues/3596>`_ - Fix support for the CLOB datatype in EPAS.
+| `Bug #3607 <https://redmine.postgresql.org/issues/3607>`_ - Fix logic around validation and highlighting of Sort/Filter in the Query Tool.
+| `Bug #3630 <https://redmine.postgresql.org/issues/3630>`_ - Ensure auto-complete works for objects in schemas other than public and pg_catalog.
+| `Bug #3657 <https://redmine.postgresql.org/issues/3657>`_ - Ensure changes to Query Tool settings from the Preferences dialogue are applied before executing queries.
+| `Bug #3658 <https://redmine.postgresql.org/issues/3658>`_ - Swap the Schema and Schemas icons and Catalog and Catalogs icons that had been used the wrong way around.
+

docs/en_US/release_notes_3_5.rst

@@ -0,0 +1,28 @@
+***********
+Version 3.5
+***********
+
+Release date: 2018-11-01
+
+This release contains a number of features and fixes reported since the release of pgAdmin4 3.4
+
+
+Features
+********
+
+| `Feature #1253 <https://redmine.postgresql.org/issues/1253>`_ - Save the treeview state periodically, and restore it automatically when reconnecting.
+| `Feature #3562 <https://redmine.postgresql.org/issues/3562>`_ - Migrate from Bootstrap 3 to Bootstrap 4.
+
+
+Bug fixes
+*********
+
+| `Bug #3232 <https://redmine.postgresql.org/issues/3232>`_ - Ensure that Utilities(Backup/Restore/Maintenence/Import-Export) should not be started if binary path is wrong and also added 'Stop Process' button to cancel the process.
+| `Bug #3638 <https://redmine.postgresql.org/issues/3638>`_ - Fix syntax error when creating new pgAgent schedules with a start date/time and exception.
+| `Bug #3674 <https://redmine.postgresql.org/issues/3674>`_ - Cleanup session files periodically.
+| `Bug #3660 <https://redmine.postgresql.org/issues/3660>`_ - Rename the 'SQL Editor' section of the Preferences to 'Query Tool' as it applies to the whole tool, not just the editor.
+| `Bug #3676 <https://redmine.postgresql.org/issues/3676>`_ - Fix CREATE Script functionality for EDB-Wrapped functions.
+| `Bug #3700 <https://redmine.postgresql.org/issues/3700>`_ - Fix connection garbage collector.
+| `Bug #3703 <https://redmine.postgresql.org/issues/3703>`_ - Purge connections from the cache on logout.
+| `Bug #3722 <https://redmine.postgresql.org/issues/3722>`_ - Ensure that utility existence check should work for schema and other child objects while taking Backup/Restore.
+| `Bug #3730 <https://redmine.postgresql.org/issues/3730>`_ - Fixed fatal error while launching the pgAdmin4 3.5. Update the version of the Flask to 0.12.4 for release.

docs/en_US/release_notes_3_6.rst

@@ -0,0 +1,27 @@
+***********
+Version 3.6
+***********
+
+Release date: 2018-11-29
+
+This release contains a number of features and fixes reported since the release of pgAdmin4 3.5
+
+
+Features
+********
+
+| `Feature #1513 <https://redmine.postgresql.org/issues/1513>`_ - Add support for dropping multiple objects at once from the collection Properties panel.
+| `Feature #3772 <https://redmine.postgresql.org/issues/3772>`_ - Add the ability to import and export server definitions from a config database.
+
+
+Bug fixes
+*********
+
+| `Bug #3016 <https://redmine.postgresql.org/issues/3016>`_ - Ensure previous notices are not removed from the Messages tab in the Query Tool if an error occurs during query execution.
+| `Bug #3029 <https://redmine.postgresql.org/issues/3029>`_ - Allow the selection order to be preserved in the Select2 control to fix column ordering in data Import/Export.
+| `Bug #3629 <https://redmine.postgresql.org/issues/3629>`_ - Allow use of 0 (integer) and empty strings as parameters in the debugger.
+| `Bug #3723 <https://redmine.postgresql.org/issues/3723>`_ - Properly report errors when debugging cannot be started.
+| `Bug #3734 <https://redmine.postgresql.org/issues/3734>`_ - Prevent the debugger controls being pressed again before previous processing is complete.
+| `Bug #3736 <https://redmine.postgresql.org/issues/3736>`_ - Fix toggle breakpoints buttons in the debugger.
+| `Bug #3742 <https://redmine.postgresql.org/issues/3742>`_ - Fix changes to the NOT NULL and default value options in the Table Dialogue.
+| `Bug #3746 <https://redmine.postgresql.org/issues/3746>`_ - Fix dropping of multiple functions/procedures at once.

docs/en_US/release_notes_4_0.rst

@@ -0,0 +1,42 @@
+***********
+Version 4.0
+***********
+
+Release date: 2019-01-10
+
+This release contains a number of features and fixes reported since the release of pgAdmin4 3.6
+
+
+Features
+********
+
+| `Feature #3589 <https://redmine.postgresql.org/issues/3589>`_ - Allow query plans to be downloaded as an SVG file.
+| `Feature #3692 <https://redmine.postgresql.org/issues/3692>`_ - New UI design.
+| `Feature #3801 <https://redmine.postgresql.org/issues/3801>`_ - Allow servers to be pre-loaded into container deployments.
+
+Bug fixes
+*********
+
+| `Bug #3083 <https://redmine.postgresql.org/issues/3083>`_ - Increase the size of the resize handle of the edit grid text pop-out.
+| `Bug #3354 <https://redmine.postgresql.org/issues/3354>`_ - Fix handling of array types as inputs to the debugger.
+| `Bug #3433 <https://redmine.postgresql.org/issues/3433>`_ - Fix an issue that could cause the Query Tool to fail to render.
+| `Bug #3549 <https://redmine.postgresql.org/issues/3549>`_ - Display event trigger functions correctly on EPAS.
+| `Bug #3559 <https://redmine.postgresql.org/issues/3559>`_ - Further improvements to treeview restoration.
+| `Bug #3599 <https://redmine.postgresql.org/issues/3599>`_ - Run Postfix in the container build so passwords can be reset etc.
+| `Bug #3619 <https://redmine.postgresql.org/issues/3619>`_ - Add titles to the code areas of the Query Tool and Debugger to ensure that panels can be re-docked within them.
+| `Bug #3679 <https://redmine.postgresql.org/issues/3679>`_ - Fix a webpack issue that could cause the Query Tool to fail to render.
+| `Bug #3702 <https://redmine.postgresql.org/issues/3702>`_ - Ensure we display the relation name (and not the OID) in the locks table wherever possible.
+| `Bug #3711 <https://redmine.postgresql.org/issues/3711>`_ - Fix an encoding issue in the query tool.
+| `Bug #3726 <https://redmine.postgresql.org/issues/3726>`_ - Include the WHERE clause on EXCLUDE constraints in RE-SQL.
+| `Bug #3753 <https://redmine.postgresql.org/issues/3753>`_ - Fix an issue when user define Cast from smallint->text is created.
+| `Bug #3757 <https://redmine.postgresql.org/issues/3757>`_ - Hide Radio buttons that should not be shown on the maintenance dialogue.
+| `Bug #3780 <https://redmine.postgresql.org/issues/3780>`_ - Ensure that null values handled properly in CSV download.
+| `Bug #3796 <https://redmine.postgresql.org/issues/3796>`_ - Tweak the wording on the Grant Wizard.
+| `Bug #3797 <https://redmine.postgresql.org/issues/3797>`_ - Prevent attempts to bulk-drop schema objects.
+| `Bug #3798 <https://redmine.postgresql.org/issues/3798>`_ - Ensure the browser toolbar buttons work in languages other than English.
+| `Bug #3805 <https://redmine.postgresql.org/issues/3805>`_ - Allow horizontal sizing of the edit grid text pop-out.
+| `Bug #3809 <https://redmine.postgresql.org/issues/3809>`_ - Ensure auto complete should works when first identifier in the FROM clause needs quoting.
+| `Bug #3810 <https://redmine.postgresql.org/issues/3810>`_ - Ensure auto complete should works for columns from a schema-qualified table.
+| `Bug #3821 <https://redmine.postgresql.org/issues/3821>`_ - Ensure identifiers are properly displayed in the plan viewer.
+| `Bug #3830 <https://redmine.postgresql.org/issues/3830>`_ - Make the setup process more robust against aborted executions.
+| `Bug #3856 <https://redmine.postgresql.org/issues/3856>`_ - Fixed an issue while creating export job.

docs/en_US/release_notes_4_1.rst

@@ -0,0 +1,23 @@
+***********
+Version 4.1
+***********
+
+Release date: 2019-01-15
+
+This release contains a number of features and fixes reported since the release of pgAdmin4 4.0
+
+
+Features
+********
+
+
+Bug fixes
+*********
+
+| `Bug #3505 <https://redmine.postgresql.org/issues/3505>`_ - Fix SQL generated for tables with inherited columns.
+| `Bug #3575 <https://redmine.postgresql.org/issues/3575>`_ - Ensure the context menu works after a server is renamed.
+| `Bug #3836 <https://redmine.postgresql.org/issues/3836>`_ - Fix ordering of VACUUM options which changed in PG11.
+| `Bug #3842 <https://redmine.postgresql.org/issues/3842>`_ - Don't show system catalogs in the schemas property list unless show system objects is enabled.
+| `Bug #3861 <https://redmine.postgresql.org/issues/3861>`_ - Fix help for the backup/restore dialogues.
+| `Bug #3866 <https://redmine.postgresql.org/issues/3866>`_ - Ensure that last row of table data should be visible and user will be able to add new row.
+| `Bug #3877 <https://redmine.postgresql.org/issues/3877>`_ - Make the browser more robust in the face of multibyte characters in SQL_ASCII databases.

docs/en_US/restore_dialog.rst

@@ -49,6 +49,8 @@ Click the *Restore options* tab to continue. Use the fields on the *Restore opti
    * Move the switch next to *Owner* to the *Yes* position to exclude commands that set object ownership.
    * Move the switch next to *Privilege* to the *Yes* position to exclude commands that create access privileges.
    * Move the switch next to *Tablespace* to the *Yes* position to exclude tablespaces.
+   * Move the switch next to *Comments* to the *Yes* position to exclude commands that set the comments. **Note:** This option is visible only for database server greater than or equal to 11.
+
 
 .. image:: images/restore_queries.png
     :alt: Restore dialog queries section
@@ -82,6 +84,8 @@ When you’ve specified the details that will be incorporated into the pg_restor
 .. image:: images/restore_messages.png
     :alt: Restore dialog notifications
 
+Use the **Stop Process** button to stop the Restore process.
+
 Click *Click here for details* on the popup to launch the *Process Watcher*. The *Process Watcher* logs all the activity associated with the restore, and provides additional information for troubleshooting should the restore command encounter problems.
 
 .. image:: images/restore_process_watcher.png

docs/en_US/server_deployment.rst

@@ -134,7 +134,7 @@ below which will activate Python virtual environment when Apache server runs.
 .. code-block:: python
 
     activate_this = 'C:\Program Files\pgAdmin4\venv\Scripts\activate_this.py'
-    execfile(activate_this, dict(__file__=activate_this))
+    exec(open(activate_this).read())
 
 **Note:** The changes made in ``pgAdmin4.wsgi`` file will revert when pgAdmin4 is either upgraded or downgraded.
     

docs/en_US/server_dialog.rst

@@ -30,7 +30,7 @@ Use the fields in the *Connection* tab to configure a connection:
 * Use the *Maintenance database* field to specify the name of the initial database to which the client will connect. If you will be using pgAgent or adminpack objects, the pgAgent schema and adminpack objects should be installed on that database.
 * Use the *Username* field to specify the name of a role that will be used when authenticating with the server.
 * Use the *Password* field to provide a password that will be supplied when authenticating with the server.
-* Check the box next to *Save password?* to instruct pgAdmin to save the password for future use.
+* Check the box next to *Save password?* to instruct pgAdmin to save the password for future use. Use :ref:`Clear Saved Password <clear_saved_passwords>` to remove the saved password.
 * Use the *Role* field to specify the name of a role that has privileges that will be conveyed to the client after authentication with the server. This selection allows you to connect as one role, and then assume the permissions of this specified role after the connection is established. Note that the connecting role must be a member of the role specified.
 * Use the *Service* field to specify the service name. For more information, see `Section 33.16 of the Postgres documentation <https://www.postgresql.org/docs/10/static/libpq-pgservice.html>`_.
 
@@ -73,7 +73,9 @@ not be able to connect directly.
    *  Select the *Password* option to specify that pgAdmin will use a password for authentication to the SSH host. This is the default.
    *  Select the *Identity file* to specify that pgAdmin will use a private key file when connecting.
 * If the SSH host is expecting a private key file for authentication, use the *Identity file* field to specify the location of the key file.
-* If the SSH host is expecting a password, use the *Password/Passphrase* field to specify the password, or if an identity file is being used, the passphrase.
+* If the SSH host is expecting a password of the user name or an identity file if being used, use the *Password* field to specify the password.
+* Check the box next to *Save password?* to instruct pgAdmin to save the password for future use. Use :ref:`Clear SSH Tunnel Password <clear_saved_passwords>` to remove the saved password.
+
 
 Click the *Advanced* tab to continue.
 
@@ -92,3 +94,7 @@ Use the fields in the *Advanced* tab to configure a connection:
 * Click the *Save* button to save your work.
 * Click the *Cancel* button to exit without saving your work.
 * Click the *Reset* button to return the values specified on the Server dialog to their original condition.
+
+.. toctree::
+
+    clear_saved_passwords

docs/en_US/table_dialog.rst

@@ -256,6 +256,31 @@ Use the fields in the **Like** box to specify which attributes of an existing ta
 * Move the *With storage?* switch to the *Yes* position to copy storage settings.
 * Move the *With comments?* switch to the *Yes* position to copy comments.
 
+With PostgreSQL 10 forward, the *Partition* tab will be visible.
+
+Click the *Partition* tab to continue.
+
+.. image:: images/table_partition.png
+    :alt: Table dialog partition tab
+
+Use the fields in the *partition* tab to create the partitions for the table:
+
+* Select a partition type from the *Partition Type* selection box. There are 3 options available; Range, List and Hash. Hash option will only enable for PostgreSQL version >= 11.
+
+Use the *Partition Keys* panel to define the partition keys. Click the *Add* icon (+) to add each partition keys selection:
+
+* Select a partition key type in the *Keytype* field.
+* Select a partition column in the *Column* field if Column option selected for *Keytype* field .
+* Specify the expression in the *Expression* field if Expression option selected for the *Keytype* field.
+
+Use the *Partitions* panel to define the partitions of a table. Click the *Add* icon (+) to add each partition:
+
+* Move the *Operation* switch to *attach* to attach the partition, by default it is *create*.
+* Use the *Name* field to add the name of the partition.
+* If partition type is Range then *From* and *To* fields will be enabled.
+* If partition type is List then *In* field will be enabled.
+* If partition type is Hash then *Modulus* and *Remainder* fields will be enabled.
+
 Click the *Parameter* tab to continue.
 
 .. image:: images/table_parameter.png

docs/en_US/unique_constraint_dialog.rst

@@ -23,6 +23,7 @@ Click the *Definition* tab to continue.
 Use the fields in the *Definition* tab to define the unique constraint:
 
 * Click inside the *Columns* field and select one or more column names from the drop-down listbox. To delete a selection, click the *x* to the left of the column name. The unique constraint should be different from the primary key constraint defined for the same table; the selected column(s) for the constraints must be distinct.
+* Use *Include columns* field to specify columns for *INCLUDE* clause of the constraint. This option is available in Postgres 11 and later.
 * Select the name of the tablespace in which the unique constraint will reside from the drop-down listbox in the *Tablespace* field.
 * Select the name of an index from the drop-down listbox in the *Index* field. This field is optional. Adding a unique constraint will automatically create a unique B-tree index on the column or group of columns listed in the constraint, and will force the column(s) to be marked NOT NULL.
 * Use the *Fill Factor* field to specify a fill factor for the table and index. The fill factor for a table is a percentage between 10 and 100. 100 (complete packing) is the default.

libraries.txt

@@ -38,3 +38,6 @@ Source Code Pro     1.1            SIL OFL      https://fonts.googleapis.com/css
 Open Sans           2.0            AL           https://fonts.googleapis.com/css?family=Open+Sans:400,400i,600,700
 Spectrum            1.8            MIT          https://bgrins.github.io/spectrum/
 Mousetrap           1.6.1          AL           https://github.com/ccampbell/mousetrap
+Axios               0.18.0         MIT          https://github.com/axios/axios
+leaflet             1.3.3          BSD          https://leafletjs.com/
+wkx                 0.4.5          MIT          https://github.com/cschwarz/wkx

pkg/docker/Dockerfile

@@ -8,8 +8,8 @@
 #########################################################################
 
 # First of all, build frontend with NodeJS in a separate builder container
-# Node-6 with ABI v48 is supported by all needed C++ packages
-FROM node:6 AS node-builder
+# Node-8 is supported by all needed C++ packages
+FROM node:8 AS node-builder
 
 COPY ./pgadmin4/web/ /pgadmin4/web/
 WORKDIR /pgadmin4/web
@@ -25,7 +25,7 @@ FROM python:3.6-alpine3.7 as docs-builder
 RUN apk add --no-cache make
 RUN pip install --no-cache-dir \
     sphinx flask_security flask_paranoid python-dateutil flask_sqlalchemy \
-    flask_gravatar simplejson
+    flask_gravatar flask_migrate simplejson
 
 COPY ./pgadmin4/ /pgadmin4
 
@@ -36,7 +36,7 @@ RUN LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 make -C /pgadmin4/docs/en_US -f Makefile
 FROM python:3.6-alpine3.7
 
 RUN pip --no-cache-dir install gunicorn
-RUN apk add --no-cache postgresql-client postgresql-libs
+RUN apk add --no-cache postfix postgresql-client postgresql-libs
 
 WORKDIR /pgadmin4
 ENV PYTHONPATH=/pgadmin4
@@ -45,7 +45,8 @@ ENV PYTHONPATH=/pgadmin4
 # so that deps do not increase the size of resulting image by remaining in layers
 COPY ./pgadmin4/requirements.txt /pgadmin4
 RUN set -ex && \
-    apk add --no-cache --virtual build-deps build-base postgresql-dev libffi-dev && \
+    apk add --no-cache --virtual build-deps build-base postgresql-dev libffi-dev linux-headers && \
+    pip install --upgrade pip && \
     pip install --no-cache-dir -r requirements.txt && \
     apk del --no-cache build-deps
 

pkg/docker/build.sh

@@ -4,7 +4,7 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2018, The pgAdmin Development Team
+# Copyright (C) 2013 - 2019, The pgAdmin Development Team
 # This software is released under the PostgreSQL Licence
 #
 #########################################################################