search

phpPgAdmin2 / phpPgAdmin

Actively maintained fork of phpPgAdmin. Fully compatable with PHP 8.1. (8.2 coming soon)
Other
12 stars 1 forks source link

Merging hestia fork #4

Closed flexjoly closed 1 year ago

flexjoly commented 1 year ago

Hi @ReimuHakurei, @jaapmarcus,

Just created this pull request from the fork of Jaap,

Would this work?

Greetz, flexJoly

flexjoly commented 1 year ago

uh.... this seems to be a lot of changes .... Maybe not safe?

And 'hestia' needs to be removed 😛

jaapmarcus commented 1 year ago

Drop this commit (https://github.com/phpPgAdmin2/phpPgAdmin/pull/4/commits/aa2d1bf4613ac0d8a72ecc023d0dfc6ca3306dae)

ADOdb is include via composer instead copied into the repo source code. As it is now loaded from composer you don't need it any more...

The release drafter will release a new version after a new release has been created and will also download composer packages...

ReimuHakurei commented 1 year ago

What issues are fixed in this fork that aren't already fixed?

There are a lot of alternative patches that all fix the same bunch of issues in phpPgAdmin -- trying to merge them all on top of each other is just begging for conflicts.

If there are any fixes in this fork that aren't already fixed, the proper solution there would be to cherry-pick the specific commits in question.

jaapmarcus commented 1 year ago

Except for the font-size. The other major change is moving ADOdb to composer

https://github.com/phpPgAdmin2/phpPgAdmin/pull/4/commits/25bc6b6c2bac89f3b2a7603696774926d1c20e90

flexjoly commented 1 year ago

@jaapmarcus Can you make a new pull-request or proposal for the changes in your branche that you would like to see here?

Thanks in advance!