- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 8782c1: bug #4131 Import: "number of rows to skip" is ambi...
by Marc Delisle 27 Dec '13

27 Dec '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8782c1c5b8b5e836dd0d52c2986e95d7eedb54b4 https://github.com/phpmyadmin/phpmyadmin/commit/8782c1c5b8b5e836dd0d52c2986… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-12-27 (Fri, 27 Dec 2013) Changed paths: M ChangeLog M libraries/display_import.lib.php Log Message: ----------- bug #4131 Import: "number of rows to skip" is ambiguous Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 9951278eb32f1c6c9995eb56d98009b956a497cb https://github.com/phpmyadmin/phpmyadmin/commit/9951278eb32f1c6c9995eb56d98… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-12-27 (Fri, 27 Dec 2013) Changed paths: M ChangeLog M libraries/display_import.lib.php Log Message: ----------- Merge branch 'QA_4_1' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d23e1575e353...9951278eb32f

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 8782c1: bug #4131 Import: "number of rows to skip" is ambi...
by Marc Delisle 27 Dec '13

27 Dec '13

Branch: refs/heads/QA_4_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8782c1c5b8b5e836dd0d52c2986e95d7eedb54b4 https://github.com/phpmyadmin/phpmyadmin/commit/8782c1c5b8b5e836dd0d52c2986… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-12-27 (Fri, 27 Dec 2013) Changed paths: M ChangeLog M libraries/display_import.lib.php Log Message: ----------- bug #4131 Import: "number of rows to skip" is ambiguous Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d23e15: Move ChangeLog entry
by Marc Delisle 27 Dec '13

27 Dec '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d23e1575e353569d9edda14c0e2960abeccf3dc2 https://github.com/phpmyadmin/phpmyadmin/commit/d23e1575e353569d9edda14c0e2… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-12-27 (Fri, 27 Dec 2013) Changed paths: M ChangeLog Log Message: ----------- Move ChangeLog entry Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 88e3c7: Reduce nested levels.
by Hugues Peccatte 27 Dec '13

27 Dec '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 88e3c73d654a42e638085ca0bde019c6c9067bc4 https://github.com/phpmyadmin/phpmyadmin/commit/88e3c73d654a42e638085ca0bde… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2013-12-21 (Sat, 21 Dec 2013) Changed paths: M libraries/Scripts.class.php Log Message: ----------- Reduce nested levels. Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com> Commit: 24158361d3e9c4bad1e5277b75764e95dddc2bf1 https://github.com/phpmyadmin/phpmyadmin/commit/24158361d3e9c4bad1e5277b757… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2013-12-21 (Sat, 21 Dec 2013) Changed paths: M libraries/DisplayResults.class.php Log Message: ----------- Reduce nested levels. Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com> Commit: bf3ce056750b451a6005f222a0191a4ad43b472f https://github.com/phpmyadmin/phpmyadmin/commit/bf3ce056750b451a6005f222a01… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2013-12-26 (Thu, 26 Dec 2013) Changed paths: M setup/lib/form_processing.lib.php Log Message: ----------- Reduce nested levels. Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com> Commit: ef49eff205f45e78323edfd5b46dcdae82166e57 https://github.com/phpmyadmin/phpmyadmin/commit/ef49eff205f45e78323edfd5b46… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2013-12-27 (Fri, 27 Dec 2013) Changed paths: M setup/frames/form.inc.php M setup/frames/servers.inc.php M setup/lib/form_processing.lib.php M test/libraries/PMA_Form_Processing_test.php Log Message: ----------- Standardize names of functions. Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com> Commit: 4f05a8abfafdc1f2c46c39b56128e11ebdcdd427 https://github.com/phpmyadmin/phpmyadmin/commit/4f05a8abfafdc1f2c46c39b5612… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2013-12-27 (Fri, 27 Dec 2013) Changed paths: M libraries/DisplayResults.class.php M libraries/Scripts.class.php M setup/frames/form.inc.php M setup/frames/servers.inc.php M setup/lib/form_processing.lib.php M test/libraries/PMA_Form_Processing_test.php Log Message: ----------- Merge pull request #808 from Tithugues/nestedLevels Nested levels Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8b8b2cf30282...4f05a8abfafd

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 8b8b2c: Missing message after refactoring
by Marc Delisle 27 Dec '13

27 Dec '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8b8b2cf302821b7c70197927cc1492d08f859191 https://github.com/phpmyadmin/phpmyadmin/commit/8b8b2cf302821b7c70197927cc1… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-12-27 (Fri, 27 Dec 2013) Changed paths: M export.php Log Message: ----------- Missing message after refactoring Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] b78ff4: Refactor: new PMA_openExportFile()
by Marc Delisle 27 Dec '13

27 Dec '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b78ff4442e9239da0a99acb29362cd6167f862c6 https://github.com/phpmyadmin/phpmyadmin/commit/b78ff4442e9239da0a99acb2936… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-12-27 (Fri, 27 Dec 2013) Changed paths: M export.php M libraries/export.lib.php Log Message: ----------- Refactor: new PMA_openExportFile() Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 630ca4f6d86427178d932d370bc995248186e2da https://github.com/phpmyadmin/phpmyadmin/commit/630ca4f6d86427178d932d370bc… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-12-27 (Fri, 27 Dec 2013) Changed paths: M po/zh_TW.po Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6d95272b8802...630ca4f6d864

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 932a16: Translated using Weblate (Traditional Chinese)
by Weblate 27 Dec '13

27 Dec '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 932a16df4f3641830738158cfe9af941c0361115 https://github.com/phpmyadmin/phpmyadmin/commit/932a16df4f3641830738158cfe9… Author: Chien Wei Lin <cwlin0416(a)gmail.com> Date: 2013-12-27 (Fri, 27 Dec 2013) Changed paths: M po/zh_TW.po Log Message: ----------- Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (2751 of 2751) Commit: 6d95272b8802bb68f009f6da24d1ab7a4ce24f39 https://github.com/phpmyadmin/phpmyadmin/commit/6d95272b8802bb68f009f6da24d… Author: Weblate <noreply(a)weblate.org> Date: 2013-12-27 (Fri, 27 Dec 2013) Changed paths: M export.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/77625d0bf3dc...6d95272b8802

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 77625d: Unused code, now that JavaScript is mandatory; exp...
by Marc Delisle 27 Dec '13

27 Dec '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 77625d0bf3dc4baa575d7129bf086dd8a1e84a01 https://github.com/phpmyadmin/phpmyadmin/commit/77625d0bf3dc4baa575d7129bf0… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-12-27 (Fri, 27 Dec 2013) Changed paths: M export.php Log Message: ----------- Unused code, now that JavaScript is mandatory; export can no longer be requested as text if the format does not allow it Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 435739: Avoid error if event handler's teardown didn't hap...
by Atul Pratap Singh 27 Dec '13

27 Dec '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 435739e95a9dcbc0d52058db6e8b3b46f74fd494 https://github.com/phpmyadmin/phpmyadmin/commit/435739e95a9dcbc0d52058db6e8… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2013-12-27 (Fri, 27 Dec 2013) Changed paths: M js/sql.js Log Message: ----------- Avoid error if event handler's teardown didn't happen Signed-off-by: Atul Pratap Singh <atulpratapsingh05(a)gmail.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 760f67: Translated using Weblate (Romanian)
by Marc Delisle 26 Dec '13

26 Dec '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 760f6765b3c8e2c555757bc8ab43fd2eefad6fd4 https://github.com/phpmyadmin/phpmyadmin/commit/760f6765b3c8e2c555757bc8ab4… Author: Michal Čihař <michal(a)cihar.com> Date: 2013-12-26 (Thu, 26 Dec 2013) Changed paths: M po/ro.po Log Message: ----------- Translated using Weblate (Romanian) Currently translated at 59.0% (1624 of 2749) Commit: 32c38e39658afc35259ffdcc125dcbf9dc8f7190 https://github.com/phpmyadmin/phpmyadmin/commit/32c38e39658afc35259ffdcc125… Author: Chien Wei Lin <cwlin0416(a)gmail.com> Date: 2013-12-26 (Thu, 26 Dec 2013) Changed paths: M po/zh_TW.po Log Message: ----------- Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (2749 of 2749) Commit: 0bce0511739b0da6df88d2c0bfaa11c2bb42d55b https://github.com/phpmyadmin/phpmyadmin/commit/0bce0511739b0da6df88d2c0bfa… Author: Weblate <noreply(a)weblate.org> Date: 2013-12-26 (Thu, 26 Dec 2013) Changed paths: M ChangeLog M js/makegrid.js M js/sql.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 Commit: 8021f31e36f95afde4d05be7ecab7d1db08ba63c https://github.com/phpmyadmin/phpmyadmin/commit/8021f31e36f95afde4d05be7eca… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-12-26 (Thu, 26 Dec 2013) Changed paths: M ChangeLog M export.php Log Message: ----------- bug #4201 Exports are not compressed Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 15ca54dee5c61a930e0febacb205157b8f0f5591 https://github.com/phpmyadmin/phpmyadmin/commit/15ca54dee5c61a930e0febacb20… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-12-26 (Thu, 26 Dec 2013) Log Message: ----------- Merge commit '8021f31' Commit: a06464c59f591a232d544b8fad921550656e6458 https://github.com/phpmyadmin/phpmyadmin/commit/a06464c59f591a232d544b8fad9… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-12-26 (Thu, 26 Dec 2013) Changed paths: M ChangeLog M libraries/export.lib.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc(a)infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/74a7e1c0a4f9...a06464c59f59

1 0