pgAdmin 4 commit: Fixed following schema diff issues:

2020-08-13 Thread Akshay Joshi 
Fixed following schema diff issues:
 1) Avoid template databases from the Database drop-down list.
 2) Exclude system schemas while comparing two databases.
 3) Escape group name for XSS.

Branch
--
master

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

Modified Files
--
.../browser/server_groups/servers/databases/__init__.py | 13 ++---
.../server_groups/servers/databases/schemas/__init__.py | 10 --
web/pgadmin/tools/schema_diff/__init__.py   |  6 --
web/pgadmin/tools/schema_diff/static/css/schema_diff.css| 12 
.../tools/schema_diff/static/js/schema_diff.backform.js |  2 +-
web/pgadmin/tools/schema_diff/static/js/schema_diff_ui.js   |  3 ++-
6 files changed, 25 insertions(+), 21 deletions(-)

[pgAdmin][RM5731]:Upgrade the font awesome to version 5

2020-08-13 Thread Nikhil Mohite 
Hi Team,

I have update font-awesome-4.7.0 to v5.14.0 for RM-5731

PFA patch.


Regards,
Nikhil Mohite.


RM_5731_v1.patch
Description: Binary data

Re: [pgAdmin][RM5731]:Upgrade the font awesome to version 5

2020-08-13 Thread Akshay Joshi 
Thanks, patch applied.

On Thu, Aug 13, 2020 at 3:17 PM Nikhil Mohite <
nikhil.moh...@enterprisedb.com> wrote:

> Hi Team,
>
> I have update font-awesome-4.7.0 to v5.14.0 for RM-5731
> 
> PFA patch.
>
>
> Regards,
> Nikhil Mohite.
>


-- 
*Thanks & Regards*
*Akshay Joshi*
*pgAdmin Hacker | Sr. Software Architect*
*EDB Postgres *

*Mobile: +91 976-788-8246*

Re: pgAdmin 4 commit: Upgrade font awesome from v4 to v5. Fixes #5731

2020-08-13 Thread Aditya Toshniwal 
Hi,

Attached patch has few more fixes for supporting font awesome v5.
Please review.


On Thu, Aug 13, 2020 at 12:04 PM Akshay Joshi 
wrote:

> Upgrade font awesome from v4 to v5. Fixes #5731
>
> Branch
> --
> master
>
> Details
> ---
>
> https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=93adf6884f031ff0e02c60736d9d4588732fdd07
> Author: Nikhil Mohite 
>
> Modified Files
> --
> docs/en_US/release_notes_4_25.rst  |  1 +
> web/package.json   |  4 ++--
> .../servers/databases/schemas/views/static/js/mview.js |  4 ++--
> .../servers/databases/static/js/database.js|  2 +-
> .../browser/server_groups/servers/static/js/server.js  |  4 ++--
> .../servers/tablespaces/static/js/tablespace.js|  2 +-
> web/pgadmin/browser/static/js/browser.js   |  2 +-
> web/pgadmin/browser/static/js/collection.js|  4 ++--
> web/pgadmin/browser/static/js/node.js  | 10 +-
> web/pgadmin/browser/static/js/node.ui.js   |  2 +-
> web/pgadmin/browser/static/js/wizard.js|  2 +-
> .../templates/dashboard/database_dashboard.html|  2 +-
> .../templates/dashboard/server_dashboard.html  |  2 +-
> web/pgadmin/help/__init__.py   |  4 ++--
> web/pgadmin/misc/bgprocess/static/js/bgprocess.js  |  4 ++--
> web/pgadmin/misc/file_manager/static/js/utility.js | 12 ++--
> .../file_manager/templates/file_manager/index.html |  6 +++---
> web/pgadmin/misc/static/explain/js/explain.js  |  4 ++--
> web/pgadmin/static/css/style.css   |  2 +-
> web/pgadmin/static/js/backform.pgadmin.js  |  6 +++---
> web/pgadmin/static/js/backgrid.pgadmin.js  |  6 +++---
> .../static/js/sqleditor/history/query_sources.js   |  2 +-
> web/pgadmin/static/js/sqleditor_utils.js   |  2 +-
> web/pgadmin/static/scss/_aci_tree.overrides.scss   |  4 
> web/pgadmin/static/scss/_alertify.overrides.scss   |  2 ++
> web/pgadmin/static/scss/_backform.overrides.scss   |  1 +
> web/pgadmin/static/scss/_bootstrap.overrides.scss  |  2 ++
> web/pgadmin/static/scss/_codemirror.overrides.scss |  2 ++
> web/pgadmin/static/scss/_pgadmin.style.scss| 18
> ++
> web/pgadmin/static/scss/_webcabin.pgadmin.scss |  1 +
> .../static/scss/resources/_default.variables.scss  |  2 +-
> web/pgadmin/tools/backup/static/js/backup.js   | 12 ++--
> .../tools/datagrid/static/js/datagrid_panel_title.js   |  2 +-
> .../tools/datagrid/templates/datagrid/index.html   | 12 ++--
> .../tools/grant_wizard/static/js/grant_wizard.js   |  4 ++--
> .../schema_diff/static/js/schema_diff.backform.js  |  2 +-
> .../tools/schema_diff/static/scss/_schema_diff.scss|  3 +++
> web/pgadmin/tools/sqleditor/static/js/sqleditor.js |  2 +-
> .../tools/sqleditor/static/scss/_sqleditor.scss|  2 ++
> web/regression/feature_utils/locators.py   |  4 ++--
> web/yarn.lock  | 16
> 
> 41 files changed, 108 insertions(+), 72 deletions(-)
>
>

-- 
Thanks,
Aditya Toshniwal
pgAdmin hacker | Sr. Software Engineer | *edbpostgres.com*

"Don't Complain about Heat, Plant a TREE"


fa5_v2.patch
Description: Binary data

pgAdmin 4 commit: 1) Added special handling for the extension to resolv

2020-08-13 Thread Akshay Joshi 
1) Added special handling for the extension to resolve the dependency.
2) Added 'is_sys_obj' to the ignore list of Schema Diff.
3) Font awesome v5 fixes.

Branch
--
master

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

Modified Files
--
web/pgadmin/browser/static/js/collection.js   | 2 +-
web/pgadmin/browser/static/js/node.js | 6 +++---
web/pgadmin/browser/static/js/toolbar.js  | 2 +-
web/pgadmin/misc/bgprocess/static/js/bgprocess.js | 6 +++---
web/pgadmin/static/js/backform.pgadmin.js | 3 +++
web/pgadmin/static/js/backgrid.pgadmin.js | 3 +++
web/pgadmin/static/scss/_alertify.overrides.scss  | 1 -
web/pgadmin/static/scss/_webcabin.pgadmin.scss| 6 +-
web/pgadmin/tools/datagrid/static/js/datagrid_panel_title.js  | 2 +-
web/pgadmin/tools/schema_diff/compare.py  | 2 +-
web/pgadmin/tools/schema_diff/static/js/schema_diff_dependency.js | 5 +
11 files changed, 26 insertions(+), 12 deletions(-)

Re: pgAdmin 4 commit: Upgrade font awesome from v4 to v5. Fixes #5731

2020-08-13 Thread Akshay Joshi 
Thanks, patch applied.

On Thu, Aug 13, 2020 at 3:24 PM Aditya Toshniwal <
aditya.toshni...@enterprisedb.com> wrote:

> Hi,
>
> Attached patch has few more fixes for supporting font awesome v5.
> Please review.
>
>
> On Thu, Aug 13, 2020 at 12:04 PM Akshay Joshi <
> akshay.jo...@enterprisedb.com> wrote:
>
>> Upgrade font awesome from v4 to v5. Fixes #5731
>>
>> Branch
>> --
>> master
>>
>> Details
>> ---
>>
>> https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=93adf6884f031ff0e02c60736d9d4588732fdd07
>> Author: Nikhil Mohite 
>>
>> Modified Files
>> --
>> docs/en_US/release_notes_4_25.rst  |  1 +
>> web/package.json   |  4 ++--
>> .../servers/databases/schemas/views/static/js/mview.js |  4 ++--
>> .../servers/databases/static/js/database.js|  2 +-
>> .../browser/server_groups/servers/static/js/server.js  |  4 ++--
>> .../servers/tablespaces/static/js/tablespace.js|  2 +-
>> web/pgadmin/browser/static/js/browser.js   |  2 +-
>> web/pgadmin/browser/static/js/collection.js|  4 ++--
>> web/pgadmin/browser/static/js/node.js  | 10 +-
>> web/pgadmin/browser/static/js/node.ui.js   |  2 +-
>> web/pgadmin/browser/static/js/wizard.js|  2 +-
>> .../templates/dashboard/database_dashboard.html|  2 +-
>> .../templates/dashboard/server_dashboard.html  |  2 +-
>> web/pgadmin/help/__init__.py   |  4 ++--
>> web/pgadmin/misc/bgprocess/static/js/bgprocess.js  |  4 ++--
>> web/pgadmin/misc/file_manager/static/js/utility.js | 12 ++--
>> .../file_manager/templates/file_manager/index.html |  6 +++---
>> web/pgadmin/misc/static/explain/js/explain.js  |  4 ++--
>> web/pgadmin/static/css/style.css   |  2 +-
>> web/pgadmin/static/js/backform.pgadmin.js  |  6 +++---
>> web/pgadmin/static/js/backgrid.pgadmin.js  |  6 +++---
>> .../static/js/sqleditor/history/query_sources.js   |  2 +-
>> web/pgadmin/static/js/sqleditor_utils.js   |  2 +-
>> web/pgadmin/static/scss/_aci_tree.overrides.scss   |  4 
>> web/pgadmin/static/scss/_alertify.overrides.scss   |  2 ++
>> web/pgadmin/static/scss/_backform.overrides.scss   |  1 +
>> web/pgadmin/static/scss/_bootstrap.overrides.scss  |  2 ++
>> web/pgadmin/static/scss/_codemirror.overrides.scss |  2 ++
>> web/pgadmin/static/scss/_pgadmin.style.scss| 18
>> ++
>> web/pgadmin/static/scss/_webcabin.pgadmin.scss |  1 +
>> .../static/scss/resources/_default.variables.scss  |  2 +-
>> web/pgadmin/tools/backup/static/js/backup.js   | 12 ++--
>> .../tools/datagrid/static/js/datagrid_panel_title.js   |  2 +-
>> .../tools/datagrid/templates/datagrid/index.html   | 12 ++--
>> .../tools/grant_wizard/static/js/grant_wizard.js   |  4 ++--
>> .../schema_diff/static/js/schema_diff.backform.js  |  2 +-
>> .../tools/schema_diff/static/scss/_schema_diff.scss|  3 +++
>> web/pgadmin/tools/sqleditor/static/js/sqleditor.js |  2 +-
>> .../tools/sqleditor/static/scss/_sqleditor.scss|  2 ++
>> web/regression/feature_utils/locators.py   |  4 ++--
>> web/yarn.lock  | 16
>> 
>> 41 files changed, 108 insertions(+), 72 deletions(-)
>>
>>
>
> --
> Thanks,
> Aditya Toshniwal
> pgAdmin hacker | Sr. Software Engineer | *edbpostgres.com*
> 
> "Don't Complain about Heat, Plant a TREE"
>


-- 
*Thanks & Regards*
*Akshay Joshi*
*pgAdmin Hacker | Sr. Software Architect*
*EDB Postgres *

*Mobile: +91 976-788-8246*