Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: fa88c27ad61448a474d30d26f52291be9775e773
      
https://github.com/phpmyadmin/phpmyadmin/commit/fa88c27ad61448a474d30d26f52291be9775e773
  Author: Aditya Sastry <ganeshadit...@gmail.com>
  Date:   2014-03-22 (Sat, 22 Mar 2014)

  Changed paths:
    M export.php
    M libraries/display_export.lib.php
    M libraries/export.lib.php

  Log Message:
  -----------
  Adds the maximum table size to export option (Feature request 1515)

Added a textbox to the custom export options, in the loop where the
Exporting is done, I added a query which checks the current table's size.
If this size is greater than the limit specified we don't export the current
table.

Signed-off-by: Aditya Sastry <ganeshadit...@gmail.com>


  Commit: 22befe05095aac79b38d8b23878769c1e5814357
      
https://github.com/phpmyadmin/phpmyadmin/commit/22befe05095aac79b38d8b23878769c1e5814357
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M export.php
    M libraries/display_export.lib.php
    M libraries/export.lib.php

  Log Message:
  -----------
  Fix merge conflict

Signed-off-by: Marc Delisle <m...@infomarc.info>


  Commit: 6a478282109dacf48e84d094c91012308b7439c3
      
https://github.com/phpmyadmin/phpmyadmin/commit/6a478282109dacf48e84d094c91012308b7439c3
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M libraries/display_export.lib.php

  Log Message:
  -----------
  Signed-off-by: Marc Delisle <m...@infomarc.info>

- localize the size suffix
- improve XHTML
- the label needs an id
- add a todo


  Commit: 9d4082ad9303544ed6248311f728e256c91f95fb
      
https://github.com/phpmyadmin/phpmyadmin/commit/9d4082ad9303544ed6248311f728e256c91f95fb
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry

Signed-off-by: Marc Delisle <m...@infomarc.info>


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/81ed63a201ac...9d4082ad9303
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to