[Phpmyadmin-devel] Patch for downstream
Please consider this patches for 4.0.1 1/ Allow to use system tcpdf (as for gettext) https://github.com/remicollet/phpmyadmin/commit/4eb620b13b29c566f868800b6ae2... 2/ Compatibility with tcpdf 6.0 https://github.com/remicollet/phpmyadmin/commit/6d181676fab4c531f499cdafdc81... Regards, Remi. P.S. Sorry, I will not send any more PR, github is just a nightmare for an occasional contributor.
Remi Collet a écrit :
Please consider this patches for 4.0.1
1/ Allow to use system tcpdf (as for gettext)
https://github.com/remicollet/phpmyadmin/commit/4eb620b13b29c566f868800b6ae2...
2/ Compatibility with tcpdf 6.0
https://github.com/remicollet/phpmyadmin/commit/6d181676fab4c531f499cdafdc81...
Regards, Remi.
P.S. Sorry, I will not send any more PR, github is just a nightmare for an occasional contributor.
Remi, thanks for the patches. Do you need help about how to target the QA_4_0 branch on github for your pull request? -- Marc Delisle http://infomarc.info
Le 09/05/2013 19:14, Marc Delisle a écrit :
Remi, thanks for the patches. Do you need help about how to target the QA_4_0 branch on github for your pull request?
The patch can be applied using "git am"; so I really don't see the need to another PR. Keeping a clone of the github repo is just to annoying. Remi
Remi Collet a écrit :
Le 09/05/2013 19:14, Marc Delisle a écrit :
Remi, thanks for the patches. Do you need help about how to target the QA_4_0 branch on github for your pull request?
The patch can be applied using "git am"; so I really don't see the need to another PR.
For us, it helps to centralize all requests. I'll apply the patch.
Keeping a clone of the github repo is just to annoying.
I understand. -- Marc Delisle http://infomarc.info
Remi Collet a écrit :
Please consider this patches for 4.0.1
1/ Allow to use system tcpdf (as for gettext)
https://github.com/remicollet/phpmyadmin/commit/4eb620b13b29c566f868800b6ae2...
2/ Compatibility with tcpdf 6.0
https://github.com/remicollet/phpmyadmin/commit/6d181676fab4c531f499cdafdc81...
Both patches have been merged to QA_4_0 (for 4.0.1) and to master, thanks. -- Marc Delisle http://infomarc.info
Le 09/05/2013 20:53, Marc Delisle a écrit :
Both patches have been merged to QA_4_0 (for 4.0.1) and to master, thanks. Great, thanks
Notice (for a future update of tcpdf 6.0 in pma tree). Call to this->empty_string($foo) Should be changed to TCPDF_STATIC::empty_string($foo) Having this function defined in PDF.class.php is only a workaround which allow to run with both 5.9 and 6.0 version. Remi.
Hi Dne Fri, 10 May 2013 06:40:22 +0200 Remi Collet <Fedora@FamilleCollet.com> napsal(a):
Le 09/05/2013 20:53, Marc Delisle a écrit :
Both patches have been merged to QA_4_0 (for 4.0.1) and to master, thanks. Great, thanks
Notice (for a future update of tcpdf 6.0 in pma tree).
I've updated master to use 6.0, I don't think we want to make this change in 4.0 branch.
Call to this->empty_string($foo)
Should be changed to TCPDF_STATIC::empty_string($foo)
I've just committed this change.
Having this function defined in PDF.class.php is only a workaround which allow to run with both 5.9 and 6.0 version.
Schema export will be be broken with 6.0 and QA_4_0, I've fixed in master call to UTF8ToUTF16BE (in 1675064). -- Michal Čihař | http://cihar.com | http://phpmyadmin.net
There is a slight improvement on the login forms that I have made. I am moving on to make next improvements now. On Fri, May 10, 2013 at 12:34 PM, Michal Čihař <michal@cihar.com> wrote:
Hi
Dne Fri, 10 May 2013 06:40:22 +0200 Remi Collet <Fedora@FamilleCollet.com> napsal(a):
Le 09/05/2013 20:53, Marc Delisle a écrit :
Both patches have been merged to QA_4_0 (for 4.0.1) and to master, thanks. Great, thanks
Notice (for a future update of tcpdf 6.0 in pma tree).
I've updated master to use 6.0, I don't think we want to make this change in 4.0 branch.
Call to this->empty_string($foo)
Should be changed to TCPDF_STATIC::empty_string($foo)
I've just committed this change.
Having this function defined in PDF.class.php is only a workaround which allow to run with both 5.9 and 6.0 version.
Schema export will be be broken with 6.0 and QA_4_0, I've fixed in master call to UTF8ToUTF16BE (in 1675064).
-- Michal Čihař | http://cihar.com | http://phpmyadmin.net
------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. This 200-page book is written by three acclaimed leaders in the field. The early access version is available now. Download your free book today! http://p.sf.net/sfu/neotech_d2d_may _______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel
One or two commits have another machine name. Kindly ignore them as I was working on another machine. my id is masoodtalha On Fri, May 10, 2013 at 12:54 PM, Talha Masood <masoodtalha7@gmail.com>wrote:
There is a slight improvement on the login forms that I have made. I am moving on to make next improvements now.
On Fri, May 10, 2013 at 12:34 PM, Michal Čihař <michal@cihar.com> wrote:
Hi
Dne Fri, 10 May 2013 06:40:22 +0200 Remi Collet <Fedora@FamilleCollet.com> napsal(a):
Le 09/05/2013 20:53, Marc Delisle a écrit :
Both patches have been merged to QA_4_0 (for 4.0.1) and to master, thanks. Great, thanks
Notice (for a future update of tcpdf 6.0 in pma tree).
I've updated master to use 6.0, I don't think we want to make this change in 4.0 branch.
Call to this->empty_string($foo)
Should be changed to TCPDF_STATIC::empty_string($foo)
I've just committed this change.
Having this function defined in PDF.class.php is only a workaround which allow to run with both 5.9 and 6.0 version.
Schema export will be be broken with 6.0 and QA_4_0, I've fixed in master call to UTF8ToUTF16BE (in 1675064).
-- Michal Čihař | http://cihar.com | http://phpmyadmin.net
------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. This 200-page book is written by three acclaimed leaders in the field. The early access version is available now. Download your free book today! http://p.sf.net/sfu/neotech_d2d_may _______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel
Le 2013-05-10 03:56, Talha Masood a écrit :
One or two commits have another machine name. Kindly ignore them as I was working on another machine. my id is masoodtalha
Talha, your replies to this list are hard to follow, because: 1. you are replying to a thread not related to your message 2. you are using top-posting; please use bottom-posting
On Fri, May 10, 2013 at 12:54 PM, Talha Masood <masoodtalha7@gmail.com <mailto:masoodtalha7@gmail.com>> wrote:
There is a slight improvement on the login forms that I have made. I am moving on to make next improvements now.
On Fri, May 10, 2013 at 12:34 PM, Michal Čihař <michal@cihar.com <mailto:michal@cihar.com>> wrote:
Hi
Dne Fri, 10 May 2013 06:40:22 +0200 Remi Collet <Fedora@FamilleCollet.com> napsal(a):
> Le 09/05/2013 20:53, Marc Delisle a écrit : > > > Both patches have been merged to QA_4_0 (for 4.0.1) and to master, thanks. > Great, thanks > > > Notice (for a future update of tcpdf 6.0 in pma tree).
I've updated master to use 6.0, I don't think we want to make this change in 4.0 branch.
> Call to > this->empty_string($foo) > > Should be changed to > TCPDF_STATIC::empty_string($foo)
I've just committed this change.
> Having this function defined in PDF.class.php is only a workaround which > allow to run with both 5.9 and 6.0 version.
Schema export will be be broken with 6.0 and QA_4_0, I've fixed in master call to UTF8ToUTF16BE (in 1675064).
-- Michal Čihař | http://cihar.com | http://phpmyadmin.net
------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. This 200-page book is written by three acclaimed leaders in the field. The early access version is available now. Download your free book today! http://p.sf.net/sfu/neotech_d2d_may _______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net <mailto:Phpmyadmin-devel@lists.sourceforge.net> https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel
------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. This 200-page book is written by three acclaimed leaders in the field. The early access version is available now. Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
_______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel
-- Marc Delisle http://infomarc.info
participants (4)
-
Marc Delisle -
Michal Čihař -
Remi Collet -
Talha Masood