Added setuptools in the requirements for Python version >= 3.12

Update version for release v8.2
Fixed API test case for Foreign Table.
2026-10-28 07:30:05 -05:00 · 2024-01-08 15:40:02 +05:30 · 2024-01-08 15:03:32 +05:30 · 2024-01-08 15:02:08 +05:30 · 2024-01-08 14:04:38 +05:30 · 2024-01-08 12:16:49 +05:30
1897 changed files with 79789 additions and 58777 deletions
@@ -8,7 +8,7 @@ updates:
      - "Dependencies"
    commit-message:
      prefix: "Docker dependency"
-      
+
  - package-ecosystem: "pip"
    directory: "/"
    schedule:
@@ -17,7 +17,7 @@ updates:
      - "Dependencies"
    commit-message:
      prefix: "Python dependency"
-      
+
  - package-ecosystem: "pip"
    directory: "/tools"
    schedule:
@@ -25,8 +25,8 @@ updates:
    labels:
      - "Dependencies"
    commit-message:
-      prefix: "Python dependency"  
-      
+      prefix: "Python dependency"
+
  - package-ecosystem: "pip"
    directory: "/web/regression"
    schedule:
@@ -34,8 +34,8 @@ updates:
    labels:
      - "Dependencies"
    commit-message:
-      prefix: "Python dependency"  
-      
+      prefix: "Python dependency"
+
  - package-ecosystem: "npm"
    directory: "/runtime"
    schedule:
@@ -43,8 +43,8 @@ updates:
    labels:
      - "Dependencies"
    commit-message:
-      prefix: "Python dependency"  
-      
+      prefix: "Javascript dependency"
+
  - package-ecosystem: "npm"
    directory: "/web"
    schedule:
@@ -52,4 +52,4 @@ updates:
    labels:
      - "Dependencies"
    commit-message:
-      prefix: "Python dependency"  
+      prefix: "Javascript dependency"
@@ -13,7 +13,7 @@ concurrency:
  cancel-in-progress: true

 jobs:
-  build:
+  build-container:
    runs-on: ubuntu-latest

    steps:
@@ -13,7 +13,7 @@ concurrency:
  cancel-in-progress: true

 jobs:
-  build:
+  build-docs:
    runs-on: ubuntu-latest

    steps:
@@ -13,12 +13,17 @@ concurrency:
  cancel-in-progress: true

 jobs:
-  build:
+  check-javascript-style:
    runs-on: ubuntu-latest

    steps:
      - uses: actions/checkout@v3

+      - name: Upgrade yarn
+        run: |
+          yarn set version berry
+          yarn set version 3
+
      - name: Install Node modules
        run: |
          cd web
@@ -13,7 +13,7 @@ concurrency:
  cancel-in-progress: true

 jobs:
-  build:
+  build-python-package:
    runs-on: ubuntu-latest

    steps:
@@ -13,7 +13,7 @@ concurrency:
  cancel-in-progress: true

 jobs:
-  build:
+  check-python-style:
    runs-on: ubuntu-latest

    steps:
@@ -13,7 +13,7 @@ concurrency:
  cancel-in-progress: true

 jobs:
-  build:
+  build-tarball:
    runs-on: ubuntu-latest

    steps:
@@ -13,7 +13,7 @@ concurrency:
  cancel-in-progress: true

 jobs:
-  build:
+  check-translations:
    runs-on: ubuntu-latest

    steps:
@@ -13,7 +13,7 @@ concurrency:
  cancel-in-progress: true

 jobs:
-  build:
+  run-feature-tests-epas:
    # Only run if the tests are enabled
    # TODO: Figure out a way to test for the presence of the secrets instead
    if: vars.ENABLE_EPAS_TESTS == 'true'
@@ -21,7 +21,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pgver: [11, 12, 13, 14, 15]
+        pgver: [12, 13, 14, 15, 16]

    runs-on: ubuntu-latest

@@ -136,6 +136,11 @@ jobs:
          }
          EOF

+      - name: Upgrade yarn
+        run: |
+          yarn set version berry
+          yarn set version 3
+
      - name: Build the JS bundle
        run: |
          cd web
@@ -16,11 +16,11 @@ concurrency:
  cancel-in-progress: true

 jobs:
-  build:
+  run-feature-tests-pg:
    strategy:
      fail-fast: false
      matrix:
-        pgver: [11, 12, 13, 14, 15]
+        pgver: [12, 13, 14, 15, 16]

    runs-on: ubuntu-latest

@@ -139,6 +139,11 @@ jobs:
          }
          EOF

+      - name: Upgrade yarn
+        run: |
+          yarn set version berry
+          yarn set version 3
+
      - name: Build the JS bundle
        run: |
          cd web
@@ -13,7 +13,7 @@ concurrency:
  cancel-in-progress: true

 jobs:
-  build:
+  run-javascript-tests:
    strategy:
      fail-fast: false
      matrix:
@@ -22,11 +22,16 @@ jobs:
    runs-on: ${{ matrix.os }}

    steps:
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18.x'
+
      - uses: actions/checkout@v3
-      
+
      - name: Upgrade yarn
        run: |
          yarn set version berry
+          yarn set version 3

      - name: Install Node modules
        run: |
@@ -36,4 +41,4 @@ jobs:
      - name: Run the tests
        run: |
          cd web
-          yarn run test:karma-once
+          yarn run test:js-once
@@ -23,7 +23,7 @@ concurrency:
  cancel-in-progress: true

 jobs:
-  build:
+  run-python-tests-epas:
    # Only run if the tests are enabled
    # TODO: Figure out a way to test for the presence of the secrets instead
    if: vars.ENABLE_EPAS_TESTS == 'true'
@@ -32,7 +32,7 @@ jobs:
      fail-fast: false
      matrix:
        os: [ubuntu-22.04, windows-latest]
-        pgver: [11, 12, 13, 14, 15]
+        pgver: [12, 13, 14, 15, 16]

    runs-on: ${{ matrix.os }}

@@ -16,12 +16,12 @@ concurrency:
  cancel-in-progress: true

 jobs:
-  build:
+  run-python-tests-pg:
    strategy:
      fail-fast: false
      matrix:
        os: [macos-latest, ubuntu-latest, windows-latest]
-        pgver: [11, 12, 13, 14, 15]
+        pgver: [12, 13, 14, 15, 16]

    runs-on: ${{ matrix.os }}

@@ -57,7 +57,9 @@ jobs:
      - name: Install platform dependencies on Windows
        if: ${{ matrix.os == 'windows-latest' }}
        run: |
-          choco install -y postgresql${{ matrix.pgver }} --params "/Password:postgres /Port:59${{ matrix.pgver }}" --ia "--prefix C:\PostgreSQL\${{ matrix.pgver }} --datadir C:\PostgreSQL\${{ matrix.pgver }}\data --install_runtimes 0 --disable-components pgAdmin,stackbuilder --enable-components server,commandlinetools"
+          FOR /f "delims=" %%F IN ('python tools\get_sb_package.py "https://www.postgresql.org/applications-v2.xml" "postgresql_${{ matrix.pgver }}" "windows-x64"') DO SET INSTALLER_EXE=%%F
+          ECHO Running %INSTALLER_EXE%...
+          %INSTALLER_EXE% --prefix C:\PostgreSQL\${{ matrix.pgver }} --datadir C:\PostgreSQL\${{ matrix.pgver }}\data --serverport 59${{ matrix.pgver }} --superpassword postgres --install_runtimes 0 --mode unattended --unattendedmodeui none --disable-components pgAdmin,stackbuilder --enable-components server,commandlinetools"
          choco install -y mitkerberos
          
          REM Ignore error 3010 (reboot required)
@@ -18,7 +18,7 @@ concurrency:
  cancel-in-progress: false

 jobs:
-  build:
+  run-sonarqube-scan:
    # Only run if the project key is set
    if: vars.SONARQUBE_PROJECT_KEY != null

@@ -1,5 +1,5 @@
 [pycodestyle]
-ignore = E402,W504,W605,E231,W605
+ignore = E402,W504,E231
 max-line-length = 79
 statistics = True
 show-source = False
@@ -2,7 +2,7 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2023, The pgAdmin Development Team
+# Copyright (C) 2013 - 2024, The pgAdmin Development Team
 # This software is released under the PostgreSQL Licence
 #
 #########################################################################
@@ -47,6 +47,7 @@ WORKDIR /pgadmin4/web
 # Build the JS vendor code in the app-builder, and then remove the vendor source.
 RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
    yarn set version berry && \
+    yarn set version 3 && \
    yarn install && \
    yarn run bundle && \
    rm -rf node_modules \
@@ -55,7 +56,8 @@ RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
           .[^.]* \
           babel.cfg \
           webpack.* \
-           karma.conf.js \
+           jest.config.js \
+           babel.* \
           ./pgadmin/static/js/generated/.cache

 #########################################################################
@@ -114,20 +116,15 @@ RUN rm -rf /pgadmin4/docs/en_US/_build/html/_static/*.png
 # Create additional builders to get all of the PostgreSQL utilities
 #########################################################################

-FROM postgres:11-alpine AS pg11-builder
 FROM postgres:12-alpine AS pg12-builder
 FROM postgres:13-alpine AS pg13-builder
 FROM postgres:14-alpine AS pg14-builder
 FROM postgres:15-alpine AS pg15-builder
+FROM postgres:16-alpine AS pg16-builder

 FROM alpine:latest AS tool-builder

 # Copy the PG binaries
-COPY --from=pg11-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-11/
-COPY --from=pg11-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-11/
-COPY --from=pg11-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-11/
-COPY --from=pg11-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-11/
-
 COPY --from=pg12-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-12/
 COPY --from=pg12-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-12/
 COPY --from=pg12-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-12/
@@ -148,6 +145,11 @@ COPY --from=pg15-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-15/
 COPY --from=pg15-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-15/
 COPY --from=pg15-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-15/

+COPY --from=pg16-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-16/
+COPY --from=pg16-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-16/
+COPY --from=pg16-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-16/
+COPY --from=pg16-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-16/
+
 #########################################################################
 # Assemble everything into the final container.
 #########################################################################
@@ -159,9 +161,14 @@ COPY --from=env-builder /venv /venv

 # Copy in the tools
 COPY --from=tool-builder /usr/local/pgsql /usr/local/
-COPY --from=pg15-builder /usr/local/lib/libpq.so.5.15 /usr/lib/
-RUN ln -s libpq.so.5.15 /usr/lib/libpq.so.5 && \
-    ln -s libpq.so.5.15 /usr/lib/libpq.so
+COPY --from=pg16-builder /usr/local/lib/libpq.so.5.16 /usr/lib/
+COPY --from=pg16-builder /usr/lib/libzstd.so.1.5.5 /usr/lib/
+COPY --from=pg16-builder /usr/lib/liblz4.so.1.9.4 /usr/lib/
+
+RUN ln -s libpq.so.5.16 /usr/lib/libpq.so.5 && \
+    ln -s libpq.so.5.16 /usr/lib/libpq.so && \
+    ln -s libzstd.so.1.5.5 /usr/lib/libzstd.so.1 && \
+    ln -s liblz4.so.1.9.4 /usr/lib/liblz4.so.1

 WORKDIR /pgadmin4
 ENV PYTHONPATH=/pgadmin4
@@ -186,6 +193,7 @@ RUN apk add \
        libjpeg-turbo \
        shadow \
        sudo \
+        tzdata \
        libedit \
        libldap \
        libcap && \
@@ -4,7 +4,7 @@ pgAdmin 4
 This software is released under the PostgreSQL licence.

 -------------------------------------------------------------------------------
-Copyright (C) 2013 - 2023, The pgAdmin Development Team
+Copyright (C) 2013 - 2024, The pgAdmin Development Team

 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose, without fee, and without a written agreement is
@@ -26,8 +26,8 @@ CALL :CLEAN || EXIT /B 1
 CALL :CREATE_VIRTUAL_ENV || EXIT /B 1
 CALL :CREATE_PYTHON_ENV || EXIT /B 1
 CALL :CREATE_RUNTIME_ENV || EXIT /B 1
-CALL :CREATE_INSTALLER || EXIT /B 1
 CALL :GENERATE_SBOM || EXIT /B 1
+CALL :CREATE_INSTALLER || EXIT /B 1
 CALL :SIGN_INSTALLER || EXIT /B 1

 EXIT /B %ERRORLEVEL%
@@ -315,8 +315,8 @@ REM Main build sequence Ends

    ECHO Staging PostgreSQL components...
    COPY "%PGADMIN_POSTGRES_DIR%\bin\libpq.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-    COPY "%PGADMIN_POSTGRES_DIR%\bin\libcrypto-1_1-x64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-    COPY "%PGADMIN_POSTGRES_DIR%\bin\libssl-1_1-x64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
+    COPY "%PGADMIN_POSTGRES_DIR%\bin\libcrypto-*-x64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
+    COPY "%PGADMIN_POSTGRES_DIR%\bin\libssl-*-x64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
    IF EXIST "%PGADMIN_POSTGRES_DIR%\bin\libintl-*.dll" COPY "%PGADMIN_POSTGRES_DIR%\bin\libintl-*.dll" "%BUILDROOT%\runtime" > nul
    IF EXIST "%PGADMIN_POSTGRES_DIR%\bin\libiconv-*.dll" COPY "%PGADMIN_POSTGRES_DIR%\bin\libiconv-*.dll" "%BUILDROOT%\runtime" > nul
    COPY "%PGADMIN_POSTGRES_DIR%\bin\zlib.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
@@ -364,7 +364,7 @@ REM Main build sequence Ends

 :GENERATE_SBOM
    ECHO Generating SBOM...
-    syft "%BUILDROOT%\" -o cyclonedx-json > "%BUILDROOT%\sbom.json"
+    CALL syft "%BUILDROOT%" -o cyclonedx-json > "%BUILDROOT%\sbom.json"

 :SIGN_INSTALLER
    ECHO Attempting to sign the installer...
@@ -2,7 +2,7 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2023, The pgAdmin Development Team
+# Copyright (C) 2013 - 2024, The pgAdmin Development Team
 # This software is released under the PostgreSQL Licence
 #
 #########################################################################
@@ -42,7 +42,7 @@ linter:
 	cd web && yarn run linter

 check: install-node bundle linter check-pep8
-	cd web && yarn run karma start --single-run && python regression/runtests.py
+	cd web && yarn run test:js-once && python regression/runtests.py

 check-audit:
 	cd web && yarn run audit
@@ -77,10 +77,10 @@ check-feature: install-node bundle
 	cd web && python regression/runtests.py --pkg feature_tests

 check-js: install-node linter
-	cd web && yarn run karma start --single-run
+	cd web && yarn run test:js-once

 check-js-coverage:
-    cd web && yarn run test:karma-coverage
+    cd web && yarn run test:js-coverage

 # Include all clean sub-targets in clean
 clean: clean-appbundle clean-debian clean-dist clean-docs clean-node clean-pip clean-redhat clean-src
@@ -1,7 +1,7 @@
-# pgAdmin 4 
+# pgAdmin 4

 pgAdmin 4 is a rewrite of the popular pgAdmin3 management tool for the
-PostgreSQL (http://www.postgresql.org) database. 
+PostgreSQL (http://www.postgresql.org) database.

 In the following documentation and examples, *$PGADMIN4_SRC/* is used to denote
 the top-level directory of a copy of the pgAdmin source tree, either from a
@@ -9,9 +9,8 @@ tarball or a git checkout.

 ## Architecture

-pgAdmin 4 is written as a web application in Python, using jQuery and Bootstrap
-for the client side processing and UI. On the server side, Flask is being
-utilised.
+pgAdmin 4 is written as a web application with Python(Flask) on the server side
+and ReactJS, HTML5 with CSS for the client side processing and UI.

 Although developed using web technologies, pgAdmin 4 can be deployed either on
 a web server using a browser, or standalone on a workstation. The runtime/
@@ -22,7 +21,7 @@ which will execute the Python server and display the UI.

 To build the runtime, the following packages must be installed:

-* NodeJS 12+
+* NodeJS 16+
 * Yarn

 Change into the runtime directory, and run *yarn install*. This will install the
@@ -59,20 +58,20 @@ simple - adapt as required for your distribution:
   ```bash
   $ python3 -m venv venv
   ```
-   
+
 2. Now activate the virtual environment:

   ```bash
   $ source venv/bin/activate
   ```
-   
+
 3. Some of the components used by pgAdmin require a very recent version of *pip*,
   so update that to the latest:
-   
+
   ```bash
   $ pip install --upgrade pip
   ```
-   
+
 4. Ensure that a PostgreSQL installation's bin/ directory is in the path (so
   pg_config can be found for building psycopg3), and install the required
   packages:
@@ -80,20 +79,20 @@ simple - adapt as required for your distribution:
   ```bash
   (venv) $ PATH=$PATH:/usr/local/pgsql/bin pip install -r $PGADMIN4_SRC/requirements.txt
   ```
-   
+
   If you are planning to run the regression tests, you also need to install
   additional requirements from web/regression/requirements.txt:

   ```bash
   (venv) $ pip install -r $PGADMIN4_SRC/web/regression/requirements.txt
   ```
-   
+
 5. Create a local configuration file for pgAdmin. Edit
   $PGADMIN4_SRC/web/config_local.py and add any desired configuration options
   (use the config.py file as a reference - any settings duplicated in
   config_local.py will override those in config.py). A typical development
   configuration may look like:
-   
+
    ```python
    from config import *

@@ -126,7 +125,7 @@ simple - adapt as required for your distribution:
            'pgadmin4-server.db'
        )
   ```
-   
+
   This configuration allows easy switching between server and desktop modes
   for testing.

@@ -137,13 +136,13 @@ simple - adapt as required for your distribution:
   ```bash
   (venv) $ python3 $PGADMIN4_SRC/web/setup.py
   ```
-   
+
   or by starting pgAdmin 4:

   ```bash
   (venv) $ python3 $PGADMIN4_SRC/web/pgAdmin4.py
   ```
-   
+
   Whilst it is possible to automatically run setup in desktop mode by running
   the runtime, that will not work in server mode as the runtime doesn't allow
   command line interaction with the setup program.
@@ -228,7 +227,7 @@ To build a source tarball:
 (venv) $ make src
 ```

-To build a PIP Wheel, activate either a Python 3 virtual environment, configured 
+To build a PIP Wheel, activate either a Python 3 virtual environment, configured
 with all the required packages, and then run:

 ```bash
@@ -266,7 +265,7 @@ See https://www.pgadmin.org/support/ for support options.

 If you would like to report a security issue with pgAdmin, please email
 **security (at) pgadmin (dot) org**.
-    
+
 Note that this address should only be used for reporting security issues
 that you believe you've found in the design or code of pgAdmin, pgAgent,
 and the pgAdmin website. It should not be used to ask security questions.
@@ -251,6 +251,16 @@ tab to provide other backup options.
     table locks at the beginning of the dump. Instead, fail if unable to lock a
     table within the specified timeout.

+Click the *Objects* tab to continue.
+
+.. image:: images/backup_object_selection.png
+    :alt: Select objects in backup dialog
+    :align: center
+
+* Select the objects from tree to take backup of selected objects only.
+    * If Schema is selected then it will take the backup of that selected schema only.
+    * If any Table, View, Materialized View, Sequences, or Foreign Table is selected then it will take the backup of those selected objects.
+
 When you’ve specified the details that will be incorporated into the pg_dump
 command:

@@ -5,7 +5,7 @@
 **********************

 The bulk of pgAdmin is a Python web application written using the Flask framework
-on the backend, and HTML5 with CSS3, Bootstrap and jQuery on the front end. A
+on the backend, and HTML5 with CSS3,ReactJS on the front end. A
 desktop runtime is also included for users that prefer a desktop application to
 a web application, which is written using NWjs (Node Webkit).

@@ -207,8 +207,7 @@ Front End

 pgAdmin uses javascript extensively for the front-end implementation. It uses
 require.js to allow the lazy loading (or, say load only when required),
-bootstrap and MaterialUI for UI look and feel, React for generating
-properties/create dialog for selected node. We have
+ReactJS with CSS and MaterialUI for UI look and feel. We have
 divided each module in small chunks as much as possible. Not all javascript
 modules are required to be loaded (i.e. loading a javascript module for
 database will make sense only when a server node is loaded completely.) Please
@@ -16,7 +16,7 @@ review process for any changes 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 - 2023, The pgAdmin Development Team
+    Copyright (C) 2013 - 2024, The pgAdmin Development Team

 * Ensure there's a blank line immediately following any copyright headers.

@@ -22,14 +22,12 @@ purpose or how it works if not obvious from a quick review of the code itself.
 CSS 3
 *****

-CSS3 is used for styling and layout throughout the application. Extensive use is
-made of the Bootstrap Framework to aid in that process, however additional
-styles must still be created from time to time.
+CSS3 is used for styling and layout throughout the application.

 Most custom styling comes from individual modules which may advertise static
 stylesheets to be included in the module that is loading them via hooks.

-Styling overrides (for example, to alter the Bootstrap look and feel) will
+Styling overrides (for example, to alter the look and feel) will
 typically be found in the **overrides.css** file in the main static file
 directory for the application.

@@ -64,7 +62,7 @@ All HTML must be HTML 5 compliant.
 Javascript
 **********

-Client-side code is written in Javascript using jQuery and various plugins.
+Client-side code is written in Javascript using ReactJS and various plugins.
 Whilst much of the code is rendered from static files, there is also code that
 is rendered from templates using Jinja2 (often to inject the users settings) or
 constructed on the fly from module hooks.
@@ -122,7 +120,7 @@ with the required file header is shown below::
    #
    # pgAdmin 4 - PostgreSQL Tools
    #
-    # Copyright (C) 2013 - 2023, The pgAdmin Development Team
+    # Copyright (C) 2013 - 2024, The pgAdmin Development Team
    # This software is released under the PostgreSQL Licence
    #
    ##########################################################################
@@ -39,6 +39,10 @@ are disabled if inapplicable.)
  a text value.
 * Use the drop-down listbox next to *Collation* to apply a collation setting to
  the column.
+* Use the drop-down listbox next to *Compression* to set the compression method
+  for the column. Compression is supported only for variable-width data types,
+  and is used only when the column's storage mode is main or extended. This
+  option is available from v14 and above.

 Click the *Constraints* tab to continue.

@@ -53,11 +53,11 @@ The default binary paths set in the container are as follows:
 .. code-block:: bash

    DEFAULT_BINARY_PATHS = {
+        'pg-16': '/usr/local/pgsql-16',
        'pg-15': '/usr/local/pgsql-15',
        'pg-14': '/usr/local/pgsql-14',
        'pg-13': '/usr/local/pgsql-13',
-        'pg-12': '/usr/local/pgsql-12',
-        'pg-11': '/usr/local/pgsql-11'
+        'pg-12': '/usr/local/pgsql-12'
    }

 this may be changed in the :ref:`preferences`.
@@ -19,6 +19,9 @@ Use the fields in the *General* tab to identify the database:

 * Use the *Database* field to add a descriptive name for the database. The name
  will be displayed in the *pgAdmin* tree control.
+* Use the *OID* field to specify the object identifier to be used for the new
+  database. Users can specify the value greater than 16383. This option is available
+  from v15 and above.
 * Select the owner of the database from the drop-down listbox in the *Owner*
  field.
 * Store notes about the database in the *Comment* field.
@@ -38,11 +41,22 @@ Use the *Definition* tab to set properties for the database:
 * Select a tablespace from the drop-down listbox in the *Tablespace* field. The
  selected tablespace will be the default tablespace used to contain database
  objects.
+* Select the strategy from the drop-down listbox in the *Strategy* field while
+  creating a new database. This option is available from v15 and above.
+* Select the locale provider from the drop-down listbox in the *Locale Provider*
+  field to set the default collation for this database. Possible values are: icu, libc.
+  This option is available from v15 and above.
 * Select the collation order from the drop-down listbox in the *Collation* field.
 * Select the character classification from the drop-down listbox in the
  *Character Type* field. This affects the categorization of characters, e.g.
  lower, upper and digit. The default, or a blank field, uses the character
  classification of the template database.
+* Select the icu locale from the drop-down listbox in the *ICU Locale* to
+  specifies the ICU locale ID if the ICU locale provider is used.
+  This option is available from v15 and above.
+* Specify the icu rules in the *ICU Rules* field as additional collation
+  rules to customize the behavior of the default collation of this database.
+  This option is available from v16 and above.
 * Specify a connection limit in the *Connection Limit* field to configure the
  maximum number of connection requests. The default value (*-1*) allows
  unlimited connections to the database.
@@ -222,3 +222,18 @@ To delete a row from the grid, click the trash icon.
   :maxdepth: 2

   viewdata_filter
+
+
+
+Promote View/Edit Data to Query Tool
+************************************
+
+A View/Edit Data tab can be converted to a Query Tool Tab just by editing the query. Once you start editing, it will ask if you really want to move away from View/Edit.
+
+.. image:: images/promote_view_edit_data_warning.png
+    :alt: Promote View/Edit Data tab to Query Tool tab warning
+    :align: center
+
+You can disable the dialog by selecting the "Don't Ask again" checkbox. If you wish to resume the confirmation dialog, you can do it from "Prefrences -> Query Tool -> Editor -> Show View/Edit Data Promotion Warning?"
+
+Once you chose to continue, you won't be able to use the features of View/Edit mode like the filter and sorting options, limit, etc. It is a one-way conversion. It will be a query tool now.
@@ -18,7 +18,14 @@ The Entity-Relationship Diagram (ERD) tool is a database design tool that provid
    :alt: ERD tool window
    :align: center

-You can open multiple copies of the ERD tool in individual tabs simultaneously. To close a copy of the ERD tool, click the *X* in the upper-right hand corner of the tab bar.
+You can open multiple copies of the ERD tool in individual tabs simultaneously.
+You can also generate an ERD from a database, schema or a table.
+
+* The ERD for database will fetch all the tables from all the schemas of the database and plot them with foreign key links.
+* The ERD for schema will fetch all the tables from a schema and plot them with foreign key links. If any table refers to a table in another
+  schema, then that link/foreign key will be removed.
+* The ERD for table will fetch all the tables linked directly or indirectly to mentioned table. You can change the depth of traversal from :ref:`Preferences <preferences>`.
+

 Toolbar
 *******
@@ -35,8 +35,10 @@ Click the *Definition* tab to continue.

 Use the fields in the *Definition* tab to define the function:

+* Move the *Custom return type?* switch to provide a user defined return type.
 * Use the drop-down listbox next to *Return type* to select the data type
-  returned by the function, if any.
+  returned by the function, if any. If *Custom return type?* is enabled this field
+  will change to an input text field.
 * Use the drop-down listbox next to *Language* to select the implementation
  language. The default is *sql*.
 * Use the fields in the *Arguments* to define an argument. Click the *Add*
@@ -61,7 +61,7 @@ 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,
+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
@@ -73,28 +73,28 @@ For example:

 .. code-block:: bash

-    /path/to/python /path/to/setup.py --dump-servers output_file.json
+    /path/to/python /path/to/setup.py dump-servers output_file.json

-    # or, to specify a non-default user name:
+    # or, to specify a non-default user name and auth source (the default is Internal):

-    /path/to/python /path/to/setup.py --dump-servers output_file.json --user user@example.com
+    /path/to/python /path/to/setup.py dump-servers output_file.json --user user@example.com --auth_source ldap

    # to specify a pgAdmin config DB file:

-    /path/to/python /path/to/setup.py --dump-servers output_file.json --sqlite-path /path/to/pgadmin4.db
+    /path/to/python /path/to/setup.py dump-servers output_file.json --sqlite-path /path/to/pgadmin4.db

-To export only certain servers, use the ``--servers`` option and list one or
+To export only certain servers, use the ``--server`` 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
+    /path/to/python /path/to/setup.py dump-servers output_file.json --server 1 --server 2 --server 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,
+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
@@ -108,19 +108,19 @@ desktop mode. By default SQLITE_PATH setting in ``config.py`` is taken. For exam

 .. code-block:: bash

-    /path/to/python /path/to/setup.py --load-servers input_file.json
+    /path/to/python /path/to/setup.py load-servers input_file.json

    # or, to replace the list of servers with the newly imported one:

-    /path/to/python /path/to/setup.py --load-servers input_file.json --replace
+    /path/to/python /path/to/setup.py load-servers input_file.json --replace

-    # or, to specify a non-default user name to own the new servers:
+    # or, to specify a non-default user name and auth source (the default is Internal) to own the new servers:

-    /path/to/python /path/to/setup.py --load-servers input_file.json --user user@example.com
+    /path/to/python /path/to/setup.py load-servers input_file.json --user user@example.com

    # to specify a pgAdmin config DB file:

-    /path/to/python /path/to/setup.py --load-servers input_file.json --sqlite-path /path/to/pgadmin4.db
+    /path/to/python /path/to/setup.py load-servers input_file.json --sqlite-path /path/to/pgadmin4.db

 If any Servers are defined with a Server Group that is not already present in
 the configuration database, the required Group will be created.
@@ -170,6 +170,7 @@ The following example shows both a minimally defined and a fully defined server:
                "SSLCrl": "/path/to/sslcrl.crl",
                "SSLCompression": 1,
                "Shared": false,
+                "SharedUsername": "postgres",
                "BGColor": "#ff9900",
                "FGColor": "#000000",
                "Service": "postgresql-10",
@@ -87,6 +87,9 @@ There are 3 ways to configure LDAP:
   "LDAP_KEY_FILE","Specifies the path to the server private key file. This parameter
   is applicable only if you are using *ldaps* as connection protocol or you have
   set *LDAP_USE_STARTTLS* parameter to *True*."
+   "LDAP_IGNORE_MALFORMED_SCHEMA", "Some flaky LDAP servers returns malformed schema.
+   If this parameter set to *True*, no exception will be raised and schema is thrown away
+   but authentication will be done. This parameter should remain False, as recommended."
   "**Bind as pgAdmin user**"
   "LDAP_BASE_DN","Specifies the base DN from where a server will start the search
   for users. For example, an LDAP search for any user will be performed by the server
@@ -13,7 +13,7 @@ documentation is attributed to the

 .. topic:: pgAdmin 4

-    Copyright (C) 2013 - 2023, The pgAdmin Development Team
+    Copyright (C) 2013 - 2024, The pgAdmin Development Team

    Permission to use, copy, modify, and distribute this software and its
    documentation for any purpose, without fee, and without a written agreement is
@@ -31,17 +31,6 @@ Use the fields in the *General* tab to identify the materialized view:
 Click the *Definition* tab to continue.

 .. image:: images/materialized_view_definition.png
-    :alt: Materialized view dialog definition tab
-    :align: center
-
-Use the text editor field in the *Definition* tab to provide the query that will
-populate the materialized view. Please note that updating the definition of existing
-materialized view would result in loss of Parameter(Table, Toast), Security(Privileges & Security labels),
-Indexes and other dependent objects.
-
-Click the *Storage* tab to continue.
-
-.. image:: images/materialized_view_storage.png
    :alt: Materialized view dialog storage tab
    :align: center

@@ -52,10 +41,24 @@ Use the fields in the *Storage* tab to maintain the materialized view:
  cannot be queried until you invoke REFRESH MATERIALIZED VIEW.
 * Use the drop-down listbox next to *Tablespace* to select a location for the
  materialized view.
+* Use the drop-down list box next to Access Method to specify the table access method to use to store the contents
+  for the new materialized view; the method needs to be an access method of type TABLE. This field is optional.
+  This option is available from v12 and above.
 * Use the *Fill Factor* field to specify a fill factor for the materialized
  view. The fill factor for a table is a percentage between 10 and 100. 100
  (complete packing) is the default.

+Click the *Code* tab to continue.
+
+.. image:: images/materialized_view_code.png
+    :alt: Materialized view dialog definition tab
+    :align: center
+
+Use the text editor field in the *Code* tab to provide the query that will
+populate the materialized view. Please note that updating the definition of existing
+materialized view would result in loss of Parameter(Table, Toast), Security(Privileges & Security labels),
+Indexes and other dependent objects.
+
 Click the *Parameter* tab to continue.

 .. image:: images/materialized_view_parameter.png
@@ -25,9 +25,6 @@ Use the *File* menu to access the following options:
 +-------------------------+---------------------------------------------------------------------------------------------------------+
 | *Reset Layout*          | If you have modified the workspace, click to restore the default layout.                                |
 +-------------------------+---------------------------------------------------------------------------------------------------------+
-| *Lock Layout*           | Click to open a submenu to select the level for locking the UI layout                                   |
-|                         | This can also be changed from browser display :ref:`preferences <preferences>`                          |
-+-------------------------+---------------------------------------------------------------------------------------------------------+
 | *Runtime*               | Click to open a submenu to Configure, View Log and Zoom settings. Only visible when pgAdmin4 runs in    |
 |                         | desktop mode. To know more about runtime menu :ref:`click here <desktop_deployment>`                    |
 +-------------------------+---------------------------------------------------------------------------------------------------------+
@@ -45,6 +42,12 @@ following options (in alphabetical order):
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
 | Option                      | Action                                                                                                                   |
 +=============================+==========================================================================================================================+
+| *Register*                  |                                                                                                                          |
+|                             |                                                                                                                          |
+|   1) *Server*               | Click to open the :ref:`Server <server_dialog>` dialog to register a server.                                             |
+|                             |                                                                                                                          |
+|   2) *Deploy Cloud Instance*| Click to open the :ref:`Cloud Deployment <cloud_deployment>` dialog to deploy an cloud instance.                         |
+-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
 | *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.                                       |
@@ -55,6 +58,8 @@ following options (in alphabetical order):
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
 | *Connect Server*            | Click to open the :ref:`Connect to Server <connect_to_server>` dialog to establish a connection with a server.           |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
+| *Copy Server...*            | Click to copy the currently selected 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.                                                        |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
@@ -12,6 +12,10 @@ installed in Server mode. You can copy these settings from *config.py* file
 and modify the values for the following parameters:


+.. _AzureAD: https://learn.microsoft.com/en-us/security/zero-trust/develop/configure-tokens-group-claims-app-roles
+.. _GitLab: https://docs.gitlab.com/ee/integration/openid_connect_provider.html#shared-information
+
+
 .. csv-table::
   :header: "**Parameter**", "**Description**"
   :class: longtable
@@ -39,6 +43,11 @@ and modify the values for the following parameters:
    "OAUTH2_AUTO_CREATE_USER", "Set the value to *True* if you want to automatically
    create a pgAdmin user corresponding to a successfully authenticated Oauth2 user.
    Please note that password is not stored in the pgAdmin database."
+    "OAUTH2_ADDITIONAL_CLAIMS", "If a dictionary is provided, pgAdmin will check for a matching key and value on the userinfo endpoint 
+    and in the Id Token. In case there is no match with the provided config, the user will receive an authorization error.
+    Useful for checking AzureAD_ *wids* or *groups*, GitLab_ *owner*, *maintainer* and *reporter* claims."
+    "OAUTH2_SSL_CERT_VERIFICATION", "Set this variable to False to disable SSL certificate verification for OAuth2 provider.
+    This may need to set False, in case of self-signed certificates."

 Redirect URL
 ============
@@ -46,19 +46,6 @@ Use the fields on the *Display* panel to specify general display preferences:
 * When the *Hide shared servers?* switch is set to *True*, the client will hide
  all the shared servers from the object explorer.

-* Use the *Lock layout* field to lock the UI layout at different levels. This
-  can also be changed from File menu on the :ref:`menu bar <menu_bar>`
-
-+---------------------+-------------------------------------------------------------------+
-| Option              | Action                                                            |
-+=====================+===================================================================+
-| *None*              | No locking. Every panel is resizable and dockable.                |
-+---------------------+-------------------------------------------------------------------+
-| *Prevent docking*   | This will disable the docking/undocking of the panels             |
-+---------------------+-------------------------------------------------------------------+
-| *Full*              | This will disable resizing, docking/undocking of the panels       |
-+---------------------+-------------------------------------------------------------------+
-
 * When the *Show empty object collections?* switch is turned off, then all object
  collections which are empty will be hidden from browser tree.
 * When the *Show system objects?* switch is set to *True*, the client will
@@ -562,3 +549,43 @@ Use the fields on the *Options* panel to specify storage preferences.

 * When the *Show hidden files and folders?* switch is set to *True*, the file
  manager will display hidden files and folders.
+
+
+Using 'setup.py' command line script
+####################################
+
+.. note:: To manage preferences using ``setup.py`` script, 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.
+
+
+Manage Preferences
+******************
+
+Get Preferences
+***************
+To get all the preferences listed, invoke ``setup.py`` with ``get-prefs`` command line option.
+You can also get this mapping by hovering the individual preference in the Preference UI dialog.
+
+.. code-block:: bash
+
+    /path/to/python /path/to/setup.py get-prefs
+
+Save Preferences
+****************
+To save the preferences, invoke ``setup.py`` with ``set-prefs`` command line option, followed by username,
+preference_key=value and auth_source. Multiple preference can be given too by a space separated.
+If auth_source is not given, Internal authentication will be consider by default.
+
+.. code-block:: bash
+
+    /path/to/python /path/to/setup.py set-prefs user1@gmail.com sqleditor:editor:comma_first=true
+
+    # To specify multiple preferences options
+    /path/to/python /path/to/setup.py set-prefs user1@gmail.com sqleditor:editor:comma_first=true sqleditor:keyboard_shortcuts:toggle_case=true
+
+    # to specify an auth_source
+    /path/to/python /path/to/setup.py set-prefs user1@gmail.com sqleditor:editor:comma_first=true --auth-source=ldap
@@ -73,11 +73,11 @@ key combination to select from a popup menu of autocomplete options.
    :alt: Query tool autocomplete feature
    :align: center

-After entering a query, select the *Execute/Refresh* icon from the toolbar. The
+After entering a query, select the *Execute script* icon from the toolbar. The
 complete contents of the SQL editor panel will be sent to the database server
 for execution. To execute only a section of the code that is displayed in the
 SQL editor, highlight the text that you want the server to execute, and click
-the *Execute/Refresh* icon.
+the *Execute script* icon.

 .. image:: images/query_execute_section.png
    :alt: Query tool execute query section
@@ -159,7 +159,7 @@ The *Data Output* tab displays the result set of the query in a table format.
 You can:

 * Select and copy from the displayed result set.
-* Use the *Execute/Refresh* options to retrieve query execution information and
+* Use the *Execute script* options to retrieve query execution information and
  set query execution options.
 * Use the *Save results to file* icon to save the content of the *Data Output*
  tab as a comma-delimited file.
@@ -116,7 +116,7 @@ Query Execution
   +======================+===================================================================================================+================+
   | *Stop*               | Click the *Stop* icon to cancel the execution of the currently running query.                     | Accesskey + Q  |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Execute/Refresh*    | Click the *Execute/Refresh* icon to either execute or refresh the query highlighted in the SQL    | F5             |
+   | *Execute script*     | Click the *Execute script* icon to either execute or refresh the query highlighted in the SQL     | F5             |
   |                      | editor panel. Click the down arrow to access other execution options:                             |                |
   |                      |                                                                                                   |                |
   |                      |  * Add a check next to *Auto rollback on error?* to instruct the server to automatically roll back|                |
@@ -11,6 +11,11 @@ notes for it.
 .. toctree::
   :maxdepth: 1

+   release_notes_8_2
+   release_notes_8_1
+   release_notes_8_0
+   release_notes_7_8
+   release_notes_7_7
   release_notes_7_6
   release_notes_7_5
   release_notes_7_4
@@ -0,0 +1,44 @@
+***********
+Version 7.7
+***********
+
+Release date: 2023-09-21
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v7.6.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 11, 12, 13, 14 and 15
+
+**EDB Advanced Server**: 11, 12, 13, 14 and 15
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 15.4
+
+
+New features
+************
+
+  | `Issue #642 <https://github.com/pgadmin-org/pgadmin4/issues/642>`_   -  Added support to select/deselect objects in the Backup dialog.
+  | `Issue #4805 <https://github.com/pgadmin-org/pgadmin4/issues/4805>`_ -  Added all the new options of the 'WITH' clause in the subscription dialog.
+  | `Issue #6378 <https://github.com/pgadmin-org/pgadmin4/issues/6378>`_ -  Added USING method while creating the table.
+  | `Issue #6379 <https://github.com/pgadmin-org/pgadmin4/issues/6379>`_ -  Added compression method option while creating a column.
+  | `Issue #6383 <https://github.com/pgadmin-org/pgadmin4/issues/6383>`_ -  Added Strategy, Locale Provider, ICU Locale, ICU Rules, and OID options while creating a database.
+  | `Issue #6400 <https://github.com/pgadmin-org/pgadmin4/issues/6400>`_ -  Added USING method while creating the materialized view.
+  | `Issue #6736 <https://github.com/pgadmin-org/pgadmin4/issues/6736>`_ -  Add support for additional ID token claim checks for OAuth 2 authentication.
+
+Housekeeping
+************
+
+  | `Issue #2411 <https://github.com/pgadmin-org/pgadmin4/issues/2411>`_ -  Added the 'data type' column in the properties tab of the Columns collection node.
+
+Bug fixes
+*********
+
+  | `Issue #6274 <https://github.com/pgadmin-org/pgadmin4/issues/6274>`_ -  Fix an issue where user is not able to change the password when SMTP is not configured.
+  | `Issue #6704 <https://github.com/pgadmin-org/pgadmin4/issues/6704>`_ -  Ensure user is redirected to login page after failed login.
+  | `Issue #6712 <https://github.com/pgadmin-org/pgadmin4/issues/6712>`_ -  Ensure that Materialized view size fields in "Statistics" should be human-readable.
+  | `Issue #6730 <https://github.com/pgadmin-org/pgadmin4/issues/6730>`_ -  Fix an issue where changing the password shows success but the new password is not working.
+  | `Issue #6738 <https://github.com/pgadmin-org/pgadmin4/issues/6738>`_ -  Fix an issue where login form doesn't appear if internal auth source is removed.
+  | `Issue #6764 <https://github.com/pgadmin-org/pgadmin4/issues/6764>`_ -  Fix a security related issue where an authenticated user can run remote command using validate binary path API (CVE-2023-5002).
@@ -0,0 +1,51 @@
+***********
+Version 7.8
+***********
+
+Release date: 2023-10-19
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v7.7.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 12, 13, 14, 15, and 16
+
+**EDB Advanced Server**: 12, 13, 14 and 15
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 16.0
+
+
+New features
+************
+
+  | `Issue #640 <https://github.com/pgadmin-org/pgadmin4/issues/640>`_ -    Add support for foreign table's new functionality for PG 11 and above.
+  | `Issue #6229 <https://github.com/pgadmin-org/pgadmin4/issues/6229>`_ -  Allow setting custom username for shared servers, with default as username of server being shared.
+  | `Issue #6373 <https://github.com/pgadmin-org/pgadmin4/issues/6373>`_ -  Add 'GENERATED ALWAYS AS..' option while creating column constraints for Foreign Table.
+  | `Issue #6797 <https://github.com/pgadmin-org/pgadmin4/issues/6797>`_ -  GUI representation of the system's activity using the 'system_stats' extension.
+  | `Issue #6802 <https://github.com/pgadmin-org/pgadmin4/issues/6802>`_ -  Added 'load_balance_hosts' connection string parameter for PG 16 and above.
+
+Housekeeping
+************
+
+  | `Issue #6782 <https://github.com/pgadmin-org/pgadmin4/issues/6782>`_ -  Use PG16 as the default PostgreSQL version.
+
+Bug fixes
+*********
+
+  | `Issue #4995 <https://github.com/pgadmin-org/pgadmin4/issues/4995>`_ -  Fixed an issue in ERD tool where the downloaded images have a few links cut.
+  | `Issue #5749 <https://github.com/pgadmin-org/pgadmin4/issues/5749>`_ -  Fixed an issue where user was not able to assign new/old columns as primary key once column with primary key is deleted.
+  | `Issue #6285 <https://github.com/pgadmin-org/pgadmin4/issues/6285>`_ -  Add support for setting prepare threshold in server connection.
+  | `Issue #6482 <https://github.com/pgadmin-org/pgadmin4/issues/6482>`_ -  Fixed an issue where the wrong message "Current database has been moved or renamed" is displayed when debugging any function.
+  | `Issue #6538 <https://github.com/pgadmin-org/pgadmin4/issues/6538>`_ -  Fixed an issue where Processes tab displays wrong server name in some scenario.
+  | `Issue #6579 <https://github.com/pgadmin-org/pgadmin4/issues/6579>`_ -  Fix an issue where global/native keyboard shortcuts are not working when any cell of data output grid has focus.
+  | `Issue #6666 <https://github.com/pgadmin-org/pgadmin4/issues/6666>`_ -  Fixed query history slowness issue by storing query only for those having certain threshold max length.
+  | `Issue #6674 <https://github.com/pgadmin-org/pgadmin4/issues/6674>`_ -  Fix an issue where foreign table column name becomes "none" if the user changes any column data type.
+  | `Issue #6718 <https://github.com/pgadmin-org/pgadmin4/issues/6718>`_ -  Pin the cryptography version to fix PyO3 modules initialisation error.
+  | `Issue #6790 <https://github.com/pgadmin-org/pgadmin4/issues/6790>`_ -  Ensure that the backup works properly for PG 16 on the latest docker image.
+  | `Issue #6799 <https://github.com/pgadmin-org/pgadmin4/issues/6799>`_ -  Fixed an issue where the user is unable to select objects on the backup dialog due to tree flickering.
+  | `Issue #6836 <https://github.com/pgadmin-org/pgadmin4/issues/6836>`_ -  Fixed an issue where non-super PostgreSQL users are not able to terminate their own connections from dashboard.
+  | `Issue #6851 <https://github.com/pgadmin-org/pgadmin4/issues/6851>`_ -  Fix an issue where scale in columns is not allowed to have value as 0 or below.
+  | `Issue #6858 <https://github.com/pgadmin-org/pgadmin4/issues/6858>`_ -  Fix an issue in graphical explain plan where query tool crashes when the plan has parallel workers details and sort node is clicked for details.
+  | `Issue #6865 <https://github.com/pgadmin-org/pgadmin4/issues/6865>`_ -  Fix an issue where user login is not working if username/email contains single quote in server mode.
@@ -0,0 +1,59 @@
+***********
+Version 8.0
+***********
+
+Release date: 2023-11-23
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v7.8.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 12, 13, 14, 15, and 16
+
+**EDB Advanced Server**: 12, 13, 14, 15, and 16
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 16.0
+
+
+New features
+************
+
+  | `Issue #2821 <https://github.com/pgadmin-org/pgadmin4/issues/2821>`_ -  Have close buttons on individual panel tabs instead of common.
+  | `Issue #4733 <https://github.com/pgadmin-org/pgadmin4/issues/4733>`_ -  Allow closing all the tabs, including SQL and Properties.
+  | `Issue #5394 <https://github.com/pgadmin-org/pgadmin4/issues/5394>`_ -  Changes in the context menu on panel tabs - Add close, close all and close others menu items.
+
+Housekeeping
+************
+
+  | `Issue #6441 <https://github.com/pgadmin-org/pgadmin4/issues/6441>`_ -  Update app bundle built to use notarytool instead of altool.
+  | `Issue #6479 <https://github.com/pgadmin-org/pgadmin4/issues/6479>`_ -  Replace the current layout library wcDocker with ReactJS based rc-dock.
+  | `Issue #6850 <https://github.com/pgadmin-org/pgadmin4/issues/6850>`_ -  Upgrade Flask, Werkzeug and other modules depends on the latest version of Flask.
+
+Bug fixes
+*********
+
+  | `Issue #2986 <https://github.com/pgadmin-org/pgadmin4/issues/2986>`_ -  Fix an issue where the scroll position of panels was not remembered on Firefox.
+  | `Issue #5770 <https://github.com/pgadmin-org/pgadmin4/issues/5770>`_ -  Add DROP SQL for foreign keys in SQL generated by ERD when using WITH DROP option.
+  | `Issue #5807 <https://github.com/pgadmin-org/pgadmin4/issues/5807>`_ -  Fixed an issue where psql was not taking the role used to connect in server properties.
+  | `Issue #6017 <https://github.com/pgadmin-org/pgadmin4/issues/6017>`_ -  Fixed an issue where Geometry Viewer renders geometry incorrectly after trying to view 3D or non-4326 SRID geometry.
+  | `Issue #6459 <https://github.com/pgadmin-org/pgadmin4/issues/6459>`_ -  Fix the sorting of size on the statistics panel.
+  | `Issue #6487 <https://github.com/pgadmin-org/pgadmin4/issues/6487>`_ -  Fixed restoration of query tool database connection after dropping and re-creating the database with the same name.
+  | `Issue #6602 <https://github.com/pgadmin-org/pgadmin4/issues/6602>`_ -  Fix an issue where the default server-group is being deleted if the load-server json file contains no servers.
+  | `Issue #6720 <https://github.com/pgadmin-org/pgadmin4/issues/6720>`_ -  Fix an issue of the incorrect format (no indent) of SQL stored functions/procedures.
+  | `Issue #6769 <https://github.com/pgadmin-org/pgadmin4/issues/6769>`_ -  Server config information in the about dialog should be only visible to admin users.
+  | `Issue #6784 <https://github.com/pgadmin-org/pgadmin4/issues/6784>`_ -  Fixed an issue where Schema Diff does not work when the user language is set to any language other than English in Preferences.
+  | `Issue #6817 <https://github.com/pgadmin-org/pgadmin4/issues/6817>`_ -  Fixed the query generated when creating subscription where copy_data parameter was missing.
+  | `Issue #6820 <https://github.com/pgadmin-org/pgadmin4/issues/6820>`_ -  Ensure backup/restore/maintenance works with invalid pgpass file parameter.
+  | `Issue #6835 <https://github.com/pgadmin-org/pgadmin4/issues/6835>`_ -  Fix an issue where OAUTH_ADDITIONAL_CLAIMS does not recognise AzureAD with > 150 groups.
+  | `Issue #6840 <https://github.com/pgadmin-org/pgadmin4/issues/6840>`_ -  Fixed circular import error occurring while deploying cloud PostgreSQL instance from pgAdmin.
+  | `Issue #6874 <https://github.com/pgadmin-org/pgadmin4/issues/6874>`_ -  Fix an issue where the browser window stuck on spinning with an Oauth user without email.
+  | `Issue #6875 <https://github.com/pgadmin-org/pgadmin4/issues/6875>`_ -  Fix an issue where import/export data is not working for shared servers.
+  | `Issue #6877 <https://github.com/pgadmin-org/pgadmin4/issues/6877>`_ -  Remove the max length of 255 from password exec command in server configuration dialog.
+  | `Issue #6884 <https://github.com/pgadmin-org/pgadmin4/issues/6884>`_ -  Remove gettext from empty strings in the title of the storage graph.
+  | `Issue #6902 <https://github.com/pgadmin-org/pgadmin4/issues/6902>`_ -  Fixed an issue where the change server password is not working in desktop mode.
+  | `Issue #6904 <https://github.com/pgadmin-org/pgadmin4/issues/6904>`_ -  Fix a crash issue occurring when debugging a function with arguments when using pgAdmin with external config database.
+  | `Issue #6920 <https://github.com/pgadmin-org/pgadmin4/issues/6920>`_ -  Fix an issue in ERD tool where SQL generated is missing columns for the table.
+  | `Issue #6934 <https://github.com/pgadmin-org/pgadmin4/issues/6934>`_ -  Clear the password field in the config database on clear saved server password.
+  | `Issue #6962 <https://github.com/pgadmin-org/pgadmin4/issues/6962>`_ -  Fixed an issue where the data type of the array type was not visible for the column in the Foreign Table dialog.
@@ -0,0 +1,51 @@
+***********
+Version 8.1
+***********
+
+Release date: 2023-12-14
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v8.0.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 12, 13, 14, 15, and 16
+
+**EDB Advanced Server**: 12, 13, 14, 15, and 16
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 16.0
+
+
+New features
+************
+
+  | `Issue #4580 <https://github.com/pgadmin-org/pgadmin4/issues/4580>`_ -  Add support for generating ERD for a schema.
+  | `Issue #6854 <https://github.com/pgadmin-org/pgadmin4/issues/6854>`_ -  Add support for creating a function with custom return type.
+
+Housekeeping
+************
+
+  | `Issue #6991 <https://github.com/pgadmin-org/pgadmin4/issues/6991>`_ -  Fixed several accessibility-related issues for enhanced usability.
+
+Bug fixes
+*********
+
+  | `Issue #5471 <https://github.com/pgadmin-org/pgadmin4/issues/5471>`_ -  Ensure focus is not changed to ssh tunnel password input when user explicitly focus on server password input.
+  | `Issue #6095 <https://github.com/pgadmin-org/pgadmin4/issues/6095>`_ -  Provide a way to bypass the SSL cert verification for OAuth2 provider.
+  | `Issue #6488 <https://github.com/pgadmin-org/pgadmin4/issues/6488>`_ -  Fixed an issue where database name was missing in an error message if name contains any special characters.
+  | `Issue #6717 <https://github.com/pgadmin-org/pgadmin4/issues/6717>`_ -  Ensure that indexes created by constraints are visible in the object explorer when "Show system objects" is enabled.
+  | `Issue #6803 <https://github.com/pgadmin-org/pgadmin4/issues/6803>`_ -  Fixed an issue where reading process logs throws an error when DATA_DIR is moved to a networked drive.
+  | `Issue #6814 <https://github.com/pgadmin-org/pgadmin4/issues/6814>`_ -  Remove the 'Close Window' submenu specifically for OSX to prevent unintended closure of the entire application.
+  | `Issue #6842 <https://github.com/pgadmin-org/pgadmin4/issues/6842>`_ -  Rename all references of 'Execute query' to 'Execute script' to be more relevant.
+  | `Issue #6887 <https://github.com/pgadmin-org/pgadmin4/issues/6887>`_ -  Fixed an issue where syntax error was not highlighting in query tool.
+  | `Issue #6921 <https://github.com/pgadmin-org/pgadmin4/issues/6921>`_ -  Fixed an issue where on entering full screen, the option label is not changed to 'Exit Full Screen' in desktop mode.
+  | `Issue #6950 <https://github.com/pgadmin-org/pgadmin4/issues/6950>`_ -  Ensure that the Authentication Source in the drop-down of the UserManagement dialog aligns with the entries specified for AUTHENTICATION_SOURCES in the configuration file.
+  | `Issue #6958 <https://github.com/pgadmin-org/pgadmin4/issues/6958>`_ -  Reverse engineer serial columns when generating ERD for database/table.
+  | `Issue #6964 <https://github.com/pgadmin-org/pgadmin4/issues/6964>`_ -  Fixed an issue where the Schema was not visible in the dropdown for table properties or when creating a new table.
+  | `Issue #6968 <https://github.com/pgadmin-org/pgadmin4/issues/6968>`_ -  Fixed an issue where option key was not registering in PSQL tool.
+  | `Issue #6984 <https://github.com/pgadmin-org/pgadmin4/issues/6984>`_ -  Fixed an issue where the Vacuum option INDEX_CLEANUP have an incorrect value ('AUTO') for database versions < 14.
+  | `Issue #6989 <https://github.com/pgadmin-org/pgadmin4/issues/6989>`_ -  Fixed an issue where the pgAdmin page went blank when clicking the delete button in the User Management dialog.
+  | `Issue #7000 <https://github.com/pgadmin-org/pgadmin4/issues/7000>`_ -  Ensure that correct timezone is set for Docker deployments.
+  | `Issue #7011 <https://github.com/pgadmin-org/pgadmin4/issues/7011>`_ -  Fixed an issue where all rows and filter rows buttons of object explorer toolbar were disabled for views and other supported nodes.
+  | `Issue #7017 <https://github.com/pgadmin-org/pgadmin4/issues/7017>`_ -  Fixed an issue where schema diff tool is not loading preferences on start.
@@ -0,0 +1,50 @@
+***********
+Version 8.2
+***********
+
+Release date: 2024-01-11
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v8.1.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 12, 13, 14, 15, and 16
+
+**EDB Advanced Server**: 12, 13, 14, 15, and 16
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 16.0
+
+
+New features
+************
+
+  | `Issue #2483 <https://github.com/pgadmin-org/pgadmin4/issues/2483>`_ -  Administer pgAdmin Users and Preferences Using the Command Line Interface (CLI).
+  | `Issue #5908 <https://github.com/pgadmin-org/pgadmin4/issues/5908>`_ -  Allow users to convert View/Edit table into a Query tool to enable editing the SQL generated.
+  | `Issue #6085 <https://github.com/pgadmin-org/pgadmin4/issues/6085>`_ -  Added copy server support, allowing the duplication of existing servers with the option to make certain modifications.
+  | `Issue #7016 <https://github.com/pgadmin-org/pgadmin4/issues/7016>`_ -  Added keep-alive support for SSH sessions when connecting to a PostgreSQL server via an SSH tunnel.
+
+Housekeeping
+************
+
+  | `Issue #6926 <https://github.com/pgadmin-org/pgadmin4/issues/6926>`_ -  Ensure that eventlet's subprocess should be used following the resolution of an issue with Python 3.12 by eventlet.
+
+Bug fixes
+*********
+
+  | `Issue #6193 <https://github.com/pgadmin-org/pgadmin4/issues/6193>`_ -  Fixed an issue where query tool title did not change after "Save As" until any new change is made.
+  | `Issue #6781 <https://github.com/pgadmin-org/pgadmin4/issues/6781>`_ -  Fixed an issue where export servers was not adding extension if not specified.
+  | `Issue #6815 <https://github.com/pgadmin-org/pgadmin4/issues/6815>`_ -  Fixed an issue where pgAdmin imports servers to the wrong accounts for the external authentication.
+  | `Issue #7002 <https://github.com/pgadmin-org/pgadmin4/issues/7002>`_ -  Fixed an issue where an error occurred in the SQL tab when using an extended index(pgroonga).
+  | `Issue #7041 <https://github.com/pgadmin-org/pgadmin4/issues/7041>`_ -  Fixed an issue where changes done to a node using edit dialog are not reflecting on the properties tab if the properties tab is active.
+  | `Issue #7059 <https://github.com/pgadmin-org/pgadmin4/issues/7059>`_ -  Fixed an issue where DB Restrictions were not visible on the server dialog.
+  | `Issue #7061 <https://github.com/pgadmin-org/pgadmin4/issues/7061>`_ -  Ensure that the 'Dbo' schema is displayed as a regular schema rather than a system catalog schema.
+  | `Issue #7062 <https://github.com/pgadmin-org/pgadmin4/issues/7062>`_ -  Introduce LDAP configuration parameter LDAP_IGNORE_MALFORMED_SCHEMA to ignore fetching schema from the LDAP server.
+  | `Issue #7064 <https://github.com/pgadmin-org/pgadmin4/issues/7064>`_ -  Fixed an error-'amname' when generating ERD for database containing partition tables.
+  | `Issue #7066 <https://github.com/pgadmin-org/pgadmin4/issues/7066>`_ -  Fixed an issue where object explorer last tree state was not saving.
+  | `Issue #7070 <https://github.com/pgadmin-org/pgadmin4/issues/7070>`_ -  Fixed an issue where pgAgent job schedule dialog is not opening for edit.
+  | `Issue #7078 <https://github.com/pgadmin-org/pgadmin4/issues/7078>`_ -  Fixed an issue where user is not able to cancel or terminate active queries from dashboard.
+  | `Issue #7082 <https://github.com/pgadmin-org/pgadmin4/issues/7082>`_ -  Fixed browser autocomplete related issues on pgAdmin authentication related pages.
+  | `Issue #7091 <https://github.com/pgadmin-org/pgadmin4/issues/7091>`_ -  Fixed an issue where auto commit/rollback setting not persisting across query tool connection change.
+  | `Issue #7104 <https://github.com/pgadmin-org/pgadmin4/issues/7104>`_ -  Fixed an issue where Schema Diff not generating difference for missing columns.
@@ -44,6 +44,9 @@ Use the fields in the *General* tab to identify the server:
  Please note that once the server is shared, it's icon is changed in the
  object explorer.

+* Use the *Shared Username* field to fill the username of the shared server
+  connection. By default, it will take the username of the server being shared.
+
 * Provide a comment about the server in the *Comments* field.

 Click the *Connection* tab to continue.
@@ -178,6 +181,10 @@ not be able to connect directly.
  password for future use. Use
  :ref:`Clear SSH Tunnel Password <clear_saved_passwords>` to remove the saved
  password.
+* Use the *Keep alive* field to specify interval in seconds defining the period
+  in which, if no data was sent over the connection, a ‘keepalive’ packet will
+  be sent (and ignored by the remote host). This can be useful to keep
+  connections alive over a NAT. You can set to 0 for disable keepalive.


 Click the *Advanced* tab to continue.
@@ -203,6 +210,12 @@ Use the fields in the *Advanced* tab to configure a connection:
  the password will not expire until your pgAdmin session does.
  Zero means the command will be executed for each new connection or reconnection that is made.
  If the generated password is not valid indefinitely, set this value to slightly before it will expire.
+* Use the *Prepare threshold* field to specify the number of times a query is
+  executed before it is prepared. If it is set to 0, every query is prepared
+  the first time it is executed. If it is set to blank, prepared statements are disabled
+  on the connection. This is particularly useful with external connection poolers,
+  such as PgBouncer, which is not compatible with prepared statements. Set this to
+  blank in such cases.

 .. note:: The password file option is only supported when pgAdmin is using libpq
    v10.0 or later to connect to the server.
@@ -6,7 +6,7 @@

 Use the *Subscription* dialog to create a subscription. A subscription defines the connection to another database and set of publications (one or more) to which it wants to subscribe.

-The *subscription* dialog organizes the development of a subscription through the following dialog tabs: *General*, *Connection* and *With*. The *SQL* tab displays the SQL code generated by dialog selections.
+The *subscription* dialog organizes the development of a subscription through the following dialog tabs: *General*, *Connection*, *SSL* and *With*. The *SQL* tab displays the SQL code generated by dialog selections.

 .. image:: images/subscription_general.png
    :alt: Subscription dialog general tab
@@ -83,7 +83,11 @@ icon that is located to the right of each of the following fields.

 Click the *With* tab to continue.

-.. image:: images/subscription_with.png
+.. image:: images/subscription_with_1.png
+    :alt: Subscription dialog with tab
+    :align: center
+
+.. image:: images/subscription_with_2.png
    :alt: Subscription dialog with tab
    :align: center

@@ -95,6 +99,13 @@ Use the *With* tab to define some parameters for a subscription:
 * The *Connect?* specifies whether the CREATE SUBSCRIPTION should connect to the publisher at all. By default, it is set to *Yes*. Setting this to *No* will change default values of enabled, create_slot and copy_data to *No*.
 * Use the *Slot Name* field to specify the name of the replication slot to use. By default, it uses the name of the subscription for the slot name.
 * Use the *Synchronous commit* field to override the synchronous_commit setting. By default, it is set to *off*. It is safe to use off for logical replication: If the subscriber loses transactions because of missing synchronization, the data will be sent again from the publisher.
+* Use the *Streaming* field to specify whether to enable streaming of in-progress transactions for this subscription. The default value is *off*, meaning all transactions are fully decoded on the publisher and only then sent to the subscriber as a whole. This option is available only on PostgreSQL 14 and above.
+* Use the *Binary?* switch to specify whether the subscription will request the publisher to send the data in binary format (as opposed to text). The default is *false*. This option is available only on PostgreSQL 14 and above.
+* Use the *Two phase?* switch to specify whether two-phase commit is enabled for this subscription. The default is *false*. This option is available only on PostgreSQL 15 and above.
+* Use the *Disable on error?* switch to specify whether the subscription should be automatically disabled if any errors are detected by subscription workers during data replication from the publisher. The default is *false*. This option is available only on PostgreSQL 15 and above.
+* Move the *Run as owner?* switch to *true* position to specify all replication actions are performed as the subscription owner. If *false*, replication workers will perform actions on each table as the owner of that table. The default is *false*. This option is available only on PostgreSQL 16 and above.
+* Use the *Password required?* to specify whether connections to the publisher made as a result of this subscription must use password authentication. This setting is ignored when the subscription is owned by a superuser. The default is true. Only superusers can set this value to *false*. This option is available only on PostgreSQL 16 and above.
+* Use the *Origin* to specify whether the subscription will request the publisher to only send changes that don't have an origin or send changes regardless of origin. The default is *any*. This option is available only on PostgreSQL 16 and above.

 Click the *SQL* tab to continue.

@@ -394,6 +394,9 @@ Use the fields in the *Advanced* tab to define advanced features for the table:
 * Use the drop-down listbox next to *Of type* to copy the table structure from
  the specified composite type. Please note that a typed table will be dropped
  if the type is dropped (with DROP TYPE ... CASCADE).
+* Use the drop-down list box next to Access Method to specify the table access method to use to store
+  the contents for the new table; the method needs to be an access method of type TABLE. This field is optional.
+  This option is available from v12 and above.
 * Use the *Fill Factor* field to specify a fill factor for the table. The fill
  factor for a table is a percentage between 10 and 100. 100 (complete packing)
  is the default.
@@ -2,7 +2,7 @@

 html{
    background-color: #fff;
-    
+
 }

 body {
@@ -10,6 +10,7 @@ body {
    font-family: Roboto, Helvetica Neue, -apple-system, BlinkMacSystemFont, Segoe UI, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
    -webkit-font-smoothing: antialiased;
    background-color: #fff;
+    height: 100vh;
 }

 div.body {
@@ -5,9 +5,9 @@
 ****************

 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.
+the Query Tool, View/Edit Data, Search Object and the PSQL Tool. This
+toolbar is visible on the Object explorer panel. Buttons get enabled/disabled based on
+the selected object node.

 .. image:: /images/toolbar.png
    :alt: pgAdmin Toolbar
@@ -4,8 +4,8 @@
 `Tree Control`:index:
 *********************

-The left pane of the main window displays a tree control (the *pgAdmin* tree
-control) that provides access to the objects that reside on a server.
+The left pane of the main window displays a tree control (Object explorer)
+that provides access to the objects that reside on a server.

 .. image:: /images/main_left_pane.png
    :alt: object explorer panel
@@ -75,3 +75,142 @@ users, but otherwise have the same capabilities as those with the *User* role.
 * Click the *Help* button (?) to access online help.
 * Click the *Close* button to save work. You will be prompted to return to the
  dialog if your selections cannot be saved.
+
+
+Using 'setup.py' command line script
+####################################
+
+.. note:: To manage users using ``setup.py`` script, 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.
+
+        When using PIP wheel package to install pgadmin, all the commands can be used
+        without Python interpreter.
+
+        Some of the examples:
+        pgadmin4-cli add-user user1@gmail.com password --role 1
+        pgadmin4-cli get-prefs
+
+Manage Users
+*************
+
+Add User
+*********
+
+To add user, invoke ``setup.py`` with ``add-user`` command line option, followed by
+email and password. role and active will be optional fields.
+
+.. code-block:: bash
+
+    /path/to/python /path/to/setup.py add-user user1@gmail.com password
+
+    # to specify a role, admin and non-admin users:
+
+    /path/to/python /path/to/setup.py add-user user1@gmail.com password --admin
+    /path/to/python /path/to/setup.py add-user user1@gmail.com password --nonadmin
+
+    # to specify user's status
+
+    /path/to/python /path/to/setup.py add-user user1@gmail.com password --active
+    /path/to/python /path/to/setup.py add-user user1@gmail.com password --inactive
+
+Add External User
+*****************
+
+To add external authentication user, invoke ``setup.py`` with ``add-external-user`` command line option,
+followed by email, password and authentication source. email, role and status will be optional fields.
+
+.. code-block:: bash
+
+    /path/to/python /path/to/setup.py add-external-user user1@gmail.com ldap
+
+    # to specify an email:
+
+    /path/to/python /path/to/setup.py add-external-user ldapuser ldap --email user1@gmail.com
+
+    # to specify a role, admin and non-admin user:
+
+    /path/to/python /path/to/setup.py add-external-user ldapuser ldap  --admin
+    /path/to/python /path/to/setup.py add-external-user ldapuser ldap  --nonadmin
+
+    # to specify user's status
+
+    /path/to/python /path/to/setup.py add-external-user user1@gmail.com ldap --active
+    /path/to/python /path/to/setup.py add-external-user user1@gmail.com ldap --inactive
+
+Update User
+***********
+
+To update user, invoke ``setup.py`` with ``update-user`` command line option, followed by
+email address. password, role and active are updatable fields.
+
+.. code-block:: bash
+
+    /path/to/python /path/to/setup.py update-user user1@gmail.com --password new-password
+
+    # to specify a role, admin and non-admin user:
+
+    /path/to/python /path/to/setup.py update-user user1@gmail.com password --role --admin
+    /path/to/python /path/to/setup.py update-user user1@gmail.com password --role --nonadmin
+
+    # to specify user's status
+
+   /path/to/python /path/to/setup.py update-user user1@gmail.com password --active
+   /path/to/python /path/to/setup.py update-user user1@gmail.com password --inactive
+
+Update External User
+********************
+
+To update the external user, invoke ``setup.py`` with ``update-external-user`` command line option,
+followed by username and auth source. email, password, role and active are updatable fields.
+
+.. code-block:: bash
+
+    # to change email address:
+
+    /path/to/python /path/to/setup.py update-external-user ldap ldapuser --email newemail@gmail.com
+
+    # to specify a role, admin and non-admin user:
+
+    /path/to/python /path/to/setup.py update-user user1@gmail.com password --role --admin
+    /path/to/python /path/to/setup.py update-user user1@gmail.com password --role --nonadmin
+
+    # to change user's status
+
+   /path/to/python /path/to/setup.py update-user ldap ldapuser --active
+   /path/to/python /path/to/setup.py update-user ldap ldapuser --inactive
+
+Delete User
+***********
+
+To delete the user, invoke ``setup.py`` with ``delete-user`` command line option, followed by
+username and auth_source. For Internal users, email adress will be used instead of username.
+
+.. code-block:: bash
+
+    /path/to/python /path/to/setup.py delete-user user1@gmail.com --auth-source internal
+    /path/to/python /path/to/setup.py delete-user ldapuser --auth-source ldap
+
+
+Get User
+********
+
+To get the user details, invoke ``setup.py`` with ``get-users`` command line option, followed by
+username/email address.
+
+.. code-block:: bash
+
+    # to list all the users:
+    /path/to/python /path/to/setup.py get-users
+
+    # to get the user's details:
+    /path/to/python /path/to/setup.py get-users --username user1@gmail.com
+
+
+Output
+******
+
+Each command output can be seen in the json format too by adding --json command line option.
@@ -19,19 +19,18 @@ CA_FILE = '/etc/ssl/certs/ca-certificates.crt'
 LOG_FILE = '/dev/null'
 HELP_PATH = '../../docs'
 DEFAULT_BINARY_PATHS = {
-        'pg': '/usr/local/pgsql-15',
+        'pg': '/usr/local/pgsql-16',
+        'pg-16': '/usr/local/pgsql-16',
        'pg-15': '/usr/local/pgsql-15',
        'pg-14': '/usr/local/pgsql-14',
        'pg-13': '/usr/local/pgsql-13',
-        'pg-12': '/usr/local/pgsql-12',
-        'pg-11': '/usr/local/pgsql-11',
-        'pg-10': '/usr/local/pgsql-10'
+        'pg-12': '/usr/local/pgsql-12'
 }
 EOF

    # This is a bit kludgy, but necessary as the container uses BusyBox/ash as
    # it's shell and not bash which would allow a much cleaner implementation
-    for var in $(env | grep PGADMIN_CONFIG_ | cut -d "=" -f 1); do
+    for var in $(env | grep "^PGADMIN_CONFIG_" | cut -d "=" -f 1); do
        # shellcheck disable=SC2086
        # shellcheck disable=SC2046
        echo ${var#PGADMIN_CONFIG_} = $(eval "echo \$$var") >> /pgadmin4/config_distro.py
@@ -71,9 +70,9 @@ if [ ! -f /var/lib/pgadmin/pgadmin4.db ]; then
        # When running in Desktop mode, no user is created
        # so we have to import servers anonymously
        if [ "${PGADMIN_CONFIG_SERVER_MODE}" = "False" ]; then
-            /venv/bin/python3 /pgadmin4/setup.py --load-servers "${PGADMIN_SERVER_JSON_FILE}"
+            /venv/bin/python3 /pgadmin4/setup.py load-servers "${PGADMIN_SERVER_JSON_FILE}"
        else
-            /venv/bin/python3 /pgadmin4/setup.py --load-servers "${PGADMIN_SERVER_JSON_FILE}" --user "${PGADMIN_DEFAULT_EMAIL}"
+            /venv/bin/python3 /pgadmin4/setup.py load-servers "${PGADMIN_SERVER_JSON_FILE}" --user "${PGADMIN_DEFAULT_EMAIL}"
        fi
    fi
 fi
@@ -68,6 +68,7 @@ _create_python_virtualenv() {

    # Make sure we have the wheel package present, as well as the latest pip
    pip3 install --upgrade pip
+    pip3 install setuptools
    pip3 install wheel

    # Install the requirements
@@ -86,8 +87,7 @@ _create_python_virtualenv() {

    # Figure out some paths for use when completing the venv
    # Use "python3" here as we want the venv path
-    PYMODULES_PATH=$(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
-    DIR_PYMODULES_PATH=$(dirname "${PYMODULES_PATH}")
+    DIR_PYMODULES_PATH=$(python3 -c "from sysconfig import get_path; print(get_path('platstdlib'))")

    # Use {SYSTEM_PYTHON_PATH} here as we want the system path
    if [ "$1" == "debian" ]; then
@@ -224,7 +224,7 @@ _copy_code() {
    cp "${SOURCEDIR}/pkg/linux/config_distro.py" "${SERVERROOT}/usr/${APP_NAME}/web/"
    cd "${SERVERROOT}/usr/${APP_NAME}/web/" || exit
    rm -f pgadmin4.db config_local.*
-    rm -rf karma.conf.js package.json node_modules/ regression/ tools/ pgadmin/static/js/generated/.cache
+    rm -rf jest.config.js babel.* package.json node_modules/ regression/ tools/ pgadmin/static/js/generated/.cache
    find . -name "tests" -type d -print0 | xargs -0 rm -rf
    find . -name "feature_tests" -type d -print0 | xargs -0 rm -rf
    find . -name "__pycache__" -type d -print0 | xargs -0 rm -rf
@@ -72,7 +72,7 @@ fi

 # Run setup script first:
 echo "Creating configuration database..."
-if ! /usr/pgadmin4/venv/bin/python3 /usr/pgadmin4/web/setup.py;
+if ! /usr/pgadmin4/venv/bin/python3 /usr/pgadmin4/web/setup.py setup-db;
 then
 	echo "Error setting up server mode. Please examine the output above."
 	exit 1
@@ -266,8 +266,8 @@ _complete_bundle() {
    sed -i '' "s/%APPVER%/${APP_LONG_VERSION}/g" "${BUNDLE_DIR}/Contents/Info.plist"
    sed -i '' "s/%APPID%/org.pgadmin.pgadmin4/g" "${BUNDLE_DIR}/Contents/Info.plist"
    for FILE in "${BUNDLE_DIR}"/Contents/Resources/*.lproj/InfoPlist.strings; do
-        sed -i '' 's/CFBundleGetInfoString =.*/CFBundleGetInfoString = "Copyright (C) 2013 - 2023, The pgAdmin Development Team";/g' "${FILE}"
-        sed -i '' 's/NSHumanReadableCopyright =.*/NSHumanReadableCopyright = "Copyright (C) 2013 - 2023, The pgAdmin Development Team";/g' "${FILE}"
+        sed -i '' 's/CFBundleGetInfoString =.*/CFBundleGetInfoString = "Copyright (C) 2013 - 2024, The pgAdmin Development Team";/g' "${FILE}"
+        sed -i '' 's/NSHumanReadableCopyright =.*/NSHumanReadableCopyright = "Copyright (C) 2013 - 2024, The pgAdmin Development Team";/g' "${FILE}"
        echo CFBundleDisplayName = \""${APP_NAME}"\"\; >> "${FILE}"
    done

@@ -298,7 +298,7 @@ _complete_bundle() {
    cp -r "${SOURCE_DIR}/web" "${BUNDLE_DIR}/Contents/Resources/"
    cd "${BUNDLE_DIR}/Contents/Resources/web" || exit
    rm -f pgadmin4.db config_local.*
-    rm -rf karma.conf.js package.json .yarn* yarn* .editorconfig .eslint* node_modules/ regression/ tools/ pgadmin/static/js/generated/.cache
+    rm -rf jest.config.js babel.* package.json .yarn* yarn* .editorconfig .eslint* node_modules/ regression/ tools/ pgadmin/static/js/generated/.cache
    find . -name "tests" -type d -print0 | xargs -0 rm -rf
    find . -name "feature_tests" -type d -print0 | xargs -0 rm -rf
    find . -name "__pycache__" -type d -print0 | xargs -0 rm -rf
@@ -432,59 +432,32 @@ _notarize_pkg() {
        return
    fi

-    # Notarize the package. Try three times, to allow for upload issues
-    for i in {1..3}; do
-        echo "Uploading DMG for notarisation (attempt ${i} of 3)..."
-        STATUS=$(xcrun altool --notarize-app \
-                              -f "${DMG_NAME}" \
-                              --asc-provider "${DEVELOPER_NAME}" \
-                              --primary-bundle-id org.pgadmin.pgadmin4 \
-                              -u "${DEVELOPER_USER}" \
-                              -p "${DEVELOPER_ASP}" 2>&1)
-        RETVAL=$?
+    echo "Uploading DMG for Notarization ..."
+    STATUS=$(xcrun notarytool submit "${DMG_NAME}" \
+                              --team-id "${DEVELOPER_TEAM_ID}" \
+                              --apple-id "${DEVELOPER_USER}" \
+                              --password "${DEVELOPER_ASP}" 2>&1)

-        if [ ${RETVAL} != 0 ]; then
-            echo "Attempt ${i} failure: ${STATUS}"
-        else
-            # Success!
-            break;
-        fi
-    done
+    # Get the submission ID
+    SUBMISSION_ID=$(echo "${STATUS}" | awk -F ': ' '/id:/ { print $2; exit; }')
+    echo "Notarization submission ID: ${SUBMISSION_ID}"

-    # print error if above command fails
-    if [ ${RETVAL} != 0 ]; then
-        echo "Notarization failed."
-        exit 1
-    fi
-
-    # Get the request ID
-    REQUEST_UUID=$(echo "${STATUS}" | awk '/RequestUUID/ { print $NF; }')
-    echo "Notarization request ID: ${REQUEST_UUID}"
-
-    # Now we need to wait for the results. Try 60 times.
-    for i in {1..60}; do
-        echo "Waiting 30 seconds..."
-        sleep 30
-
-        echo "Requesting notarisation result (attempt ${i} of 60)..."
-        REQUEST_STATUS=$(xcrun altool --notarization-info "${REQUEST_UUID}" \
-                                      --username "${DEVELOPER_USER}" \
-                                      --password "${DEVELOPER_ASP}" 2>&1 | \
-                         awk -F ': ' '/Status:/ { print $2; }' )
-
-        if [[ "${REQUEST_STATUS}" == "success" ]]; then
-            break
-        fi
-    done
-
-    # Print status information
-    xcrun altool --notarization-info "${REQUEST_UUID}" \
-                 --username "${DEVELOPER_USER}" \
+    echo "Waiting for Notarization to be completed ..."
+    xcrun notarytool wait "${SUBMISSION_ID}" \
+                 --team-id "${DEVELOPER_TEAM_ID}" \
+                 --apple-id "${DEVELOPER_USER}" \
                 --password "${DEVELOPER_ASP}"

-    if [[ "${REQUEST_STATUS}" != "success" ]]; then
-          echo "Notarization failed."
-          exit 1
+    # Print status information
+    REQUEST_STATUS=$(xcrun notarytool info "${SUBMISSION_ID}" \
+                 --team-id "${DEVELOPER_TEAM_ID}" \
+                 --apple-id "${DEVELOPER_USER}" \
+                 --password "${DEVELOPER_ASP}" 2>&1 | \
+            awk -F ': ' '/status:/ { print $2; }')
+
+    if [[ "${REQUEST_STATUS}" != "Accepted" ]]; then
+        echo "Notarization failed."
+        exit 1
    fi

    # Staple the notarization
@@ -10,7 +10,7 @@
 \fs22 \
 \

-\f1\i Copyright (C) 2013 - 2023, The pgAdmin Development Team
+\f1\i Copyright (C) 2013 - 2024, The pgAdmin Development Team
 \f0\i0 \
 \
 Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies.\
@@ -1,6 +1,6 @@
 # In order to enable notarization of the Mac Appbundle, copy this file to
 # notarization.conf, and edit the values below to reflect your Apple
-# Developer User ID, app-specific password and Provider Shortname.
+# Developer User ID, app-specific password and Team ID.
 #
 # You can use the following command to see the available shortnames for your
 # Apple Developer ID (substituting the appropriate username/password):
@@ -9,4 +9,4 @@

 DEVELOPER_USER=user@example.com
 DEVELOPER_ASP=1234-abcd-5678-efgh
-DEVELOPER_NAME=MyCompany
+DEVELOPER_TEAM_ID=MyTeamID
@@ -4,7 +4,7 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2023, The pgAdmin Development Team
+# Copyright (C) 2013 - 2024, The pgAdmin Development Team
 # This software is released under the PostgreSQL Licence
 #
 #########################################################################
@@ -2,7 +2,7 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2023, The pgAdmin Development Team
+# Copyright (C) 2013 - 2024, The pgAdmin Development Team
 # This software is released under the PostgreSQL Licence
 #
 ##########################################################################
@@ -100,7 +100,8 @@ setup(
    },

    entry_points={
-        'console_scripts': ['pgadmin4=pgadmin4.pgAdmin4:main'],
+        'console_scripts': ['pgadmin4=pgadmin4.pgAdmin4:main',
+                            'pgadmin4-cli=pgadmin4.setup:main'],
    },

 )
@@ -4,7 +4,7 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2023, The pgAdmin Development Team
+# Copyright (C) 2013 - 2024, The pgAdmin Development Team
 # This software is released under the PostgreSQL Licence
 #
 #########################################################################
@@ -20,7 +20,7 @@ AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
-DefaultDirName={autopf}\{#MyAppName}\{#MyAppVersion}
+DefaultDirName={autopf}\{#MyAppName}
 DefaultGroupName={#MyAppName}
 DisableWelcomePage=no
 DisableProgramGroupPage=auto
@@ -8,26 +8,32 @@
 #
 ###############################################################################

-Flask==2.2.*
+Flask==2.3.*; python_version > '3.7'
+Flask==2.2.*; python_version <= '3.7'
 Flask-Gravatar==0.*
 Flask-Login==0.*
 Flask-Mail==0.*
 Flask-Migrate==4.*
 greenlet==1.1.2;  python_version <= '3.10'
-Flask-SQLAlchemy==3.0.*
-Flask-WTF==1.1.1
+Flask-SQLAlchemy==3.1.*; python_version > '3.7'
+Flask-SQLAlchemy==3.0.*; python_version <= '3.7'
+Flask-WTF==1.2.*; python_version > '3.7'
+Flask-WTF==1.1.1; python_version <= '3.7'
 Flask-Compress==1.*
 Flask-Paranoid==0.*
-Flask-Babel==3.1.*
-Flask-Security-Too==5.1.*
+Flask-Babel==4.0.*; python_version > '3.7'
+Flask-Babel==3.1.*; python_version <= '3.7'
+Flask-Security-Too==5.2.*; python_version > '3.7'
+Flask-Security-Too==5.1.*; python_version <= '3.7'
 Flask-SocketIO==5.3.*
-WTForms==3.0.*
+WTForms==3.1.*; python_version > '3.7'
+WTForms==3.0.*; python_version <= '3.7'
 passlib==1.*
 pytz==2023.*
 speaklater3==1.*
 sqlparse==0.*
 psutil==5.9.*
-psycopg[c]==3.1.9
+psycopg[c]==3.1.12
 python-dateutil==2.*
 SQLAlchemy==2.*
 bcrypt==4.0.*
@@ -35,22 +41,24 @@ cryptography==41.0.*
 sshtunnel==0.*
 ldap3==2.*
 gssapi==1.8.*
-eventlet==0.33.3
+eventlet==0.34.2
 httpagentparser==1.9.*
 user-agents==2.2.0
 pywinpty==2.0.*; sys_platform=="win32"
 Authlib==1.2.*
 pyotp==2.*
 qrcode==7.*
-Pillow==9.*
-boto3==1.28.*
-botocore==1.31.*
+boto3==1.33.*
 urllib3==1.26.*
 azure-mgmt-rdbms==10.1.0
 azure-mgmt-resource==23.0.1
 azure-mgmt-subscription==3.1.1
-azure-identity==1.13.0
+azure-identity==1.15.0
 google-api-python-client==2.*
-google-auth-oauthlib==1.0.0
-Werkzeug==2.2.3
-keyring==23.*
+google-auth-oauthlib==1.1.0
+keyring==24.*; python_version > '3.7'
+keyring==23.*; python_version <= '3.7'
+Werkzeug==2.3.*; python_version > '3.7'
+Werkzeug==2.2.3; python_version <= '3.7'
+typer[all]==0.9.*
+setuptools==69.*; python_version >= '3.12'
@@ -2,7 +2,7 @@
 //
 // pgAdmin 4 - PostgreSQL Tools
 //
-// Copyright (C) 2013 - 2023, The pgAdmin Development Team
+// Copyright (C) 2013 - 2024, The pgAdmin Development Team
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////
@@ -12,7 +12,6 @@ module.exports = {
    'browser': true,
    'es6': true,
    'amd': true,
-    'jasmine': true,
  },
  'extends': [
    'eslint:recommended',
@@ -0,0 +1,7 @@
+checksumBehavior: update
+
+logFilters:
+  - code: YN0013
+    level: discard
+
+nodeLinker: node-modules
@@ -23,11 +23,11 @@
    "256": "assets/pgAdmin4.png"
  },
  "dependencies": {
-    "axios": "^1.4.0",
+    "axios": "^1.5.1",
    "bootstrap": "^4.5.3"
  },
  "devDependencies": {
-    "eslint": "^8.42.0",
+    "eslint": "^8.50.0",
    "nw": "0.77.0"
  },
  "scripts": {
@@ -2,7 +2,7 @@
 //
 // pgAdmin 4 - PostgreSQL Tools
 //
-// Copyright (C) 2013 - 2023, The pgAdmin Development Team
+// Copyright (C) 2013 - 2024, The pgAdmin Development Team
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////
@@ -2,7 +2,7 @@
 //
 // pgAdmin 4 - PostgreSQL Tools
 //
-// Copyright (C) 2013 - 2023, The pgAdmin Development Team
+// Copyright (C) 2013 - 2024, The pgAdmin Development Team
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////
@@ -2,7 +2,7 @@
 //
 // pgAdmin 4 - PostgreSQL Tools
 //
-// Copyright (C) 2013 - 2023, The pgAdmin Development Team
+// Copyright (C) 2013 - 2024, The pgAdmin Development Team
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////
@@ -264,7 +264,10 @@ function launchPgAdminWindow() {
      // Create Mac Builtin Menu
      if (platform() === 'darwin') {
        nativeMenu.createMacBuiltin('pgAdmin 4');
-        nativeMenu?.items[0].submenu.removeAt(0)
+        // Remove 'About pgAdmin 4' submenu
+        nativeMenu?.items[0].submenu.removeAt(0);
+        // Remove 'Close Window' submenu
+        nativeMenu?.items[2].submenu.removeAt(1);
        pgAdminMainScreen.menu = nativeMenu;
      }

@@ -459,18 +462,19 @@ function getRuntimeMenu() {
    },
  }));
  subMenus.append(new nw.MenuItem({ type: 'separator' }));
-  subMenus.append(new gui.MenuItem({
-    label: runtimeSubMenus['enter_full_screen'].label,
-    enabled: runtimeSubMenus['enter_full_screen'].enable,
-    priority: runtimeSubMenus['enter_full_screen'].priority,
-    type: 'normal',
-    checked: false,
-    key: runtimeSubMenus['enter_full_screen'].key,
-    modifiers: runtimeSubMenus['enter_full_screen'].modifiers,
-    click: function () {
-      misc.toggleFullScreen();
-    },
-  }));
+    subMenus.append(new gui.MenuItem({
+      label: pgAdminMainScreen?.isFullscreen ? runtimeSubMenus['exit_full_screen'].label : runtimeSubMenus['enter_full_screen'].label,
+      enabled: runtimeSubMenus['enter_full_screen'].enable,
+      priority: runtimeSubMenus['enter_full_screen'].priority,
+      type: 'normal',
+      checked: false,
+      key: runtimeSubMenus['enter_full_screen'].key,
+      modifiers: runtimeSubMenus['enter_full_screen'].modifiers,
+      click: function () {
+        this.label = !pgAdminMainScreen?.isFullscreen ? runtimeSubMenus['exit_full_screen'].label : runtimeSubMenus['enter_full_screen'].label;
+        misc.toggleFullScreen();
+      },
+    }));
  subMenus.append(new gui.MenuItem({
    label: runtimeSubMenus['actual_size'].label,
    enabled: runtimeSubMenus['actual_size'].enable,