[Phpmyadmin-devel] Patch for downstream

List overview All Threads
Download

newer

older

[Phpmyadmin-devel] phpMyAdmin...

[Phpmyadmin-devel] Build failed in...

Remi Collet

9 May 2013 9 May '13

7:57 p.m.

Please consider this patches for 4.0.1 1/ Allow to use system tcpdf (as for gettext) https://github.com/remicollet/phpmyadmin/commit/4eb620b13b29c566f868800b6ae… 2/ Compatibility with tcpdf 6.0 https://github.com/remicollet/phpmyadmin/commit/6d181676fab4c531f499cdafdc8… Regards, Remi. P.S. Sorry, I will not send any more PR, github is just a nightmare for an occasional contributor.

Show replies by date

Marc Delisle

9 May 9 May

8:14 p.m.

Remi Collet 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? -- Marc Delisle http://infomarc.info

Remi Collet

8:34 p.m.

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

Marc Delisle

8:37 p.m.

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

Marc Delisle

9:53 p.m.

Remi Collet a écrit :

...

Both patches have been merged to QA_4_0 (for 4.0.1) and to master, thanks. -- Marc Delisle http://infomarc.info

Remi Collet

10 May 10 May

7:40 a.m.

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.

Michal Čihař

10:34 a.m.

Hi Dne Fri, 10 May 2013 06:40:22 +0200 Remi Collet <Fedora(a)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

Talha Masood

10:54 a.m.

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(a)cihar.com> wrote:

...

Hi Dne Fri, 10 May 2013 06:40:22 +0200 Remi Collet <Fedora(a)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.

Talha Masood

10:56 a.m.

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(a)gmail.com>wrote;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(a)cihar.com> wrote:

Hi Dne Fri, 10 May 2013 06:40:22 +0200 Remi Collet <Fedora(a)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.

Marc Delisle

12:30 p.m.

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(a)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(a)cihar.com <mailto:michal@cihar.com>> wrote: Hi Dne Fri, 10 May 2013 06:40:22 +0200 Remi Collet <Fedora(a)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(a)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(a)lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel

-- Marc Delisle http://infomarc.info

4147

days inactive

4148

days old

developers@phpmyadmin.net

Manage subscription

9 comments

4 participants

tags (0)

participants (4)

Marc Delisle
Michal Čihař
Remi Collet
Talha Masood