Update Dependencies.

2) Fixed an issue where files are not showing as per the selected format in
   the file dialog when opened the first time.

DEPENDENCIES

@@ -43,25 +43,25 @@ six                                                              1.16.0
 speaklater3                                                      1.4              UNKNOWN                              https://github.com/ThomasWaldmann/speaklater
 sqlparse                                                         0.4.2            BSD-3-Clause                         https://github.com/andialbrecht/sqlparse
 psutil                                                           5.8.0            BSD                                  https://github.com/giampaolo/psutil
-psycopg2                                                         2.8.6            LGPL with exceptions                 https://psycopg.org/
+psycopg2                                                         2.9.2            LGPL with exceptions                 https://psycopg.org/
 python-dateutil                                                  2.8.2            Dual License                         https://github.com/dateutil/dateutil
-SQLAlchemy                                                       1.4.27           MIT                                  https://www.sqlalchemy.org
+SQLAlchemy                                                       1.4.28           MIT                                  https://www.sqlalchemy.org
 bcrypt                                                           3.2.0            Apache License, Version 2.0          https://github.com/pyca/bcrypt/
 cryptography                                                     3.4.8            BSD or Apache License, Version 2.0   https://github.com/pyca/cryptography
 sshtunnel                                                        0.4.0            MIT                                  https://github.com/pahaz/sshtunnel
 ldap3                                                            2.9.1            LGPL v3                              https://github.com/cannatag/ldap3
-gssapi                                                           1.6.14           LICENSE.txt                          https://github.com/pythongssapi/python-gssapi
+gssapi                                                           1.7.2            LICENSE.txt                          https://github.com/pythongssapi/python-gssapi
 eventlet                                                         0.33.0           UNKNOWN                              http://eventlet.net
 httpagentparser                                                  1.9.1            http://www.opensource.org/licenses/mit-license.php http://shon.github.com/httpagentparser
 user-agents                                                      2.2.0            MIT                                  https://github.com/selwin/python-user-agents
-pywinpty                                                         1.1.1            Unknown                              Unknown
+pywinpty                                                         1.1.*            Unknown                              Unknown
 Authlib                                                          0.15.5           BSD-3-Clause                         https://authlib.org/
 requests                                                         2.25.1           Apache 2.0                           https://requests.readthedocs.io
 pyotp                                                            2.6.0            MIT License                          https://github.com/pyotp/pyotp
 qrcode                                                           7.3.1            BSD                                  https://github.com/lincolnloop/python-qrcode
 Pillow                                                           8.3.2            HPND                                 https://python-pillow.org
 
-NOTE: This report was generated using Python 3.9. Full information may not be
+NOTE: This report was generated using Python 3.10. Full information may not be
 shown for Python modules that are not required with this version.
 
 37 dependencies listed.
@@ -336,6 +336,7 @@ ms                                                               2.1.2
 ms                                                               2.0.0            MIT                                  https://github.com/zeit/ms.git
 nanocolors                                                       0.1.12           MIT                                  https://github.com/ai/nanocolors.git
 nanoid                                                           3.1.23           MIT                                  https://github.com/ai/nanoid.git
+nanoid                                                           3.1.30           MIT                                  https://github.com/ai/nanoid.git
 nanopop                                                          2.1.0            MIT                                  https://github.com/Simonwep/nanopop.git
 node-releases                                                    1.1.72           MIT                                  git+https://github.com/chicoxyzzy/node-releases.git
 normalize-url                                                    4.5.1            MIT                                  https://github.com/sindresorhus/normalize-url.git
@@ -393,6 +394,7 @@ raf                                                              3.4.1
 react                                                            16.14.0          MIT                                  git+https://github.com/facebook/react.git
 react                                                            17.0.2           MIT                                  https://github.com/facebook/react.git
 react-aspen                                                      1.1.1            MIT                                  https://github.com/neeksandhu/react-aspen.git
+react-checkbox-tree                                              1.7.2            MIT                                  https://github.com/jakezatecky/react-checkbox-tree
 react-dom                                                        16.14.0          MIT                                  git+https://github.com/facebook/react.git
 react-dom                                                        17.0.2           MIT                                  https://github.com/facebook/react.git
 react-draggable                                                  4.4.4            MIT                                  https://github.com/react-grid-layout/react-draggable.git
@@ -522,5 +524,5 @@ precond                                                          0.2.3
 webcabin-docker                                                  2.2.5            MIT*                                 Unknown
 tablesorter                                                      2.31.3           (MIT OR GPL-2.0)                     git://github.com/Mottie/tablesorter.git
 
-450 dependencies listed.
+452 dependencies listed.
 

LICENSE

@@ -1,6 +1,6 @@
 pgAdmin 4
 
-Copyright (C) 2013 - 2021, The pgAdmin Development Team
+Copyright (C) 2013 - 2022, 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

docs/en_US/backup_dialog.rst

@@ -67,8 +67,8 @@ Use the fields in the *General* tab to specify parameters for the backup:
 * Use the dropdown listbox next to *Rolename* to specify the role that owns the
   backup.
 
-Click the *Dump options* tab to continue. Use the box fields in the *Dump
-options* tab to provide options for *pg_dump*.
+Click the *Data/Objects* tab to continue. Use the fields in the *Data/Objects*
+tab to provide options related to data or pgAdmin objects that correspond to *pg_dump*.
 
 .. image:: images/backup_sections.png
     :alt: Sections option on backup dialog
@@ -77,13 +77,13 @@ options* tab to provide options for *pg_dump*.
 * Move switches in the **Sections** field box to select a portion of the object
   that will be backed up.
 
-   * Move the switch next to *Pre-data* to the *Yes* position to include all
+   * Move the switch next to *Pre-data* towards right position to include all
      data definition items not included in the data or post-data item lists.
 
-   * Move the switch next to *Data* to the *Yes* position to backup actual table
+   * Move the switch next to *Data* towards right position to backup actual table
      data, large-object contents, and sequence values.
 
-   * Move the switch next to *Post-data* to the *Yes* position to include
+   * Move the switch next to *Post-data* towards right position to include
      definitions of indexes, triggers, rules, and constraints other than
      validated check constraints.
 
@@ -94,13 +94,13 @@ options* tab to provide options for *pg_dump*.
 * Move switches in the **Type of objects** field box to specify details about
   the type of objects that will be backed up.
 
-   * Move the switch next to *Only data* to the *Yes* position to limit the back
+   * Move the switch next to *Only data* towards right position to limit the back
      up to data.
 
    * Move the switch next to *Only schema* to limit the back up to schema-level
      database objects.
 
-   * Move the switch next to *Blobs* to the *No* position to exclude large
+   * Move the switch next to *Blobs* towards left position to exclude large
      objects in the backup.
 
 .. image:: images/backup_do_not_save.png
@@ -110,22 +110,26 @@ options* tab to provide options for *pg_dump*.
 * Move switches in the **Do not save** field box to select the objects that will
   not be included in the backup.
 
-   * Move the switch next to *Owner* to the *Yes* position to exclude commands
+   * Move the switch next to *Owner* towards right position to exclude commands
      that set object ownership.
 
-   * Move the switch next to *Privilege* to the *Yes* position to exclude
+   * Move the switch next to *Privilege* towards right position to exclude
      commands that create access privileges.
 
-   * Move the switch next to *Tablespace* to the *Yes* position to exclude
+   * Move the switch next to *Tablespace* towards right position to exclude
      tablespaces.
 
-   * Move the switch next to *Unlogged table data* to the *Yes* position to
+   * Move the switch next to *Unlogged table data* towards right position to
      exclude the contents of unlogged tables.
 
-   * Move the switch next to *Comments* to the *Yes* position to exclude
+   * Move the switch next to *Comments* towards right position to exclude
      commands that set the comments. **Note:** This option is visible only for
      database server greater than or equal to 11.
 
+Click the *Options* tab to continue. Use these additional fields to specify
+options like including ddl statements, verbose message or using set session
+authorization corresponding to *pg_dump* options.
+
 .. image:: images/backup_queries.png
     :alt: Queries option on backup dialog
     :align: center
@@ -133,24 +137,24 @@ options* tab to provide options for *pg_dump*.
 * Move switches in the **Queries** field box to specify the type of statements
   that should be included in the backup.
 
-   * Move the switch next to *Use Column Inserts* to the *Yes* position to dump
+   * Move the switch next to *Use Column Inserts* towards right position to dump
      the data in the form of INSERT statements and include explicit column
      names.  Please note: this may make restoration from backup slow.
 
-   * Move the switch next to *Use Insert commands* to the *Yes* position to
+   * Move the switch next to *Use Insert commands* towards right position to
      dump the data in the form of INSERT statements rather than using a COPY
      command.  Please note: this may make restoration from backup slow.
 
-   * Move the switch next to *Include CREATE DATABASE statement* to the *Yes*
+   * Move the switch next to *Include CREATE DATABASE statement* towards right
      position to include a command in the backup that creates a new database
      when restoring the backup.
 
-   * Move the switch next to *Include DROP DATABASE statement* to the *Yes*
+   * Move the switch next to *Include DROP DATABASE statement* towards right
      position to include a command in the backup that will drop any existing
      database object with the same name before recreating the object during a
      backup.
 
-   * Move the switch next to *Load Via Partition Root* to the *Yes* position,
+   * Move the switch next to *Load Via Partition Root* towards right position,
      so when dumping a COPY or INSERT statement for a partitioned table, target
      the root of the partitioning hierarchy which contains it rather than the
      partition itself. **Note:** This option is visible only for database server
@@ -164,10 +168,10 @@ options* tab to provide options for *pg_dump*.
   that should be excluded from the backup.
 
    * Move the switch next to *Trigger* (active when creating a data-only backup)
-     to the *Yes* position to include commands that will disable triggers on the
+     towards right position to include commands that will disable triggers on the
      target table while the data is being loaded.
 
-   * Move the switch next to *$ quoting* to the *Yes* position to enable dollar
+   * Move the switch next to *$ quoting* towards right position to enable dollar
      quoting within function bodies; if disabled, the function body will be
      quoted using SQL standard string syntax.
 
@@ -178,16 +182,16 @@ options* tab to provide options for *pg_dump*.
 * Move switches in the **Miscellaneous** field box to specify miscellaneous
   backup options.
 
-   * Move the switch next to *With OIDs* to the *Yes* position to include object
+   * Move the switch next to *With OIDs* towards right position to include object
      identifiers as part of the table data for each table.
 
-   * Move the switch next to *Verbose messages* to the *No* position to instruct
+   * Move the switch next to *Verbose messages* towards left position to instruct
      *pg_dump* to exclude verbose messages.
 
-   * Move the switch next to *Force double quotes on identifiers* to the *Yes*
+   * Move the switch next to *Force double quotes on identifiers* towards right
      position to force the quoting of all identifiers.
 
-   * Move the switch next to *Use SET SESSION AUTHORIZATION* to the *Yes*
+   * Move the switch next to *Use SET SESSION AUTHORIZATION* towards right
      position to include a statement that will use a SET SESSION AUTHORIZATION
      command to determine object ownership (instead of an ALTER OWNER command).
 

docs/en_US/backup_server_dialog.rst

@@ -28,10 +28,13 @@ Use the fields in the *General* tab to specify the following:
     :alt: Type of objects option on backup server dialog
     :align: center
 
+Click the *Data/Objects* tab to continue. Use the fields in the *Data/Objects*
+tab to provide options related to data or pgAdmin objects that correspond to *pg_dump*.
+
 * Move switches in the **Type of objects** field box to specify details about
   the type of objects that will be backed up.
 
-   * Move the switch next to *Only data* to the *Yes* position to limit the back
+   * Move the switch next to *Only data* towards right position to limit the back
      up to data.
 
    * Move the switch next to *Only schema* to limit the back up to schema-level
@@ -44,19 +47,19 @@ Use the fields in the *General* tab to specify the following:
 * Move switches in the **Do not save** field box to select the objects that will
   not be included in the backup.
 
-   * Move the switch next to *Owner* to the *Yes* position to exclude commands
+   * Move the switch next to *Owner* towards right position to exclude commands
      that set object ownership.
 
-   * Move the switch next to *Privilege* to the *Yes* position to exclude
+   * Move the switch next to *Privilege* towards right position to exclude
      commands that create access privileges.
 
-   * Move the switch next to *Tablespace* to the *Yes* position to exclude
+   * Move the switch next to *Tablespace* towards right position to exclude
      tablespaces.
 
-   * Move the switch next to *Unlogged table data* to the *Yes* position to
+   * Move the switch next to *Unlogged table data* towards right position to
      exclude the contents of unlogged tables.
 
-   * Move the switch next to *Comments* to the *Yes* position to exclude
+   * Move the switch next to *Comments* towards right position to exclude
      commands that set the comments. **Note:** This option is visible only for
      database server greater than or equal to 11.
 
@@ -67,15 +70,15 @@ Use the fields in the *General* tab to specify the following:
 * Move switches in the **Queries** field box to specify the type of statements
   that should be included in the backup.
 
-   * Move the switch next to *Use Column Inserts* to the *Yes* position to dump
+   * Move the switch next to *Use Column Inserts* towards right position to dump
      the data in the form of INSERT statements and include explicit column
      names. Please note: this may make restoration from backup slow.
 
-   * Move the switch next to *Use Insert commands* to the *Yes* position to dump
+   * Move the switch next to *Use Insert commands* towards right position to dump
      the data in the form of INSERT statements rather than using a COPY command.
      Please note: this may make restoration from backup slow.
 
-   * Move the switch next to *Include DROP DATABASE statement* to the *Yes*
+   * Move the switch next to *Include DROP DATABASE statement* towards right
      position to include a command in the backup that will drop any existing
      database object with the same name before recreating the object during a
      backup.
@@ -89,10 +92,10 @@ Use the fields in the *General* tab to specify the following:
   that should be excluded from the backup.
 
    * Move the switch next to *Trigger* (active when creating a data-only backup)
-     to the *Yes* position to include commands that will disable triggers on the
+     towards right position to include commands that will disable triggers on the
      target table while the data is being loaded.
 
-   * Move the switch next to *$ quoting* to the *Yes* position to enable dollar
+   * Move the switch next to *$ quoting* towards right position to enable dollar
      quoting within function bodies; if disabled, the function body will be
      quoted using SQL standard string syntax.
 
@@ -103,16 +106,16 @@ Use the fields in the *General* tab to specify the following:
 * Move switches in the **Miscellaneous** field box to specify miscellaneous
   backup options.
 
-   * Move the switch next to *With OIDs* to the *Yes* position to include object
+   * Move the switch next to *With OIDs* towards right position to include object
      identifiers as part of the table data for each table.
 
-   * Move the switch next to *Verbose messages* to the *No* position to instruct
+   * Move the switch next to *Verbose messages* towards left position to instruct
      *pg_dump* to exclude verbose messages.
 
-   * Move the switch next to *Force double quotes on identifiers* to the *Yes*
+   * Move the switch next to *Force double quotes on identifiers* towards right
      position to force the quoting of all identifiers.
 
-   * Move the switch next to *Use SET SESSION AUTHORIZATION* to the *Yes*
+   * Move the switch next to *Use SET SESSION AUTHORIZATION* towards right
      position to include a statement that will use a SET SESSION AUTHORIZATION
      command to determine object ownership (instead of an ALTER OWNER command).
 

docs/en_US/code_review.rst

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

docs/en_US/coding_standards.rst

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

docs/en_US/import_export_servers.rst

@@ -1,4 +1,4 @@
-.. _export_import_servers:
+.. _import_export_servers:
 
 ******************************
 `Import/Export Servers`:index:
@@ -6,14 +6,56 @@
 
 Server definitions (and their groups) can be exported to a JSON file and
 re-imported to the same or a different system to enable easy pre-configuration
-of pgAdmin. The ``setup.py`` script is used for this purpose.
+of pgAdmin.
 
-.. note:: To export or import servers, you must use the Python interpreter that
-        is normally used to run pgAdmin to ensure that the required Python
-        packages are available. In most packages, this can be found in the
-        Python Virtual Environment that can be found in the installation
-        directory. When using platform-native packages, the system installation
-        of Python may be the one used by pgAdmin.
+Using pgAdmin 4 GUI
+###################
+
+To launch the *Import/Export Servers...* tool, navigate through *Tools* on the
+menu bar to click on the *Import/Export Servers* option.
+
+.. image:: images/import_export_servers_step1.png
+    :alt: Import/Export Servers step one page
+    :align: center
+
+* Use the *Import/Export* field to select the Server Groups/Servers
+  to be imported or exported.
+
+* Use the *Filename* field to select the JSON file to import servers or create the
+  new file in case of Export where the servers to be exported in the JSON format.
+
+* Use the *Remove all the existing servers?* field to specify whether to remove all the
+  existing servers or not before importing the new selected servers.
+  This field is applicable only in case of Import Servers.
+
+Click the *Next* button to continue, or the *X* button to close the wizard.
+
+.. image:: images/import_export_servers_step2.png
+    :alt: Import/Export Servers step two page
+    :align: center
+
+* Select the Server Groups/ Servers to be imported/exported.
+
+Click the *Next* button to continue, or the *X* button to close the wizard.
+
+.. image:: images/import_export_servers_step3.png
+    :alt: Import/Export Servers step three page
+    :align: center
+
+Check the summary of the servers that are going to be imported/exported on the
+Summary page.
+
+Click the *Finish* button to close the wizard.
+
+Using 'setup.py' command line script
+####################################
+
+.. note:: To export or import servers 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.
 
 Exporting Servers
 *****************

docs/en_US/index.rst

@@ -27,3 +27,7 @@ of database objects.
    contributions
    release_notes
    licence
+
+.. note:: Postgres, PostgreSQL and the Slonik Logo are trademarks or
+    registered trademarks of the `PostgreSQL Community Association of Canada
+    <https://www.postgres.ca/>`_, and used with their permission.

docs/en_US/licence.rst

@@ -13,7 +13,7 @@ documentation is attributed to the
 
 .. topic:: pgAdmin 4
 
-    Copyright (C) 2013 - 2021, The pgAdmin Development Team
+    Copyright (C) 2013 - 2022, 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

docs/en_US/menu_bar.rst

@@ -96,40 +96,40 @@ Use the *Tools* menu to access the following options (in alphabetical order):
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
 | Option                    | Action                                                                                                                                    |
 +===========================+===========================================================================================================================================+
-| *Add named restore point* | Click to open the :ref:`Add named restore point... <add_restore_point_dialog>` dialog to take a point-in-time snapshot of the current     |
-|                           | server state.                                                                                                                             |
+| *ERD Tool*                | Click to open the :ref:`ERD Tool <erd_tool>` and start designing your database.                                                           |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Backup...*               | Click to open the :ref:`Backup... <backup_dialog>` dialog to backup database objects.                                                     |
+| *Grant Wizard...*         | Click to access the :ref:`Grant Wizard <grant_wizard>` tool.                                                                              |
++---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *PSQL Tool*               | Click to open the :ref:`PSQL Tool <psql_tool>` and start PSQL in the current database context.                                            |
++---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Query tool*              | Click to open the :ref:`Query tool <query_tool>` for the currently selected object.                                                       |
++---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Schema Diff*             | Click to open the :ref:`Schema Diff <schema_diff_feature>` and start comparing two database or two schema.                                |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
 | *Backup Globals...*       | Click to open the :ref:`Backup Globals... <backup_globals_dialog>` dialog to backup cluster objects.                                      |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
 | *Backup Server...*        | Click to open the :ref:`Backup Server... <backup_server_dialog>` dialog to backup a server.                                               |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Grant Wizard...*         | Click to access the :ref:`Grant Wizard <grant_wizard>` tool.                                                                              |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Import/Export...*        | Click to open the :ref:`Import/Export data... <import_export_data>` dialog to import or export data from a table.                         |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Maintenance...*          | Click to open the :ref:`Maintenance... <maintenance_dialog>` dialog to VACUUM, ANALYZE, REINDEX, or CLUSTER.                              |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Pause replay of WAL*     | Click to pause the replay of the WAL log.                                                                                                 |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Query tool*              | Click to open the :ref:`Query tool <query_tool>` for the currently selected object.                                                       |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Reload Configuration...* | Click to update configuration files without restarting the server.                                                                        |
+| *Backup...*               | Click to open the :ref:`Backup... <backup_dialog>` dialog to backup database objects.                                                     |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
 | *Restore...*              | Click to access the :ref:`Restore <restore_dialog>` dialog to restore database files from a backup.                                       |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Resume replay of WAL*    | Click to resume the replay of the WAL log.                                                                                                |
+| *Import/Export Data...*   | Click to open the :ref:`Import/Export data... <import_export_data>` dialog to import or export data from a table.                         |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Storage Manager*         | Click to open the :ref:`Storage Manager <storage_manager>` to upload, delete, or download the backup files.                               |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *New ERD Project*         | Click to open the :ref:`ERD Tool <erd_tool>` and start designing your database.                                                           |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Schema Diff*             | Click to open the :ref:`Schema Diff <schema_diff_feature>` and start comparing two database or two schema.                                |
+| *Maintenance...*          | Click to open the :ref:`Maintenance... <maintenance_dialog>` dialog to VACUUM, ANALYZE, REINDEX, or CLUSTER.                              |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
 | *Search Objects...*       | Click to open the :ref:`Search Objects... <search_objects>` and start searching any kind of objects in a database.                        |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *PSQL Tool*               | Click to open the :ref:`PSQL Tool <psql_tool>` and start PSQL in the current database context.                                            |
+| *Add named restore point* | Click to open the :ref:`Add named restore point... <add_restore_point_dialog>` dialog to take a point-in-time snapshot of the current     |
+|                           | server state.                                                                                                                             |
++---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Pause replay of WAL*     | Click to pause the replay of the WAL log.                                                                                                 |
++---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Resume replay of WAL*    | Click to resume the replay of the WAL log.                                                                                                |
++---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Reload Configuration...* | Click to update configuration files without restarting the server.                                                                        |
++---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Storage Manager*         | Click to open the :ref:`Storage Manager <storage_manager>` to upload, delete, or download the backup files.                               |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
 
 The Help Menu

docs/en_US/release_notes.rst

@@ -11,6 +11,7 @@ notes for it.
 .. toctree::
    :maxdepth: 1
 
+   release_notes_6_4
    release_notes_6_3
    release_notes_6_2
    release_notes_6_1

docs/en_US/release_notes_6_4.rst

@@ -0,0 +1,32 @@
+************
+Version 6.4
+************
+
+Release date: 2021-01-13
+
+This release contains a number of bug fixes and new features since the release of pgAdmin4 6.3.
+
+New features
+************
+
+| `Issue #4803 <https://redmine.postgresql.org/issues/4803>`_ -  Added support to import/export server groups and servers from GUI.
+
+Housekeeping
+************
+
+| `Issue #7018 <https://redmine.postgresql.org/issues/7018>`_ -  Port Restore dialog to React.
+| `Issue #7019 <https://redmine.postgresql.org/issues/7019>`_ -  Port Maintenance dialog to React.
+
+Bug fixes
+*********
+
+| `Issue #6745 <https://redmine.postgresql.org/issues/6745>`_ -  Fixed an issue where Tablespace is created though an error is shown on the dialog.
+| `Issue #7003 <https://redmine.postgresql.org/issues/7003>`_ -  Fixed an issue where Explain Analyze shows negative exclusive time.
+| `Issue #7034 <https://redmine.postgresql.org/issues/7034>`_ -  Fixed an issue where Columns with default value not showing when adding a new row.
+| `Issue #7075 <https://redmine.postgresql.org/issues/7075>`_ -  Ensure that help should be visible properly for Procedures.
+| `Issue #7077 <https://redmine.postgresql.org/issues/7077>`_ -  Fixed an issue where the Owner is not displayed in the reverse engineering SQL for Procedures.
+| `Issue #7078 <https://redmine.postgresql.org/issues/7078>`_ -  Fixed an issue where an operation error message pop up showing the database object's name incorrectly.
+| `Issue #7081 <https://redmine.postgresql.org/issues/7081>`_ -  Fixed an issue in SQL generation for PostgreSQL-14 functions.
+| `Issue #7093 <https://redmine.postgresql.org/issues/7093>`_ -  Fixed an issue where SubPlans may overlap other nodes & make them inaccessible in Graphical EXPLAIN View.
+| `Issue #7096 <https://redmine.postgresql.org/issues/7096>`_ -  Ensure that Truncate and Reset statistics should work.
+| `Issue #7102 <https://redmine.postgresql.org/issues/7102>`_ -  Fixed a schema diff issue where generated script adds unwanted line endings for Functions/Procedures/Trigger Functions.

docs/en_US/restore_dialog.rst

@@ -38,8 +38,9 @@ restore process:
 * Use the drop-down listbox next to *Rolename* to specify the role that will be
   used to authenticate with the server during the restore process.
 
-Click the *Restore options* tab to continue. Use the fields on the *Restore
-options* tab to specify options that correspond to *pg_restore* options.
+Click the *Data/Objects* tab to continue. Use the fields on the *Data/Objects*
+tab to specify options related to data or pgAdmin objects that correspond to
+*pg_restore* options.
 
 .. image:: images/restore_sections.png
     :alt: Restore dialog options section
@@ -48,11 +49,11 @@ options* tab to specify options that correspond to *pg_restore* options.
 * Use the switches in the **Sections** box to specify the content that will be
   restored:
 
-   * Move the switch next to *Pre-data* to the *Yes* position to restore all
+   * Move the switch next to *Pre-data* towards right position to restore all
      data definition items not included in the data or post-data item lists.
-   * Move the switch next to *Data* to the *Yes* position to restore actual
+   * Move the switch next to *Data* towards right position to restore actual
      table data, large-object contents, and sequence values.
-   * Move the switch next to *Post-data* to the *Yes* position to restore
+   * Move the switch next to *Post-data* towards right position position to restore
      definitions of indexes, triggers, rules, and constraints (other than
      validated check constraints).
 
@@ -63,7 +64,7 @@ options* tab to specify options that correspond to *pg_restore* options.
 * Use the switches in the **Type of objects** box to specify the objects that
   will be restored:
 
-   * Move the switch next to *Only data* to the *Yes* position to limit the
+   * Move the switch next to *Only data* towards right position to limit the
      restoration to data.
    * Move the switch next to *Only schema* to limit the restoration to
      schema-level database objects.
@@ -75,16 +76,20 @@ options* tab to specify options that correspond to *pg_restore* options.
 * Use the switches in the **Do not save** box to specify which objects will not
   be restored:
 
-   * Move the switch next to *Owner* to the *Yes* position to exclude commands
+   * Move the switch next to *Owner* towards right position to exclude commands
      that set object ownership.
-   * Move the switch next to *Privilege* to the *Yes* position to exclude
+   * Move the switch next to *Privilege* towards right position to exclude
      commands that create access privileges.
-   * Move the switch next to *Tablespace* to the *Yes* position to exclude
+   * Move the switch next to *Tablespace* towards right position to exclude
      tablespaces.
-   * Move the switch next to *Comments* to the *Yes* position to exclude
+   * Move the switch next to *Comments* towards right position to exclude
      commands that set the comments. **Note:** This option is visible only for
      database server greater than or equal to 11.
 
+Click the *Options* tab to continue. Use these additional fields to specify
+options like cleaning before restore, verbose message or using set session
+authorization that correspond to *pg_restore* options.
+
 .. image:: images/restore_queries.png
     :alt: Restore dialog queries section
     :align: center
@@ -92,12 +97,11 @@ options* tab to specify options that correspond to *pg_restore* options.
 * Use the switches in the **Queries** box to specify the type of statements that
   should be included in the restore:
 
-   * Move the switch next to *Include CREATE DATABASE statement* to the *Yes*
-     position to include a command that creates a new database before performing
-     the restore.
-   * Move the switch next to *Clean before restore* to the *Yes* position to
+   * Move the switch next to *Include CREATE DATABASE statement* towards right position
+     to include a command that creates a new database before performing the restore.
+   * Move the switch next to *Clean before restore* towards right position to
      drop each existing database object (and data) before restoring.
-   * Move the switch next to *Single transaction* to the *Yes* position to
+   * Move the switch next to *Single transaction* towards right position to
      execute the restore as a single transaction (that is, wrap the emitted
      commands in *BEGIN/COMMIT*). This ensures that either all the commands
      complete successfully, or no changes are applied. This option implies
@@ -111,9 +115,9 @@ options* tab to specify options that correspond to *pg_restore* options.
   should be excluded from the restore:
 
    * Move the switch next to *Trigger* (active when creating a data-only
-     restore) to the *Yes* position to include commands that will disable
+     restore) towards right position to include commands that will disable
      triggers on the target table while the data is being loaded.
-   * Move the switch next to *No data for Failed Tables* to the *Yes* position
+   * Move the switch next to *No data for Failed Tables* towards right position
      to ignore data that fails a trigger.
 
 .. image:: images/restore_miscellaneous.png
@@ -123,13 +127,13 @@ options* tab to specify options that correspond to *pg_restore* options.
 * Use the switches in the **Miscellaneous/Behavior** box to specify
   miscellaneous restore options:
 
-   * Move the switch next to *Verbose messages* to the *No* position to instruct
+   * Move the switch next to *Verbose messages* towards left to instruct
      *pg_restore* to exclude verbose messages.
-   * Move the switch next to *Use SET SESSION AUTHORIZATION* to the *Yes*
-     position to include a statement that will use a SET SESSION AUTHORIZATION
+   * Move the switch next to *Use SET SESSION AUTHORIZATION* towards right position
+     to include a statement that will use a SET SESSION AUTHORIZATION
      command to determine object ownership (instead of an ALTER OWNER command).
 
-   * Move the switch next to *Exit on error* to the *Yes* position to instruct
+   * Move the switch next to *Exit on error* towards right position to instruct
      *pg_restore* to exit restore if there is an error in sending SQL commands.
      The default is to continue and to display a count of errors at the end of
      the restore.

docs/en_US/tree_control.rst

@@ -79,7 +79,7 @@ The context-sensitive menus associated with *Tables* and nested *Table* nodes pr
 +-------------------------+------------------------------------------------------------------------------------------------------------------------------+
 | Option                  | Action                                                                                                                       |
 +=========================+==============================================================================================================================+
-| *Import/Export...*      | Click open the :ref:`Import/Export... <import_export_data>` dialog to import data to or export data from the selected table. |
+| *Import/Export Data...* | Click open the :ref:`Import/Export... <import_export_data>` dialog to import data to or export data from the selected table. |
 +-------------------------+------------------------------------------------------------------------------------------------------------------------------+
 | *Reset Statistics*      | Click to reset statistics for the selected table.                                                                            |
 +-------------------------+------------------------------------------------------------------------------------------------------------------------------+

pkg/mac/build-functions.sh

@@ -241,8 +241,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 - 2021, The pgAdmin Development Team";/g' "${FILE}"
-        sed -i '' 's/NSHumanReadableCopyright =.*/NSHumanReadableCopyright = "Copyright (C) 2013 - 2021, The pgAdmin Development Team";/g' "${FILE}"
+        sed -i '' 's/CFBundleGetInfoString =.*/CFBundleGetInfoString = "Copyright (C) 2013 - 2022, The pgAdmin Development Team";/g' "${FILE}"
+        sed -i '' 's/NSHumanReadableCopyright =.*/NSHumanReadableCopyright = "Copyright (C) 2013 - 2022, The pgAdmin Development Team";/g' "${FILE}"
         echo CFBundleDisplayName = \"${APP_NAME}\"\; >> "${FILE}"
     done
 

pkg/mac/licence.rtf

@@ -10,7 +10,7 @@
 \fs22 \
 \
 
-\f1\i Copyright (C) 2013 - 2021, The pgAdmin Development Team
+\f1\i Copyright (C) 2013 - 2022, 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.\

pkg/pip/build.sh

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

pkg/pip/setup_pip.py

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

pkg/src/build.sh

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

requirements.txt

@@ -28,18 +28,18 @@ six==1.*
 speaklater3==1.*
 sqlparse==0.*
 psutil==5.*
-psycopg2==2.8.*
+psycopg2==2.9.*
 python-dateutil==2.*
 SQLAlchemy==1.4.*
 bcrypt==3.*
 cryptography==3.*
 sshtunnel==0.*
 ldap3==2.*
-gssapi==1.6.*
+gssapi==1.7.*
 eventlet==0.33.0
 httpagentparser==1.9.*
 user-agents==2.2.0
-pywinpty==1.1.1; sys_platform=="win32"
+pywinpty==1.1.*; sys_platform=="win32"
 Authlib==0.15.*
 requests==2.25.*
 pyotp==2.*

runtime/.eslintrc.js

@@ -2,7 +2,7 @@
 //
 // pgAdmin 4 - PostgreSQL Tools
 //
-// Copyright (C) 2013 - 2021, The pgAdmin Development Team
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////

runtime/src/js/configure.js

@@ -2,7 +2,7 @@
 //
 // pgAdmin 4 - PostgreSQL Tools
 //
-// Copyright (C) 2013 - 2021, The pgAdmin Development Team
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////

runtime/src/js/misc.js

@@ -2,7 +2,7 @@
 //
 // pgAdmin 4 - PostgreSQL Tools
 //
-// Copyright (C) 2013 - 2021, The pgAdmin Development Team
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////

runtime/src/js/pgadmin.js

@@ -2,7 +2,7 @@
 //
 // pgAdmin 4 - PostgreSQL Tools
 //
-// Copyright (C) 2013 - 2021, The pgAdmin Development Team
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////

runtime/src/js/server_error.js

@@ -2,7 +2,7 @@
 //
 // pgAdmin 4 - PostgreSQL Tools
 //
-// Copyright (C) 2013 - 2021, The pgAdmin Development Team
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////

runtime/src/js/view_log.js

@@ -2,7 +2,7 @@
 //
 // pgAdmin 4 - PostgreSQL Tools
 //
-// Copyright (C) 2013 - 2021, The pgAdmin Development Team
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////

tools/copyright_updater.py

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

tools/dependency_inventory.py

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

tools/get_chromedriver.py

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

tools/sql_keywords.py

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

tools/update_selenoid_browsers.py

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

web/.eslintrc.js

@@ -2,7 +2,7 @@
 //
 // pgAdmin 4 - PostgreSQL Tools
 //
-// Copyright (C) 2013 - 2021, The pgAdmin Development Team
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////

web/config.py

@@ -4,7 +4,7 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2021, The pgAdmin Development Team
+# Copyright (C) 2013 - 2022, The pgAdmin Development Team
 # This software is released under the PostgreSQL Licence
 #
 # config.py - Core application configuration settings
@@ -43,7 +43,7 @@ APP_ICON = 'pg-icon'
 
 # Application version number components
 APP_RELEASE = 6
-APP_REVISION = 3
+APP_REVISION = 4
 
 # Application version suffix, e.g. 'beta1', 'dev'. Usually an empty string
 # for GA releases.
@@ -52,7 +52,7 @@ APP_SUFFIX = ''
 # Numeric application version for upgrade checks. Should be in the format:
 # [X]XYYZZ, where X is the release version, Y is the revision, with a leading
 # zero if needed, and Z represents the suffix, with a leading zero if needed
-APP_VERSION_INT = 60300
+APP_VERSION_INT = 60400
 
 # DO NOT CHANGE!
 # The application version string, constructed from the components
@@ -62,7 +62,7 @@ else:
     APP_VERSION = '%s.%s-%s' % (APP_RELEASE, APP_REVISION, APP_SUFFIX)
 
 # Copyright string for display in the app
-APP_COPYRIGHT = 'Copyright (C) 2013 - 2021, The pgAdmin Development Team'
+APP_COPYRIGHT = 'Copyright (C) 2013 - 2022, The pgAdmin Development Team'
 
 ##########################################################################
 # Misc stuff

web/karma.conf.js

@@ -2,7 +2,7 @@
 //
 // pgAdmin 4 - PostgreSQL Tools
 //
-// Copyright (C) 2013 - 2021, The pgAdmin Development Team
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////

web/migrations/alembic.ini

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

web/migrations/env.py

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

web/migrations/script.py.mako

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

web/migrations/versions/02b9dccdcfcb_.py

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

web/migrations/versions/09d53fca90c7_.py

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

web/migrations/versions/15c88f765bc8_.py

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

web/migrations/versions/3ce25f562f3b_.py

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

web/migrations/versions/6650c52670c2_.py

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

web/migrations/versions/aa86fb60b73d_.py

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

web/migrations/versions/b5b87fdfcb30_.py

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

web/migrations/versions/ca00ec32581b_.py

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

web/migrations/versions/d39482714a2e_.py

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

web/migrations/versions/ece2e76bf60e_.py

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

web/migrations/versions/fdc58d9bd449_.py

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

web/package.json

@@ -143,6 +143,7 @@
     "raf": "^3.4.1",
     "react": "^17.0.1",
     "react-aspen": "^1.1.0",
+    "react-checkbox-tree": "^1.7.2",
     "react-dom": "^17.0.1",
     "react-draggable": "^4.4.4",
     "react-select": "^4.2.1",

web/pgAdmin4.py

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

web/pgAdmin4.wsgi

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

web/pgadmin/__init__.py

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

web/pgadmin/about/__init__.py

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

web/pgadmin/about/static/js/about.js

@@ -2,7 +2,7 @@
 //
 // pgAdmin 4 - PostgreSQL Tools
 //
-// Copyright (C) 2013 - 2021, The pgAdmin Development Team
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////

web/pgadmin/authenticate/__init__.py

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

web/pgadmin/authenticate/internal.py

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

web/pgadmin/authenticate/kerberos.py

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

web/pgadmin/authenticate/ldap.py

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

web/pgadmin/authenticate/mfa/__init__.py

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

web/pgadmin/authenticate/mfa/authenticator.py

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

web/pgadmin/authenticate/mfa/email.py

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

web/pgadmin/authenticate/mfa/registry.py

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

web/pgadmin/authenticate/mfa/templates/mfa/email.js

@@ -2,7 +2,7 @@
 //
 // pgAdmin 4 - PostgreSQL Tools
 //
-// Copyright (C) 2013 - 2021, The pgAdmin Development Team
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////

web/pgadmin/authenticate/mfa/tests/test_config.py

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

web/pgadmin/authenticate/mfa/tests/test_mfa.py

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