pgAdmin 4 commit: Allow files to be opened by double clicking on them.

[Ashesh Vashi]

Allow files to be opened by double clicking on them. Fixes #2810

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=0ff0f521976019b87a6b370628b1243c604ce0c8
Author: Murtuza Zabuawala 

Modified Files
--
web/pgadmin/misc/file_manager/static/js/utility.js | 34 --
1 file changed, 32 insertions(+), 2 deletions(-)

pgAdmin 4 commit: Ensure password changes are successful if authenticat

[Ashesh Vashi]

Ensure password changes are successful if authenticating using a pgpass file. 
Fixes #2720

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=14f0f9b5cccd185191cd014058f1a47de8c34f29
Author: Murtuza Zabuawala 

Modified Files
--
.../browser/server_groups/servers/__init__.py  | 136 +++--
.../server_groups/servers/static/js/server.js  |  68 ---
web/pgadmin/utils/__init__.py  |  31 -
web/pgadmin/utils/driver/psycopg2/__init__.py  |  43 ---
4 files changed, 210 insertions(+), 68 deletions(-)

pgAdmin 4 commit: Add tab indexes for debugger controls.

[Ashesh Vashi]

Add tab indexes for debugger controls.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5e783c023bacad4a01e8401cdbe61efa544c59ef
Author: Murtuza Zabuawala 

Modified Files
--
.../tools/debugger/static/js/debugger_ui.js| 37 +++---
.../tools/debugger/templates/debugger/direct.html  | 18 +++
2 files changed, 45 insertions(+), 10 deletions(-)

pgAdmin 4 commit: Preferences dialogue help update.

[Ashesh Vashi]

Preferences dialogue help update.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5f909e0651f6e7d4be4db0d916e92e8b51f7dd0c
Author: Susan Douglas 

Modified Files
--
docs/en_US/images/preferences_browser_display.png  | Bin 54470 -> 51492 bytes
docs/en_US/images/preferences_browser_nodes.png| Bin 84692 -> 82805 bytes
.../images/preferences_browser_properties.png  | Bin 0 -> 51937 bytes
docs/en_US/images/preferences_dashboard_graphs.png | Bin 99439 -> 90077 bytes
docs/en_US/images/preferences_debugger_display.png | Bin 0 -> 55784 bytes
.../images/preferences_misc_user_language.png  | Bin 0 -> 51034 bytes
docs/en_US/images/preferences_paths_binary.png | Bin 102585 -> 95867 bytes
docs/en_US/images/preferences_paths_help.png   | Bin 93698 -> 91887 bytes
docs/en_US/images/preferences_sql_csv_output.png   | Bin 86945 -> 56281 bytes
docs/en_US/images/preferences_sql_display.png  | Bin 91382 -> 76673 bytes
docs/en_US/images/preferences_sql_explain.png  | Bin 0 -> 56722 bytes
docs/en_US/images/preferences_sql_options.png  | Bin 108225 -> 106776 bytes
docs/en_US/images/preferences_sql_results_grid.png | Bin 0 -> 58781 bytes
docs/en_US/images/preferences_storage_options.png  | Bin 139187 -> 59452 bytes
docs/en_US/preferences.rst | 173 +++--
15 files changed, 123 insertions(+), 50 deletions(-)

pgAdmin 4 commit: Don't try to render security URLs in desktop mode. Fi

[Ashesh Vashi]

Don't try to render security URLs in desktop mode. Fixes #2952. Fixes #2922

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=032795c0e35b52140e9cca5db36e7c6912519ca6
Author: Murtuza Zabuawala 

Modified Files
--
web/pgadmin/__init__.py | 6 +-
web/pgadmin/templates/security/change_password.html | 2 ++
web/pgadmin/templates/security/forgot_password.html | 2 ++
web/pgadmin/templates/security/login_user.html  | 2 ++
web/pgadmin/templates/security/reset_password.html  | 2 ++
5 files changed, 9 insertions(+), 5 deletions(-)

pgAdmin 4 commit: Prevent attempts to select directories as files in th

[Ashesh Vashi]

Prevent attempts to select directories as files in the file dialogue. Fixes 
#2937

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=f35a2b5f44d6a2fe53081b5eede80a1c275afbfa
Author: Murtuza Zabuawala 

Modified Files
--
web/pgadmin/misc/file_manager/__init__.py  |  4 ++-
web/pgadmin/misc/file_manager/static/js/utility.js | 13 -
.../file_manager/templates/file_manager/index.html | 34 +-
3 files changed, 29 insertions(+), 22 deletions(-)

pgAdmin 4 commit: Fix label inconsistency spotted by Susan.

[Ashesh Vashi]

Fix label inconsistency spotted by Susan.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=725c6bdcf4d3530fba66c07733391a954acec3c9
Author: Dave Page 

Modified Files
--
web/pgadmin/browser/server_groups/servers/static/js/server.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

pgAdmin 4 commit: Allow selection of validation error text. Fixes #2954

[Ashesh Vashi]

Allow selection of validation error text. Fixes #2954

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=0c125a4d2d17f9b0a3c7f5e762ac30036c1710f3
Author: Murtuza Zabuawala 

Modified Files
--
web/pgadmin/static/scss/_alert.scss | 5 +
1 file changed, 5 insertions(+)

pgAdmin 4 commit: Ensure column collation isn't lost when changing fiel

[Ashesh Vashi]

Ensure column collation isn't lost when changing field size. Fixes #2779

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=c3de5e224767085d293d6ccc4429f909bac45e48
Author: Khushboo Vashi 

Modified Files
--
.../schemas/tables/column/static/js/column.js  |  4 +-
.../templates/column/sql/9.2_plus/update.sql   |  4 +-
.../tables/templates/column/sql/default/update.sql |  4 +-
.../servers/databases/schemas/tables/utils.py  | 43 --
.../type/macros/get_full_type_sql_format.macros|  6 +--
.../servers/databases/schemas/utils.py |  2 +-
6 files changed, 34 insertions(+), 29 deletions(-)

pgAdmin 4 commit: Make the query tool datatype test easily configurable

[Ashesh Vashi]

Make the query tool datatype test easily configurable and extendable and add 
support for multi-dimensional arrays and enums.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=52c7945d4847ac835f3f3a04854e6b221767c4cd
Author: Harshal Dhumal 

Modified Files
--
web/pgadmin/feature_tests/datatype_test.json   | 173 +
.../feature_tests/pg_datatype_validation_test.py   | 204 -
web/regression/feature_utils/pgadmin_page.py   |  13 ++
web/regression/python_test_utils/test_utils.py |  18 ++
4 files changed, 359 insertions(+), 49 deletions(-)

pgAdmin 4 commit: Fix duplicate link text

[Ashesh Vashi]

Fix duplicate link text

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=f31695d51bf429f7b3d739b9c961c737ed6fe292
Author: Dave Page 

Modified Files
--
docs/en_US/server_dialog.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

pgAdmin 4 commit: When selecting an SSL cert or key, update only the ex

[Ashesh Vashi]

When selecting an SSL cert or key, update only the expected path in the UI, not 
all of them. Fixes #2760. Fixes #2867

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=a53548dd845077a25934363d9dd11a30d363770a
Author: Harshal Dhumal 

Modified Files
--
web/pgadmin/static/js/backform.pgadmin.js | 2 ++
1 file changed, 2 insertions(+)

pgAdmin 4 commit: Doc updates for server connection dialogue and relate

[Ashesh Vashi]

Doc updates for server connection dialogue and related info.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=81d389fb0aaf99977cf5db3262d494319a2b5334
Author: Susan Douglas 

Modified Files
--
docs/en_US/images/server_advanced.png   | Bin 53629 -> 34067 bytes
docs/en_US/images/server_connection.png | Bin 63173 -> 39678 bytes
docs/en_US/images/server_ssl.png| Bin 68333 -> 42132 bytes
docs/en_US/pgadmin_tabbed_browser.rst   |  49 ---
docs/en_US/server_dialog.rst|  83 +---
5 files changed, 45 insertions(+), 87 deletions(-)

pgAdmin 4 commit: Clarify how virtual envs can be used in WSGI mode, an

[Ashesh Vashi]

Clarify how virtual envs can be used in WSGI mode, and ensure we ship the 
required bits on Windows.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=6f719a74ead76df23e974420a6a574334ba5310e
Author: Surinder Kumar 

Modified Files
--
docs/en_US/server_deployment.rst | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)

pgAdmin 4 commit: Fixing the on the javascript files - 'web/pgadmin/sta

[Ashesh Vashi]

Fixing the on the javascript files - 'web/pgadmin/static/js/*.js' for
the errors reported by the eslint.

Branch
--
WEBPACK_DEVEL2

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

Modified Files
--
web/pgadmin/static/js/backform.pgadmin.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

pgAdmin 4 commit: Allow connections to be coloured in the treeview and

[Ashesh Vashi]

Allow connections to be coloured in the treeview and query tool. Fixes #1383. 
Fixes #2802

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=80835e410de6bc5361ac0ed00f38f87137c269a4
Author: Murtuza Zabuawala 

Modified Files
--
docs/en_US/images/server_general.png | Bin 58263 -> 37276 bytes
1 file changed, 0 insertions(+), 0 deletions(-)

pgAdmin 4 commit: Re-hash the way that we handle rendering of special t

[Ashesh Vashi]

Re-hash the way that we handle rendering of special types such as arrays. Fixes 
#2782. Fixes #2822.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=444589a58dbb98a58a69a6399cbbf7d38aedb497
Author: Harshal Dhumal 

Modified Files
--
web/pgadmin/feature_tests/test_data.json   |   6 +-
web/pgadmin/static/js/slickgrid/editors.js |  55 +
web/pgadmin/static/js/slickgrid/formatters.js  |  69 --
web/pgadmin/tools/datagrid/__init__.py |   3 +-
web/pgadmin/tools/sqleditor/__init__.py|   7 +-
web/pgadmin/tools/sqleditor/static/js/sqleditor.js |   8 +-
web/pgadmin/utils/driver/psycopg2/__init__.py  | 159 ++---
web/pgadmin/utils/driver/psycopg2/cursor.py|   4 +-
web/pgadmin/utils/driver/psycopg2/typecast.py  | 250 +
9 files changed, 295 insertions(+), 266 deletions(-)

pgAdmin 4 commit: Allow connections to be coloured in the treeview and

[Ashesh Vashi]

Allow connections to be coloured in the treeview and query tool. Fixes #1383. 
Fixes #2802

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=da31616a19e40f697c040548bb31c52c38ef842a
Author: Murtuza Zabuawala 

Modified Files
--
docs/en_US/images/server_general.png  | Bin
web/pgadmin/static/js/backform.pgadmin.js |  90 ++
2 files changed, 90 insertions(+)

pgAdmin 4 commit: Misc fixes for the pgAgent module:

[Ashesh Vashi]

Misc fixes for the pgAgent module:

1) User was allowed to enter start date ahead of end date while scheduling a 
job. Fixes #2921

2) Datetime picker was not displaying in the grid (sub-node collection 
control). Fixes #1749

3) Fixed UI issue where validation error was not displaying properly for 
Datetime control.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=d0ba29fbae9e3a705a26b47f7b711cd744396bff
Author: Murtuza Zabuawala 

Modified Files
--
web/pgadmin/static/js/backform.pgadmin.js | 18 ++
1 file changed, 18 insertions(+)

pgAdmin 4 commit: Avoid a potential crash when downloading. Fixes #2964

[Ashesh Vashi]

Avoid a potential crash when downloading. Fixes #2964

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=b5813fd438eb330fc86b88e426c7de61fe1379ae
Author: Neel Patel 

Modified Files
--
runtime/BrowserWindow.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

pgAdmin 4 commit: Runtime version update

[Ashesh Vashi]

Runtime version update

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=de0244a63d0053162ba582480fbb3d92ead53b69
Author: Dave Page 

Modified Files
--
runtime/Info.plist   | 4 ++--
runtime/pgAdmin4.pro | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

pgAdmin 4 commit: Use the correct lexer in the Apache/Windows docs.

[Ashesh Vashi]

Use the correct lexer in the Apache/Windows docs.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=08d7e44adbe0221758840dce1ec3c9e9e0ecffac
Author: Dave Page 

Modified Files
--
docs/en_US/server_deployment.rst | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)

pgAdmin 4 commit: Add the ability to build a basic Docker container.

[Ashesh Vashi]

Add the ability to build a basic Docker container.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5d1cc245e19740d7fa59ef041810419068932d39
Author: Dave Page 

Modified Files
--
pkg/docker/Dockerfile|  1 -
pkg/docker/entry.sh  |  2 +-
pkg/docker/pgadmin4.conf | 22 ++
3 files changed, 23 insertions(+), 2 deletions(-)

pgAdmin 4 commit: Allow to terminate a session from the server, and dat

[Ashesh Vashi]

Allow to terminate a session from the server, and database dashboard.

Branch
--
WEBPACK_DEVEL2

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

Modified Files
--
web/pgadmin/dashboard/static/js/dashboard.js | 15 +++
1 file changed, 15 insertions(+)

pgAdmin 4 commit: Moved the webcabin-docker in the 'web/pgadmin/static/

[Ashesh Vashi]

Moved the webcabin-docker in the 'web/pgadmin/static/vendor' directory to 
resolve a possible issue, when we created webpack reference for vendor.

webcabin-docker uses the jquery.1.11.1 as hard dependency, and latest jquery 
for 1.11.2 is available as npm, and which is used by us. Webpack reference will 
have two different set of jquery in it. Hence - vendorizing the webcabin-docker 
will allow us to change the package.json of it, and will resolve the possible 
issue.

Also - upgraded some packages in package.json to resolve the deprecation 
message during package installation using yarn.
i.e.
babel-loader -> ^7.1
extract-text-webpack-plugin -> ^3.0
karma-phantomjs-launcher -> ^1.0.4
karma-webpack -> ^2.0.4
phantomjs-prebuilt -> ^2.1.15

Branch
--
WEBPACK_DEVEL2

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

Modified Files
--
web/yarn.lock | 1371 +++--
1 file changed, 949 insertions(+), 422 deletions(-)

pgAdmin 4 commit: Fix a number of cases where strings were not properly

[Ashesh Vashi]

Fix a number of cases where strings were not properly marked for translation.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=c913f02e5ef312da008cf387cfc342a52aa0af0d
Author: Alexander Lakhin 

Modified Files
--
web/pgadmin/messages.pot   | 1779 ---
.../translations/de/LC_MESSAGES/messages.mo|  Bin 132000 -> 134062 bytes
.../translations/de/LC_MESSAGES/messages.po| 1793 +---
.../translations/ja/LC_MESSAGES/messages.mo|  Bin 141384 -> 143439 bytes
.../translations/ja/LC_MESSAGES/messages.po| 1795 +---
.../translations/pl/LC_MESSAGES/messages.mo|  Bin 131960 -> 134422 bytes
.../translations/pl/LC_MESSAGES/messages.po| 2037 ++
.../translations/ru/LC_MESSAGES/messages.mo|  Bin 172074 -> 173920 bytes
.../translations/ru/LC_MESSAGES/messages.po| 2260 +++-
.../translations/zh/LC_MESSAGES/messages.mo|  Bin 108613 -> 110686 bytes
.../translations/zh/LC_MESSAGES/messages.po| 1793 +---
11 files changed, 6193 insertions(+), 5264 deletions(-)

pgAdmin 4 commit: Upgraded the font-mfizz to latest version (v:2.4.1) t

[Ashesh Vashi]

Upgraded the font-mfizz to latest version (v:2.4.1) to resolve an issue,
about showing the PostgreSQL logo in italic in runtime on windows.

Branch
--
WEBPACK_DEVEL2

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

Modified Files
--
web/package.json |   1 +
web/yarn.lock| 148 ++-
2 files changed, 50 insertions(+), 99 deletions(-)

Re: docker container fails to start after stopping

[Dave Page]

On Tue, Jan 2, 2018 at 6:42 PM, Mark Deneen  wrote:

> I submitted a pull request on github, but it appears that you prefer
> to use a mailing list for such things.
>
> Attached is a patch to correct the behavior in the Docker container.
>
> The problem is that apache generates httpd.pid at startup and it is
> never removed.  When the container is stopped, the file remains.  At
> startup httpd fails to start because it believes that httpd is already
> running.
>
> The patch simply deletes this file before starting httpd.


Thanks - patch applied (with the addition of "-f" to quieten any errors).

-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

pgAdmin 4 commit: Extending the tools, and miscellaneous javascript mod

[Ashesh Vashi]

Extending the tools, and miscellaneous javascript modules from the
browser tools.

Branch
--
WEBPACK_DEVEL2

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

Modified Files
--
web/pgadmin/tools/datagrid/static/js/datagrid.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

pgAdmin 4 commit: No longer using the 'get_own_javascripts' method for

[Ashesh Vashi]

No longer using the 'get_own_javascripts' method for refering the
javascript modules exposed through a module, instead added them in the
webpack (shim) configuration directly.

Instead - exposed a new method - 'get_javascript_entries' to be used
later by the new implementation of the webpack configuration. It will
utilize it to refer it as pluggable javascript module entry for any
particular module. It will allow us to reintroduce the pluggable
architecture.

Introduce a new browser tools javascript module, and will act as base
class for all tools, which needs to be registerd with the browser for
better initialization, and integration.

Branch
--
WEBPACK_DEVEL2

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

Modified Files
--
web/pgadmin/tools/__init__.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

pgAdmin 4 commit: Enable webpackaging the pgadmin javascript files in d

[Ashesh Vashi]

Enable webpackaging the pgadmin javascript files in different small
modules, which can be referred from other modules.

We can have two types of webpack modules.
1. Reference (using the dll plugin of webpack)
   This type of webpack module can be referred from the other webpack
   modules. And, it will export the entry point for the javascript
   files, just like the so/dll (shared object/dynamic link library)
   file, which exports function & class entries. In the process, it
   creates a reference file, which can be referenced by another webpack
   module using the 'dll-reference' plugin. It allows us to share the
   javascript files between different webpack modules, and decrease the
   size of an individual webpack modules, which shares multiple
   javascript modules.

   This type of webpack module does not expose any entry, hence - no
   javascript gets executed directly, when it is loaded. In our case, a
   reference module can refer to file from another reference too. We
   just need to mention the name of the reference in the dependency
   list.

2. Entry (A regular webpack module)
   This type of webpack module exports the entry-point within it, and
   will always executes the javascript code from the entry point. In our
   case, we generally refer to multiple reference webpack modules.

We have created number of modules, based on size, functionalities, and
execution points, etc.

- codemirror (Entry)
  It imports all codemirror functionality used by pgAdmin in a single
  entry, and exports the CodeMirror object to be used directly by other
  javascript modules.

- react (Reference)
  It contains react, and react-dom in the single module to be referred
  by different entry modules.

- vendor (Reference)
  It contains all the vendor specific javascript modules (except for
  codemirror, react, react-dom, & slickgrid). And, will be referred
  almost all the entries, and references (except CodeMirror, & react).

- slickgrid (Entry)
  It contains all the slickgrid specific javascript modules, and some of
  custom formatters, and editors defined by pgAdmin itself, and exports
  the 'Slick' object.

- core (Reference)
  It contains all the core functionality defined by pgAdmin, and should
  be shared among different modules.

- nodes (Reference)
  It refers to all the nodes of pgAdmin.

- tools (Reference)
  It refers to all the tools of pgAdmin.

- app (Entry)
  It is the main app entry.

- tools_nodes (Entry)
  In order to load all the nodes, and tools, we need to load them some
  webpack entry, which is loaded as webpack entry as app at run time.

- sqleditor (Entry)
  As we need to load the sqleditor in a separate HTML page, we need
  separate webpack entry for the same.

- debugger (Entry)
  Same as sqleditor, debugger too loaded in a separate HTML page, we
  need separate webpack entry.

These, webpack modules, are exposed as AMD modules. It allows us to load
dynamically at runtime, and it resolves all our dependency issue without
much effort.

Earlier, all the webpack entries has its own set of images, fonts.
This approach resolves all that problem.

Branch
--
WEBPACK_DEVEL2

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

Modified Files
--
web/pgadmin/templates/base.html |   3 +-
web/pgadmin/tools/__init__.py   |   3 +-
web/webpack/modules/core.js |   4 +-
web/yarn.lock   | 144 +++-
4 files changed, 104 insertions(+), 50 deletions(-)

pgAdmin 4 commit: Allow selection of SSL certificates and pgpass files

[Ashesh Vashi]

Allow selection of SSL certificates and pgpass files in connection properties. 
Fixes #2649. Fixes #2650

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=1d6c1323286521d05ae355be8d14374cd3e17d5a
Author: Murtuza Zabuawala 

Modified Files
--
docs/en_US/images/server_advanced.png | Bin
docs/en_US/images/server_connection.png   | Bin
docs/en_US/images/server_general.png  | Bin
web/pgadmin/browser/server_groups/servers/__init__.py |   1 +
4 files changed, 1 insertion(+)

pgAdmin 4 commit: Bump version for some dev builds.

[Ashesh Vashi]

Bump version for some dev builds.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=a23d0a73ade37c74a12610d0333f386133b15c9b
Author: Dave Page 

Modified Files
--
web/config.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

pgAdmin 4 commit: Don't un-comment code with alt+. in the query tool. I

[Ashesh Vashi]

Don't un-comment code with alt+. in the query tool. It's only supposed to 
respond to ctrl/cmd+. Fixes #2769

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=6898b0e4c5c2dfd29a5d1ece77cb46312fbb5870
Author: Murtuza Zabuawala 

Modified Files
--
.../static/js/sqleditor/keyboard_shortcuts.js  | 38 ++
1 file changed, 32 insertions(+), 6 deletions(-)

pgAdmin 4 commit: Remove any Apache HTTPD PID file before starting the

[Dave Page]

Remove any Apache HTTPD PID file before starting the container, to prevent 
failures during restart.

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=3289a18a1a6bb99360894bffa5c192c37cda485d
Author: Mark Deneen 

Modified Files
--
pkg/docker/entry.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

pgAdmin 4 commit: Update query tool docs.

[Ashesh Vashi]

Update query tool docs.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=47fc970fae4c867d3897bcedc2661cd8b1803db3
Author: Susan Douglas 

Modified Files
--
docs/en_US/developer_tools.rst |   1 +
docs/en_US/editgrid.rst|  98 ++
docs/en_US/images/editgrid.png | Bin 0 -> 129179 bytes
docs/en_US/images/editgrid_toolbar.png | Bin 0 -> 8721 bytes
docs/en_US/query_tool.rst  | 225 +
5 files changed, 214 insertions(+), 110 deletions(-)

pgAdmin 4 commit: Ensure the datatype cache is updated when a domain is

[Ashesh Vashi]

Ensure the datatype cache is updated when a domain is added. Fixes #2778

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=e09cf061ea44d45e895cc9a643cc311b44356154
Author: Murtuza Zabuawala 

Modified Files
--
.../servers/databases/schemas/domains/static/js/domain.js |  6 --
.../fts_configurations/static/js/fts_configuration.js |  2 +-
.../databases/schemas/tables/column/static/js/column.js   |  1 +
.../servers/databases/schemas/tables/static/js/table.js   | 15 ++-
.../servers/databases/schemas/types/static/js/type.js |  2 +-
.../browser/server_groups/servers/static/js/privilege.js  |  2 +-
web/pgadmin/browser/static/js/node.js |  7 +++
web/pgadmin/browser/static/js/node.ui.js  | 11 +++
8 files changed, 36 insertions(+), 10 deletions(-)

pgAdmin 4 commit: Add support for editing data in tables with OIDs but

[Ashesh Vashi]

Add support for editing data in tables with OIDs but no primary keys. Fixes 
#2849.

This patch also updates the editor to retrieve all row values on save, thus 
immediately showing default values and allowing subsequent editing without a 
refresh.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=79df812aa66d3abd9455e68cee70470ce3ec976d
Author: Khushboo Vashi 

Modified Files
--
.../tables/templates/column/sql/9.2_plus/nodes.sql |  10 +-
.../tables/templates/column/sql/default/nodes.sql  |   6 +-
web/pgadmin/tools/sqleditor/__init__.py|  23 -
web/pgadmin/tools/sqleditor/command.py | 105 ++---
web/pgadmin/tools/sqleditor/static/js/sqleditor.js |  57 +++
.../templates/sqleditor/sql/default/has_oids.sql   |   6 ++
.../templates/sqleditor/sql/default/insert.sql |   4 +-
.../sqleditor/sql/default/objectquery.sql  |   2 +-
.../templates/sqleditor/sql/default/select.sql |   9 ++
9 files changed, 183 insertions(+), 39 deletions(-)

pgAdmin 4 commit: Improve icon alignment.

[Ashesh Vashi]

Improve icon alignment.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=ed94285f9668379a5602df563877a697a38140c0
Author: Chethana Kumar 

Modified Files
--
.../browser/server_groups/servers/databases/casts/static/img/cast.svg   | 2 +-
.../server_groups/servers/databases/casts/static/img/coll-cast.svg  | 2 +-
.../servers/databases/event_triggers/static/img/coll-event_trigger.svg  | 2 +-
.../servers/databases/event_triggers/static/img/event_trigger.svg   | 2 +-
.../servers/databases/event_triggers/static/img/triggerbad.svg  | 2 +-
.../servers/databases/extensions/static/img/coll-extension.svg  | 2 +-
.../server_groups/servers/databases/extensions/static/img/extension.svg | 2 +-
.../foreign_servers/static/img/coll-foreign_server.svg  | 2 +-
.../foreign_data_wrappers/foreign_servers/static/img/foreign_server.svg | 2 +-
.../foreign_servers/user_mapping/static/img/coll-user_mapping.svg   | 2 +-
.../foreign_servers/user_mapping/static/img/user_mapping.svg| 2 +-
.../foreign_data_wrappers/static/img/coll-foreign_data_wrapper.svg  | 2 +-
.../databases/foreign_data_wrappers/static/img/foreign_data_wrapper.svg | 2 +-
.../servers/databases/languages/static/img/coll-language.svg| 2 +-
.../server_groups/servers/databases/languages/static/img/language.svg   | 2 +-
.../catalog_objects/columns/static/img/catalog_object_column.svg| 2 +-
.../catalog_objects/columns/static/img/coll-catalog_object_column.svg   | 2 +-
.../databases/schemas/catalog_objects/static/img/catalog_object.svg | 2 +-
.../schemas/catalog_objects/static/img/coll-catalog_object.svg  | 2 +-
.../servers/databases/schemas/collations/static/img/coll-collation.svg  | 2 +-
.../servers/databases/schemas/collations/static/img/collation.svg   | 2 +-
.../domains/domain_constraints/static/img/coll-domain_constraints.svg   | 2 +-
.../domains/domain_constraints/static/img/domain_constraints-bad.svg| 2 +-
.../domains/domain_constraints/static/img/domain_constraints.svg| 2 +-
.../servers/databases/schemas/domains/static/img/coll-domain.svg| 2 +-
.../servers/databases/schemas/domains/static/img/domain.svg | 2 +-
.../databases/schemas/foreign_tables/static/img/coll-foreign_table.svg  | 2 +-
.../databases/schemas/foreign_tables/static/img/foreign_table.svg   | 2 +-
.../schemas/fts_configurations/static/img/coll-fts_configuration.svg| 2 +-
.../schemas/fts_configurations/static/img/fts_configuration.svg | 2 +-
.../databases/schemas/fts_dictionaries/static/img/fts_dictionary.svg| 2 +-
.../servers/databases/schemas/fts_parser/static/img/coll-fts_parser.svg | 2 +-
.../servers/databases/schemas/fts_parser/static/img/fts_parser.svg  | 2 +-
.../databases/schemas/fts_templates/static/img/coll-fts_template.svg| 2 +-
.../servers/databases/schemas/fts_templates/static/img/fts_template.svg | 2 +-
.../servers/databases/schemas/functions/static/img/coll-function.svg| 2 +-
.../servers/databases/schemas/functions/static/img/coll-procedure.svg   | 2 +-
.../databases/schemas/functions/static/img/coll-trigger_function.svg| 2 +-
.../servers/databases/schemas/functions/static/img/function.svg | 2 +-
.../servers/databases/schemas/functions/static/img/procedure.svg| 2 +-
.../servers/databases/schemas/functions/static/img/trigger_function.svg | 2 +-
.../databases/schemas/packages/edbfuncs/static/img/coll-edbfunc.svg | 2 +-
.../databases/schemas/packages/edbfuncs/static/img/coll-edbproc.svg | 2 +-
.../servers/databases/schemas/packages/edbfuncs/static/img/edbfunc.svg  | 2 +-
.../servers/databases/schemas/packages/edbfuncs/static/img/edbproc.svg  | 2 +-
.../databases/schemas/packages/edbvars/static/img/coll-edbvar.svg   | 2 +-
.../servers/databases/schemas/packages/edbvars/static/img/edbvar.svg| 2 +-
.../servers/databases/schemas/packages/static/img/coll-package.svg  | 2 +-
.../servers/databases/schemas/packages/static/img/package.svg   | 2 +-
.../servers/databases/schemas/sequences/static/img/coll-sequence.svg| 2 +-
.../servers/databases/schemas/sequences/static/img/sequence.svg | 2 +-
.../server_groups/servers/databases/schemas/static/img/catalog.svg  | 2 +-
.../server_groups/servers/databases/schemas/static/img/coll-catalog.svg | 2 +-
.../server_groups/servers/databases/schemas/static/img/coll-schema.svg  | 2 +-
.../server_groups/servers/databases/schemas/static/img/schema.svg   | 2 +-
.../servers/databases/schemas/synonyms/static/img/coll-synonym.svg  | 2 +-
.../servers/databases/schemas/synonyms/static/img/synonym.svg   | 2 +-
.../servers/databases/schemas/tables/column/static/img/coll-column.svg  | 2 +-
.../servers/databases/schemas/tables/column/static/img/column.svg   | 2 +-
.../exclusion_constraint/static/img/exclusion_constraint.svg| 2 +-
.../schemas/tables/constrain

pgAdmin 4 commit: Resolved the logo issue.

[Ashesh Vashi]

Resolved the logo issue.

For some unknown reason, font-mfizz was showing the slonik icon in
italic. Even after upgrading it to the latest version of font-mfizz, the
problem was not resolved.

So - instead of using the vector font, using the PostgreSQL SVG logo as
the application icon, and documentation link on dashboard now.

Branch
--
WEBPACK_DEVEL2

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

Modified Files
--
web/package.json | 1 -
web/yarn.lock| 4 
2 files changed, 5 deletions(-)

pgAdmin 4 commit: Changed array representation and formatting for the d

[Ashesh Vashi]

Changed array representation and formatting for the data types in Query Tool 
and View Data. Fixes #2671

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=2b742bdc5173f6167fd64151078de09ea70a07e9
Author: Harshal Dhumal 

Modified Files
--
web/pgadmin/static/js/slickgrid/formatters.js  | 20 +++-
web/pgadmin/tools/sqleditor/static/js/sqleditor.js |  6 +++---
2 files changed, 22 insertions(+), 4 deletions(-)

pgAdmin 4 commit: Remove any Apache HTTPD PID file before starting the

[Ashesh Vashi]

Remove any Apache HTTPD PID file before starting the container, to prevent 
failures during restart.

(cherry picked from commit 3289a18a1a6bb99360894bffa5c192c37cda485d)

Conflicts:
pkg/docker/entry.sh

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=f3cd54b3525dea3d8a5619757a87305d22fca74e
Author: Mark Deneen 

Modified Files
--
pkg/docker/entry.sh | 2 ++
1 file changed, 2 insertions(+)

pgAdmin 4 commit: Correct the description for the host name field on th

[Dave Page]

Correct the description for the host name field on the server dialogue.

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=d8194e7c0f53fb6017e40d99b457ab65900b27d4
Author: Susan Douglas 

Modified Files
--
docs/en_US/server_dialog.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Re: [INSTALLERS] pgAdmin 4: Add-on support

[Ashesh Vashi]

Gentle Reminder. :-)

FYI - I've rebased this branch from origin/master.

-- Thanks, Ashesh

On Wed, Dec 13, 2017 at 8:36 PM, Dave Page  wrote:

> The code is broken right now - see https://redmine.
> postgresql.org/issues/2952. Once it's fixed, I can do this, assuming I
> can find the spare time.
>

> On Thu, Dec 7, 2017 at 4:05 PM, Ashesh Vashi <
> ashesh.va...@enterprisedb.com> wrote:
>
>> Hi Dave,
>>
>> I've merged the master branch in the 'WEBPACK_DEVEL2' branch.
>>
>> In this branch, I've modified the code for adding back the support of
>> pluggability, which was broken due to webpack changes.
>>
>> Would you please create the set of installers?
>> And, share it with Fahar for doing the integration testing after these
>> changes.
>>
>> --
>>
>> Thanks & Regards,
>>
>> Ashesh Vashi
>> EnterpriseDB INDIA: Enterprise PostgreSQL Company
>> 
>>
>>
>> *http://www.linkedin.com/in/asheshvashi*
>> 
>>
>
>
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>

Re: pgAdmin - RM 2953 - Update to server_dialog.rst file

[Dave Page]

Hi

Thanks - applied!

FYI, the patch applied without any problems using "git apply", however
there were some embedded control characters (zero width spaces). I removed
them:

-* Specify the IP address of the server host, or the fully qualified domain
name in the *Host name/address* field. On Unix based systems, the address
field may be left blank to use the default PostgreSQL Unix Domain Socket on
the local machine, or may be set to an alternate path containing a
PostgreSQL socket. If you enter a path, the path must begin with a "/".
+* Specify the IP address of the server host, or the fully qualified domain
name in the *Host name/address* field. If you provide a unix
domain socket, the
directory name must begin with a "/".

On Fri, Dec 22, 2017 at 2:39 PM, Susan Douglas <
susan.doug...@enterprisedb.com> wrote:

> Hi All,
>
> The attached patch updates the server_dialog.rst file to fix the field
> description referred to in RM 2953.  This update has been reviewed by
> Murtuza (thanks!).
>
> Please let me know if there are any problems applying the patch - Thanks!
>
> -- Susan
>
>


-- 
Dave Page
VP, Chief Architect, Tools & Installers
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

Re: [pgAdmin4][Patch]: RM #2949 : [Web Based] Complete sql should displayed for fts directory in sql pane

[Dave Page]

Thanks, patch applied.

On Thu, Dec 21, 2017 at 7:38 AM, Khushboo Vashi <
khushboo.va...@enterprisedb.com> wrote:

> Hi,
>
> Please find the attached patch to fix RM #2949 : [Web Based] Complete sql
> should displayed for fts directory in sql pane.
>
> Thanks,
> Khushboo
>



-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

pgAdmin 4 commit: Show complete SQL for FTS dictionaries. Fixes #2949

[Dave Page]

Show complete SQL for FTS dictionaries. Fixes #2949

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=e64bc2a821b1afe066e9bcb612b596c5fa2e3c0a
Author: Khushboo Vashi 

Modified Files
--
.../servers/databases/schemas/fts_dictionaries/__init__.py| 8 
1 file changed, 8 insertions(+)

pgAdmin 4 commit: Do not decrypt the password when the password is 'Non

[Dave Page]

Do not decrypt the password when the password is 'None'. Fixes #2765

This should avoid the common but harmless exception "ValueError: IV must be 16 
bytes long while decrypting the password."

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=1dd1c102558e00bccd5880d9b8f10f872cdabc3c
Author: Murtuza Zabuawala 

Modified Files
--
web/pgadmin/utils/driver/psycopg2/__init__.py | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)

Re: [pgAdmin4][Patch]: Do not decrypt the password when the password is 'None'

[Dave Page]

Thanks, applied.

On Fri, Dec 22, 2017 at 6:32 AM, Murtuza Zabuawala <
murtuza.zabuaw...@enterprisedb.com> wrote:

> Hi,
>
> PFA patch to fix the issue where we were getting exception ValueError: IV
> must be 16 bytes long while decrypting the password.
> RM#2765
>
> Steps to re-produce:
> 1) Create new server using pgpass file, do not enter anything in password
> field.
> 2) Connect to server & open query tool (to make one or more connection
> with server)
> 3) Stop pgAdmin4 server from backend & start it again
> 4) Hard refresh the browser by removing the cache & cookies.
> 5) Expand the Server-Group in which you added that server, Check the
> console you will see the same error, this happens when we try to
> automatically restore the server connection while expanding the server
> nodes and that server connection do not have any password stored.
>
> --
> Regards,
> Murtuza Zabuawala
> EnterpriseDB: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
>


-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

pgAdmin 4 commit: Close user language preference drop down when it lose

[Dave Page]

Close user language preference drop down when it loses focus. Fixes #2956

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=90629da524294925632ef1f4036befb162f95981
Author: Khushboo Vashi 

Modified Files
--
web/pgadmin/preferences/static/js/preferences.js | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)

Re: [pgAdmin4][Patch]: RM #2956 - pgAdmin 2.0 Preferences: User language drop down remains on screen if not collapsed

[Dave Page]

Thanks, patch applied.

On Fri, Dec 22, 2017 at 1:25 PM, Khushboo Vashi <
khushboo.va...@enterprisedb.com> wrote:

> Hi,
>
> Please find the attached patch to fix RM # 2956 - pgAdmin 2.0 Preferences:
> User language drop down remains on screen if not collapsed.
>
> Thanks,
> Khushboo
>



-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

pgAdmin 4 commit: Ensure invalid options can't be selected on triggers

[Dave Page]

Ensure invalid options can't be selected on triggers on views. Fixes #2945

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=49dfd6fe314109c065dab6e477abc867c6e04ab2
Author: Khushboo Vashi 

Modified Files
--
.../tables/templates/trigger/sql/default/properties.sql   |  2 +-
.../databases/schemas/tables/triggers/static/js/trigger.js| 11 +--
2 files changed, 6 insertions(+), 7 deletions(-)

Re: [pgAdmin4][Patch]: RM #2945 - [Web based] Message "can't execute an empty query" displayed if user Click Yes on constrains trigger for view trigger

[Dave Page]

Thanks, patch applied.

On Mon, Dec 25, 2017 at 7:11 AM, Khushboo Vashi <
khushboo.va...@enterprisedb.com> wrote:

> Hi,
>
> Please find the attached patch to fix RM #2945 :  [Web based] Message
> "can't execute an empty query" displayed if user Click Yes on constrains
> trigger for view trigger
>
> Fixed issues:
>
> 1. Disable "Constraint trigger?" option in View node
> 2. Disable "Constraint trigger?" option  in edit mode for all the
> applicable nodes
> 3. Merged "Constraint trigger?" and "Constraint?" on the properties tab as
> both were for the same purpose but the "Constraint trigger?" was not
> showing correct data.
>
> Thanks,
> Khushboo
>



-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

pgAdmin 4 commit: Prevent multiple connections to new slow-to-respond s

[Dave Page]

Prevent multiple connections to new slow-to-respond servers being initiated in 
error. Fixes #2928

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=e21f1e3291657f457c171cfd868cabcad71ceed3
Author: Murtuza Zabuawala 

Modified Files
--
web/pgadmin/browser/static/js/node.js | 20 +++-
1 file changed, 15 insertions(+), 5 deletions(-)

Re: [pgAdmin4][Patch]: Prevent adding same server multiple times if connection is slow

[Dave Page]

Thanks, applied.

On Mon, Dec 25, 2017 at 9:00 AM, Murtuza Zabuawala <
murtuza.zabuaw...@enterprisedb.com> wrote:

> Hi,
>
> PFA patch to fix the issue where user was able to click on save button
> multiple times if the connection is slow, this may result user adding the
> same server multiple times unknowingly if user clicks save button multiple
> times.
> RM#2928
>
>
> --
> Regards,
> Murtuza Zabuawala
> EnterpriseDB: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
>


-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

Re: docker container fails to start after stopping

[Mark Deneen]

Thanks, Dave!

On Wed, Jan 3, 2018 at 7:56 AM, Dave Page  wrote:
>
>
> On Tue, Jan 2, 2018 at 6:42 PM, Mark Deneen  wrote:
>>
>> I submitted a pull request on github, but it appears that you prefer
>> to use a mailing list for such things.
>>
>> Attached is a patch to correct the behavior in the Docker container.
>>
>> The problem is that apache generates httpd.pid at startup and it is
>> never removed.  When the container is stopped, the file remains.  At
>> startup httpd fails to start because it believes that httpd is already
>> running.
>>
>> The patch simply deletes this file before starting httpd.
>
>
> Thanks - patch applied (with the addition of "-f" to quieten any errors).
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company

pgAdmin 4 commit: Clear the messages tab when running EXPLAIN/EXPLAIN A

[Dave Page]

Clear the messages tab when running EXPLAIN/EXPLAIN ANALYZE. Fixes #2974

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=c15d81426812fd6af0ed823480321bac77d81ec4
Author: Murtuza Zabuawala 

Modified Files
--
web/pgadmin/static/js/sqleditor/query_tool_actions.js | 2 ++
1 file changed, 2 insertions(+)

Re: [pgAdmin4][Patch]: Clear the content of message tab properly

[Dave Page]

Thanks, applied.

On Wed, Dec 27, 2017 at 12:31 PM, Murtuza Zabuawala <
murtuza.zabuaw...@enterprisedb.com> wrote:

> Hi,
>
> PFA patch to fix the issue where the content of message tab was not
> getting cleared after user executes Explain and Explain Analyze option from
> query tool.
> RM#2974
>
> --
> Regards,
> Murtuza Zabuawala
> EnterpriseDB: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
>


-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

Re: [pgAdmin4][Patch]: RM #2963 - Backup database, Restore database and Maintenance Database failed for é object.

[Dave Page]

Hi

On Mon, Dec 25, 2017 at 11:03 AM, Khushboo Vashi <
khushboo.va...@enterprisedb.com> wrote:

> Hi,
>
> Please find the attached patch to fix RM #2963: Backup database, Restore
> database and Maintenance Database failed for é object.
>

With the patch applied, I get:

2018-01-03 15:23:00,110: INFO pgadmin: Executing the process executor with
the arguments: ['/Users/dpage/.virtualenvs/pgadmin4/bin/python',
'/Users/dpage/git/pgadmin4/web/pgadmin/misc/bgprocess/process_executor.py',
'/usr/local/pgsql/bin/pg_dump', u'--file', u'/Users/dpage/e.sql',
u'--host', u'localhost', u'--port', '5432', u'--username', u'postgres',
u'--no-password', u'--verbose', u'--format=c', u'--blobs', u'\xe9']
2018-01-03 15:23:00,117: INFO werkzeug: 127.0.0.1 - - [03/Jan/2018
15:23:00] "POST /backup/job/1/object HTTP/1.1" 200 -
Exception in thread Thread-6:
Traceback (most recent call last):
  File
"/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/threading.py",
line 810, in __bootstrap_inner
self.run()
  File
"/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/threading.py",
line 763, in run
self.__target(*self.__args, **self.__kwargs)
  File
"/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/SocketServer.py",
line 602, in process_request_thread
self.handle_error(request, client_address)
  File
"/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/SocketServer.py",
line 599, in process_request_thread
self.finish_request(request, client_address)
  File
"/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/SocketServer.py",
line 334, in finish_request
self.RequestHandlerClass(request, client_address, self)
  File
"/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/SocketServer.py",
line 655, in __init__
self.handle()
  File
"/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packages/werkzeug/serving.py",
line 200, in handle
rv = BaseHTTPRequestHandler.handle(self)
  File
"/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/BaseHTTPServer.py",
line 340, in handle
self.handle_one_request()
  File
"/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packages/werkzeug/serving.py",
line 235, in handle_one_request
return self.run_wsgi()
  File
"/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packages/werkzeug/serving.py",
line 177, in run_wsgi
execute(self.server.app)
  File
"/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packages/werkzeug/serving.py",
line 165, in execute
application_iter = app(environ, start_response)
  File
"/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packages/flask/app.py",
line 2000, in __call__
return self.wsgi_app(environ, start_response)
  File
"/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packages/flask/app.py",
line 1991, in wsgi_app
response = self.make_response(self.handle_exception(e))
  File
"/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packages/flask/app.py",
line 1567, in handle_exception
reraise(exc_type, exc_value, tb)
  File
"/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packages/flask/app.py",
line 1988, in wsgi_app
response = self.full_dispatch_request()
  File
"/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packages/flask/app.py",
line 1641, in full_dispatch_request
rv = self.handle_user_exception(e)
  File
"/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packages/flask/app.py",
line 1544, in handle_user_exception
reraise(exc_type, exc_value, tb)
  File
"/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packages/flask/app.py",
line 1639, in full_dispatch_request
rv = self.dispatch_request()
  File
"/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packages/flask/app.py",
line 1625, in dispatch_request
return self.view_functions[rule.endpoint](**req.view_args)
  File
"/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packages/flask_login.py",
line 792, in decorated_view
return func(*args, **kwargs)
  File "/Users/dpage/git/pgadmin4/web/pgadmin/misc/bgprocess/__init__.py",
line 62, in index
return make_response(response=BatchProcess.list())
  File "/Users/dpage/git/pgadmin4/web/pgadmin/misc/bgprocess/processes.py",
line 512, in list
desc = loads(p.desc)
  File
"/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/pickle.py",
line 1381, in loads
file = StringIO(str)
UnicodeEncodeError: 'ascii' codec can't encode character u'\ufffd' in
position 138: ordinal not in range(128)

-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

pgAdmin 4 commit: Ensure the switch animation is consistent on the tabl

[Dave Page]

Ensure the switch animation is consistent on the table dialogue and avoid 
displaying an error incorrectly. Fixes #2624

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=0810c681c34a3d6ec1db4b83a4b6024efa94ccd5
Author: Murtuza Zabuawala 

Modified Files
--
.../servers/databases/schemas/tables/static/js/table.js  | 5 +
web/pgadmin/static/js/backgrid.pgadmin.js| 1 +
2 files changed, 2 insertions(+), 4 deletions(-)

Re: [pgAdmin4][Patch]: Fix "Create - Table" dialog UI quirks

[Dave Page]

Thanks, patch applied.

On Tue, Dec 26, 2017 at 8:14 AM, Murtuza Zabuawala <
murtuza.zabuaw...@enterprisedb.com> wrote:

> Hi,
>
> PFA patch to fix the create table dialog UI related issue where NULL and
> Primary key switch toggles at different speed in the grid and there was a
> error message flickering while toggling the Primary key switch.
> RM#2624
>
> --
> Regards,
> Murtuza Zabuawala
> EnterpriseDB: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
>


-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

pgAdmin 4 commit: Allow use of transition tables in PG 10 triggers. Fix

[Dave Page]

Allow use of transition tables in PG 10 triggers. Fixes #2933

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=711fbd51441f24225da8a07cee66f61b41345c95
Author: Khushboo Vashi 

Modified Files
--
.../templates/trigger/sql/10_plus/create.sql   | 36 +++
.../templates/trigger/sql/10_plus/properties.sql   | 25 ++
.../schemas/tables/triggers/static/js/trigger.js   | 53 ++
3 files changed, 114 insertions(+)

Re: [pgAdmin4][Patch]: RM #2933 - Add support for transition tables in Postgres 10 triggers

[Dave Page]

Thanks, patch applied.

On Mon, Dec 25, 2017 at 7:18 AM, Khushboo Vashi <
khushboo.va...@enterprisedb.com> wrote:

> Hi,
>
> Please find the attached updated patch. One small change made in the SQL
> file due to fix for RM #2945.
>
> Thanks,
> Khushboo
>
> On Fri, Dec 22, 2017 at 3:14 PM, Khushboo Vashi <
> khushboo.va...@enterprisedb.com> wrote:
>
>> Hi,
>>
>> Please find the attached patch to fix RM #2933 - Add support for
>> transition tables in Postgres 10 triggers.
>>
>> Thanks,
>> Khushboo
>>
>
>


-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

Re: [pgAdmin4][Patch]: Adding connection status in Query tool

[Dave Page]

Hi

On Thu, Dec 28, 2017 at 9:38 AM, Murtuza Zabuawala <
murtuza.zabuaw...@enterprisedb.com> wrote:

> Hi,
>
> PFA updated patch based on new design suggested by Chethana.
> The patch also includes some misc fixes related to object validation.
> RM#2475
>

This seems much nicer, but I still think there are some tweaks to make:

1) If I open a query tool, and then stop the application server, the icon
is updated to show the broken connection. However, unless I execute a query
in the query tool before the server is shut down, the connection status
won't recover when the server is restarted. If I do run a query first
(SELECT 1; will do), then the connection status will recover.

2) I think the "connected" icon should be in $primary-blue (#2c76b4). The
green is ugly and not overly easy to read. It's also distracting as it
catches the eye, which the default, non-error state should not do.

3) I'm not overly happy with the the status text popover. After some
thought, I think it's because there are no visual clues that you should
click on the icon to see it - and Karen seems to be of a similar opinion.
Can we put a small marker there, perhaps a triangle on the bottom-right,
like you get on a spreadsheet cell if you add a comment/note? We should
also have a hotkey and I guess a tooltip, e.g. "Connection status
Ctrl+Alt+S" or similar.

Thanks!


>
> Please review.
>
> --
> Regards,
> Murtuza Zabuawala
> EnterpriseDB: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
>
> On Fri, Dec 22, 2017 at 11:53 AM, Chethana Kumar <
> chethana.ku...@enterprisedb.com> wrote:
>
>> Yes Dave.
>>
>> Now it is clearly differentiated, please check and confirm.
>>
>> Thanks,
>> Chethana kumar
>>
>> On Fri, Dec 22, 2017 at 12:08 AM, Dave Page  wrote:
>>
>>> Hi
>>>
>>> There are 2 icons that look the same except for colour. That’s not going
>>> to work for some users with colour blindness.
>>>
>>> --
>>> Dave Page
>>> Blog: http://pgsnake.blogspot.com
>>> Twitter: @pgsnake
>>>
>>> EnterpriseDB UK:http://www.enterprisedb.com
>>> The Enterprise PostgreSQL Company
>>>
>>> On 21 Dec 2017, at 15:32, Chethana Kumar >> om> wrote:
>>>
>>> Hi Team,
>>>
>>> I have refined the icon once again for database connection status in
>>> query tool itself.
>>>
>>> Below are the 5 different status that I have attached as screenshot -
>>>
>>> 1_busy
>>> 2_error_in_transaction
>>> 3_valid_transaction_in_idle
>>> 4_database_connected
>>> 5_database_disconnected
>>>
>>> Please provide your inputs.
>>>
>>> Regards,
>>> Chethana kumar
>>>
>>>
>>> On Tue, Dec 19, 2017 at 5:12 PM, Murtuza Zabuawala <
>>> murtuza.zabuaw...@enterprisedb.com> wrote:
>>>
 Hi,

 PFA patch to add the connection status
 
 in query tool, this feature will allow user to check the database
 connection status in query tool itself, it will also provide the detailed
 status as a tooltip when user hovers on it, the most benefit of the feature
 will be when user open query tool in new Browser Tab where Browser tree is
 not visible to user, user can also configure the status polling time using
 preference dialog.
 RM#2475

 Apart from that I have also removed the ..sqleditor/static/css/sqledit
 or.css reference from ../datagrid/templates/datagrid/index.html file
 because we are already bundling the "sqleditor.css" file in main
 "style.css" file.


 Thanks to Chethana for his UI related inputs and to Surinder for
 helping me on html alignment issues.


 --
 Regards,
 Murtuza Zabuawala
 EnterpriseDB: http://www.enterprisedb.com
 The Enterprise PostgreSQL Company


>>>
>>>
>>> --
>>> Chethana Kumar
>>> Principal UI/UX Designer
>>> EnterpriseDB Corporation
>>>
>>>
>>> The Postgres Database Company
>>>
>>> P: +91 86981 57146 <+91%2086981%2057146>
>>> www.enterprisedb.com
>>>
>>> <1_busy.jpg>
>>>
>>> <2_error_in_transaction.jpg>
>>>
>>> <3_valid_transaction_in_idle.jpg>
>>>
>>> <4_database_connected.jpg>
>>>
>>> <5_database_disconnected.jpg>
>>>
>>>
>>
>>
>> --
>> Chethana Kumar
>> Principal UI/UX Designer
>> EnterpriseDB Corporation
>>
>>
>> The Postgres Database Company
>>
>> P: +91 86981 57146 <+91%2086981%2057146>
>> www.enterprisedb.com
>>
>
>


-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

pgAdmin 4 commit: Preferences dialogue help update.

[Ashesh Vashi]

Preferences dialogue help update.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=8c73be9186c78f75f24801e30dcac09b89bb3e3f
Author: Susan Douglas 

Modified Files
--
docs/en_US/preferences.rst | 8 
1 file changed, 8 deletions(-)

pgAdmin 4 commit: Revert inadvertant change to doc page

[Ashesh Vashi]

Revert inadvertant change to doc page

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=068f84804fc2c33b2d5c8742de147e7fa83e468f
Author: Dave Page 

Modified Files
--
docs/en_US/pgadmin_login.rst | 2 --
1 file changed, 2 deletions(-)

pgAdmin 4 commit: Fix bundle creation on Windows which was failing due

[Ashesh Vashi]

Fix bundle creation on Windows which was failing due to \r\n line endings in 
code mirror. Fixes #2908

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5f60c77d151e7041e53a7e050a10c99394fac0df
Author: Maxim Zakharov 

Modified Files
--
web/.eslintrc.js | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)

pgAdmin 4 commit: Doc updates for server connection dialogue and relate

[Ashesh Vashi]

Doc updates for server connection dialogue and related info.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=0494a91178563c93ef86ca39af36f6c5f1dddc05
Author: Susan Douglas 

Modified Files
--
docs/en_US/server_dialog.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

pgAdmin 4 commit: Add optional TLS support to the docker container.

[Ashesh Vashi]

Add optional TLS support to the docker container.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=272b8ee948c4955392245afc9cf7f98274a267f8
Author: Dave Page 

Modified Files
--
pkg/docker/pgadmin4.conf | 22 --
1 file changed, 22 deletions(-)

pgAdmin 4 commit: Revert "Fix a number of cases where strings were not

[Ashesh Vashi]

Revert "Fix a number of cases where strings were not properly marked for 
translation."

This reverts commit 1f23838a4c2c4919499bb07f41efab7202843016 due to unintended 
side
effects it caused - specifically, expanding Databases on the treeview displayed
Servers again

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=a4281ebeeae79a474e0f9cfad52449b1c57ad3ee
Author: Dave Page 

Modified Files
--
.../foreign_servers/static/js/foreign_server.js|  8 
.../foreign_servers/user_mapping/static/js/user_mapping.js |  2 +-
.../static/js/foreign_data_wrapper.js  |  4 ++--
.../schemas/foreign_tables/static/js/foreign_table.js  |  4 ++--
.../fts_configurations/static/js/fts_configuration.js  |  4 ++--
.../schemas/functions/static/js/trigger_function.js|  4 ++--
.../databases/schemas/tables/column/static/js/column.js|  4 ++--
.../constraints/foreign_key/static/js/foreign_key.js   |  4 ++--
.../databases/schemas/tables/indexes/static/js/index.js|  2 +-
.../schemas/tables/partitions/static/js/partition.js   |  4 ++--
.../databases/schemas/tables/static/js/partition.utils.js  | 14 +++---
.../servers/databases/schemas/tables/static/js/table.js|  4 ++--
.../browser/server_groups/servers/static/js/privilege.js   |  6 +++---
.../browser/server_groups/servers/static/js/server.js  | 12 ++--
.../browser/server_groups/servers/static/js/variable.js|  8 
.../servers/tablespaces/static/js/tablespace.js|  8 
web/pgadmin/misc/depends/static/js/depends.js  |  4 ++--
web/pgadmin/static/js/backgrid.pgadmin.js  |  2 +-
web/pgadmin/tools/debugger/static/js/debugger_ui.js| 14 +++---
web/pgadmin/tools/debugger/static/js/direct.js | 12 ++--
web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js   |  6 +++---
21 files changed, 65 insertions(+), 65 deletions(-)

pgAdmin 4 commit: Updated colours of tree view icons, which is to be mo

[Ashesh Vashi]

Updated colours of tree view icons, which is to be more comfortable in 
identifying.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=849ad18d733ce5c59dcbb3ede77803c188f32856
Author: Chethana Kumar 

Modified Files
--
.../browser/server_groups/servers/databases/casts/static/img/cast.svg   | 2 +-
.../server_groups/servers/databases/casts/static/img/coll-cast.svg  | 2 +-
.../servers/databases/event_triggers/static/img/coll-event_trigger.svg  | 2 +-
.../servers/databases/event_triggers/static/img/event_trigger.svg   | 2 +-
.../servers/databases/event_triggers/static/img/triggerbad.svg  | 2 +-
.../servers/databases/extensions/static/img/coll-extension.svg  | 2 +-
.../server_groups/servers/databases/extensions/static/img/extension.svg | 2 +-
.../foreign_servers/static/img/coll-foreign_server.svg  | 2 +-
.../foreign_data_wrappers/foreign_servers/static/img/foreign_server.svg | 2 +-
.../foreign_servers/user_mapping/static/img/coll-user_mapping.svg   | 2 +-
.../foreign_servers/user_mapping/static/img/user_mapping.svg| 2 +-
.../foreign_data_wrappers/static/img/coll-foreign_data_wrapper.svg  | 2 +-
.../databases/foreign_data_wrappers/static/img/foreign_data_wrapper.svg | 2 +-
.../servers/databases/languages/static/img/coll-language.svg| 2 +-
.../server_groups/servers/databases/languages/static/img/language.svg   | 2 +-
.../catalog_objects/columns/static/img/catalog_object_column.svg| 2 +-
.../catalog_objects/columns/static/img/coll-catalog_object_column.svg   | 2 +-
.../databases/schemas/catalog_objects/static/img/catalog_object.svg | 2 +-
.../schemas/catalog_objects/static/img/coll-catalog_object.svg  | 2 +-
.../servers/databases/schemas/collations/static/img/coll-collation.svg  | 2 +-
.../servers/databases/schemas/collations/static/img/collation.svg   | 2 +-
.../domains/domain_constraints/static/img/coll-domain_constraints.svg   | 2 +-
.../domains/domain_constraints/static/img/domain_constraints-bad.svg| 2 +-
.../domains/domain_constraints/static/img/domain_constraints.svg| 2 +-
.../servers/databases/schemas/domains/static/img/coll-domain.svg| 2 +-
.../servers/databases/schemas/domains/static/img/domain.svg | 2 +-
.../databases/schemas/foreign_tables/static/img/coll-foreign_table.svg  | 2 +-
.../databases/schemas/foreign_tables/static/img/foreign_table.svg   | 2 +-
.../schemas/fts_configurations/static/img/coll-fts_configuration.svg| 2 +-
.../schemas/fts_configurations/static/img/fts_configuration.svg | 2 +-
.../databases/schemas/fts_dictionaries/static/img/fts_dictionary.svg| 2 +-
.../servers/databases/schemas/fts_parser/static/img/coll-fts_parser.svg | 2 +-
.../servers/databases/schemas/fts_parser/static/img/fts_parser.svg  | 2 +-
.../databases/schemas/fts_templates/static/img/coll-fts_template.svg| 2 +-
.../servers/databases/schemas/fts_templates/static/img/fts_template.svg | 2 +-
.../servers/databases/schemas/functions/static/img/coll-function.svg| 2 +-
.../servers/databases/schemas/functions/static/img/coll-procedure.svg   | 2 +-
.../databases/schemas/functions/static/img/coll-trigger_function.svg| 2 +-
.../servers/databases/schemas/functions/static/img/function.svg | 2 +-
.../servers/databases/schemas/functions/static/img/procedure.svg| 2 +-
.../servers/databases/schemas/functions/static/img/trigger_function.svg | 2 +-
.../databases/schemas/packages/edbfuncs/static/img/coll-edbfunc.svg | 2 +-
.../databases/schemas/packages/edbfuncs/static/img/coll-edbproc.svg | 2 +-
.../servers/databases/schemas/packages/edbfuncs/static/img/edbfunc.svg  | 2 +-
.../servers/databases/schemas/packages/edbfuncs/static/img/edbproc.svg  | 2 +-
.../databases/schemas/packages/edbvars/static/img/coll-edbvar.svg   | 2 +-
.../servers/databases/schemas/packages/edbvars/static/img/edbvar.svg| 2 +-
.../servers/databases/schemas/packages/static/img/coll-package.svg  | 2 +-
.../servers/databases/schemas/packages/static/img/package.svg   | 2 +-
.../servers/databases/schemas/sequences/static/img/coll-sequence.svg| 2 +-
.../servers/databases/schemas/sequences/static/img/sequence.svg | 2 +-
.../server_groups/servers/databases/schemas/static/img/catalog.svg  | 2 +-
.../server_groups/servers/databases/schemas/static/img/coll-catalog.svg | 2 +-
.../server_groups/servers/databases/schemas/static/img/coll-schema.svg  | 2 +-
.../server_groups/servers/databases/schemas/static/img/schema.svg   | 2 +-
.../servers/databases/schemas/synonyms/static/img/coll-synonym.svg  | 2 +-
.../servers/databases/schemas/synonyms/static/img/synonym.svg   | 2 +-
.../servers/databases/schemas/tables/column/static/img/coll-column.svg  | 2 +-
.../servers/databases/schemas/tables/column/static/img/column.svg   | 2 +-
.../exclusion_constraint/static/img/exclusion_

pgAdmin 4 commit: Check and attempt to fir the registry on Windows, if

[Ashesh Vashi]

Check and attempt to fir the registry on Windows, if the text/css type is 
misconfigured. Fixes #2716

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=920b648485327c595f9d6775c9a8015f1061b16a
Author: Neel Patel 

Modified Files
--
runtime/BrowserWindow.h | 4 
1 file changed, 4 insertions(+)

pgAdmin 4 commit: Ensure we can download large files and keep the user

[Ashesh Vashi]

Ensure we can download large files and keep the user informed about progress. 
Fixes #2829. Fixes #2491. Fixes #2715

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=162dda0f1f997f75540733dda49f1720349060bc
Author: Neel Patel 

Modified Files
--
runtime/BrowserWindow.h | 4 
1 file changed, 4 deletions(-)

pgAdmin 4 commit: Disable the line ending check entirely in eslint, as

[Ashesh Vashi]

Disable the line ending check entirely in eslint, as the previous 
platform-specific fix doesn't work with all versions.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=c3570c22de5ff3017c1298f66dd083d5393b5034
Author: Dave Page 

Modified Files
--
web/.eslintrc.js | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)

pgAdmin 4 commit: When selecting an SSL cert or key, update only the ex

[Ashesh Vashi]

When selecting an SSL cert or key, update only the expected path in the UI, not 
all of them. Fixes #2760. Fixes #2867

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=527b502633465f4c853434c0625833f96fcf44da
Author: Harshal Dhumal 

Modified Files
--
web/pgadmin/static/js/backform.pgadmin.js | 2 ++
1 file changed, 2 insertions(+)

pgAdmin 4 commit: Some browsers don't properly support tri-state checkb

[Ashesh Vashi]

Some browsers don't properly support tri-state checkboxes, so create our own 
control to handle true/false/null. Fixes #2848

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=e8694cd0c1a81f214d92df42cdc80598e6ecfc1a
Author: Murtuza Zabuawala 

Modified Files
--
web/pgadmin/feature_tests/test_data.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

pgAdmin 4 commit: Confirm with the user before exiting the runtime. Fix

[Ashesh Vashi]

Confirm with the user before exiting the runtime. Fixes #2443

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=66805b1e6680b4d263700d47ddb258fcf95eed45
Author: Neel Patel 

Modified Files
--
runtime/BrowserWindow.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

pgAdmin 4 commit: Tag some translations that were not, well, tagged. Cu

[Ashesh Vashi]

Tag some translations that were not, well, tagged. Current stats:

1481 of 1777 messages (83%) translated in 
pgadmin/translations/de/LC_MESSAGES/messages.po
1694 of 1777 messages (95%) translated in 
pgadmin/translations/ja/LC_MESSAGES/messages.po
1472 of 1777 messages (82%) translated in 
pgadmin/translations/pl/LC_MESSAGES/messages.po
1750 of 1777 messages (98%) translated in 
pgadmin/translations/ru/LC_MESSAGES/messages.po
1436 of 1777 messages (80%) translated in 
pgadmin/translations/zh/LC_MESSAGES/messages.po

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=feaa4614c872e3f826f46a05567147bb7978d645
Author: Alexander Lakhin 

Modified Files
--
.../foreign_servers/static/js/foreign_server.js|  8 
.../foreign_servers/user_mapping/static/js/user_mapping.js |  2 +-
.../static/js/foreign_data_wrapper.js  |  4 ++--
.../schemas/foreign_tables/static/js/foreign_table.js  |  4 ++--
.../fts_configurations/static/js/fts_configuration.js  |  4 ++--
.../schemas/functions/static/js/trigger_function.js|  4 ++--
.../databases/schemas/tables/column/static/js/column.js|  4 ++--
.../constraints/foreign_key/static/js/foreign_key.js   |  4 ++--
.../databases/schemas/tables/indexes/static/js/index.js|  2 +-
.../schemas/tables/partitions/static/js/partition.js   |  4 ++--
.../databases/schemas/tables/static/js/partition.utils.js  | 14 +++---
.../servers/databases/schemas/tables/static/js/table.js|  4 ++--
.../browser/server_groups/servers/static/js/privilege.js   |  6 +++---
.../browser/server_groups/servers/static/js/server.js  | 12 ++--
.../browser/server_groups/servers/static/js/variable.js|  8 
.../servers/tablespaces/static/js/tablespace.js|  8 
web/pgadmin/misc/depends/static/js/depends.js  |  4 ++--
web/pgadmin/static/js/backgrid.pgadmin.js  |  2 +-
web/pgadmin/tools/debugger/static/js/debugger_ui.js| 14 +++---
web/pgadmin/tools/debugger/static/js/direct.js | 12 ++--
web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js   |  6 +++---
21 files changed, 65 insertions(+), 65 deletions(-)

pgAdmin 4 commit: Fix a referenced before assignment bug in connection

[Ashesh Vashi]

Fix a referenced before assignment bug in connection management. Fixes #2868

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=aa148078e6300839223ee41e1d37bd4423413d72
Author: Harshal Dhumal 

Modified Files
--
web/pgadmin/browser/server_groups/servers/__init__.py | 1 -
1 file changed, 1 deletion(-)

pgAdmin 4 commit: Allow configuration of CSV and clipboard formatting o

[Ashesh Vashi]

Allow configuration of CSV and clipboard formatting of query results. Fixes 
#2781

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=c7c3d52aa82ef8eb70019befb6dee8dc00ea73d8
Author: Khushboo Vashi 

Modified Files
--
docs/en_US/preferences.rst | 8 
1 file changed, 8 insertions(+)

pgAdmin 4 commit: Doc screenshot update

[Ashesh Vashi]

Doc screenshot update

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=46e3f664e9d3eb0d96a6cdab3ddd07026b509718
Author: Chethana Kumar 

Modified Files
--
docs/en_US/images/server_advanced.png   | Bin
docs/en_US/images/server_connection.png | Bin
docs/en_US/pgadmin_login.rst|   2 ++
3 files changed, 2 insertions(+)

pgAdmin 4 commit: Stop Python 2.6 barfing on newer versions of Selenium

[Ashesh Vashi]

Stop Python 2.6 barfing on newer versions of Selenium

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=c3a4b627a3e535337ed8a021db02454f4c56a779
Author: Murtuza Zabuawala 

Modified Files
--
web/regression/requirements.txt | 1 +
1 file changed, 1 insertion(+)

pgAdmin 4 commit: Re-hash the way that we handle rendering of special t

[Ashesh Vashi]

Re-hash the way that we handle rendering of special types such as arrays. Fixes 
#2782. Fixes #2822.

Branch
--
WEBPACK_DEVEL2

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=56ff374f643e2ff9e7eacf394b4d7af685af3b33
Author: Harshal Dhumal 

Modified Files
--
web/pgadmin/feature_tests/test_data.json   |  6 +++---
web/pgadmin/static/js/slickgrid/formatters.js  | 20 +---
web/pgadmin/tools/sqleditor/static/js/sqleditor.js |  6 +++---
3 files changed, 7 insertions(+), 25 deletions(-)