Git January 2014

git@phpmyadmin.net

40 participants
481 discussions

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] ddf0b8: Minor PHPCS corrections.
by Hugues Peccatte 31 Jan '14

31 Jan '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ddf0b8d632d79cc074d45683b9759fd22dd5fd1a https://github.com/phpmyadmin/phpmyadmin/commit/ddf0b8d632d79cc074d45683b97… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M libraries/DisplayResults.class.php M libraries/insert_edit.lib.php Log Message: ----------- Minor PHPCS corrections. Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5c6f6a: Translated using Weblate (Arabic)
by Weblate 31 Jan '14

31 Jan '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5c6f6a3a725b3a670e50e86a5f3d4a13ad471a2e https://github.com/phpmyadmin/phpmyadmin/commit/5c6f6a3a725b3a670e50e86a5f3… Author: ahmed saad <egbrave(a)hotmail.com> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M po/ar.po Log Message: ----------- Translated using Weblate (Arabic) Currently translated at 42.5% (1167 of 2740) Commit: c4ae572427bbb6a744388c2e6bded6a7cef752ea https://github.com/phpmyadmin/phpmyadmin/commit/c4ae572427bbb6a744388c2e6bd… Author: Matías Bellone <matiasbellone+weblate(a)gmail.com> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M po/es.po Log Message: ----------- Translated using Weblate (Spanish) Currently translated at 100.0% (2741 of 2741) Commit: 8e7e3a2fd5cf8461073896ad0018f7420acff131 https://github.com/phpmyadmin/phpmyadmin/commit/8e7e3a2fd5cf8461073896ad001… Author: Weblate <noreply(a)weblate.org> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M libraries/DisplayResults.class.php M libraries/insert_edit.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e729237a2de4...8e7e3a2fd5cf

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] e72923: Minor PHPCS corrections.
by Hugues Peccatte 31 Jan '14

31 Jan '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e729237a2de4c494fd37b6966ae4e27c7ab591de https://github.com/phpmyadmin/phpmyadmin/commit/e729237a2de4c494fd37b6966ae… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M libraries/DisplayResults.class.php M libraries/insert_edit.lib.php Log Message: ----------- Minor PHPCS corrections. Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9a77d2: Fix incorrect patch
by Marc Delisle 31 Jan '14

31 Jan '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9a77d256e0ea85cf2e562bba85a4754ff486f8ae https://github.com/phpmyadmin/phpmyadmin/commit/9a77d256e0ea85cf2e562bba85a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M libraries/insert_edit.lib.php Log Message: ----------- Fix incorrect patch Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: c60ad1145bfe9a9609536f98dbf8b9e0d7edcc34 https://github.com/phpmyadmin/phpmyadmin/commit/c60ad1145bfe9a9609536f98dbf… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M libraries/insert_edit.lib.php Log Message: ----------- Merge branch 'QA_4_1' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2463fb01e651...c60ad1145bfe

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9a77d2: Fix incorrect patch
by Marc Delisle 31 Jan '14

31 Jan '14

Branch: refs/heads/QA_4_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9a77d256e0ea85cf2e562bba85a4754ff486f8ae https://github.com/phpmyadmin/phpmyadmin/commit/9a77d256e0ea85cf2e562bba85a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M libraries/insert_edit.lib.php Log Message: ----------- Fix incorrect patch Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 482232: Fractional seconds incorrect in displayed default ...
by Marc Delisle 31 Jan '14

31 Jan '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 482232a4c659a9bbe1f02916e2891668db477a62 https://github.com/phpmyadmin/phpmyadmin/commit/482232a4c659a9bbe1f02916e28… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M libraries/insert_edit.lib.php Log Message: ----------- Fractional seconds incorrect in displayed default value Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 2463fb01e65137d102f3259e9bb33d52ef0ad691 https://github.com/phpmyadmin/phpmyadmin/commit/2463fb01e65137d102f3259e9bb… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M libraries/insert_edit.lib.php Log Message: ----------- Merge branch 'QA_4_1' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9d48593b2387...2463fb01e651

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 482232: Fractional seconds incorrect in displayed default ...
by Marc Delisle 31 Jan '14

31 Jan '14

Branch: refs/heads/QA_4_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 482232a4c659a9bbe1f02916e2891668db477a62 https://github.com/phpmyadmin/phpmyadmin/commit/482232a4c659a9bbe1f02916e28… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M libraries/insert_edit.lib.php Log Message: ----------- Fractional seconds incorrect in displayed default value Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d222bd: Translated using Weblate (Dutch)
by Weblate 31 Jan '14

31 Jan '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d222bd8c91aefdcbded90cdc161eb0a5c7750c6a https://github.com/phpmyadmin/phpmyadmin/commit/d222bd8c91aefdcbded90cdc161… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M po/nl.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 98.0% (2679 of 2733) Commit: 7ce29deb0165337c4e9e2125e30cf5e33f0c30bd https://github.com/phpmyadmin/phpmyadmin/commit/7ce29deb0165337c4e9e2125e30… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M po/de.po Log Message: ----------- Translated using Weblate (German) Currently translated at 94.7% (2595 of 2740) Commit: 9d48593b23878d7288e30770f0a0f0494e461d61 https://github.com/phpmyadmin/phpmyadmin/commit/9d48593b23878d7288e30770f0a… Author: Weblate <noreply(a)weblate.org> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M ChangeLog M js/functions.js M js/jquery/jquery-ui-timepicker-addon.js M js/makegrid.js M libraries/DisplayResults.class.php M libraries/insert_edit.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/82a549714e56...9d48593b2387

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d483b9: fixed bug #4257 Hide fractional seconds
by Marc Delisle 31 Jan '14

31 Jan '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d483b9f03af05f646ee33f406e5a8bb1b5d13e0a https://github.com/phpmyadmin/phpmyadmin/commit/d483b9f03af05f646ee33f406e5… Author: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Date: 2014-01-30 (Thu, 30 Jan 2014) Changed paths: M js/functions.js M js/jquery/jquery-ui-timepicker-addon.js M js/makegrid.js M libraries/DisplayResults.class.php Log Message: ----------- fixed bug #4257 Hide fractional seconds Signed-off-by: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Commit: efa453a8a0603d1350c74656785fb17f0bc0fcd3 https://github.com/phpmyadmin/phpmyadmin/commit/efa453a8a0603d1350c74656785… Author: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Date: 2014-01-30 (Thu, 30 Jan 2014) Changed paths: M js/makegrid.js Log Message: ----------- fixed bug #4257 Hide fractional seconds #2 Signed-off-by: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Commit: fc4ad4b6acfbde357309a98dc9cdeedc08c626fe https://github.com/phpmyadmin/phpmyadmin/commit/fc4ad4b6acfbde357309a98dc9c… Author: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Date: 2014-01-30 (Thu, 30 Jan 2014) Changed paths: M js/jquery/jquery-ui-timepicker-addon.js Log Message: ----------- fixed bug #4257 Hide fractional seconds #3 Signed-off-by: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Commit: b93e4269985688eab4b8899347e4c3040d10d0ea https://github.com/phpmyadmin/phpmyadmin/commit/b93e4269985688eab4b8899347e… Author: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Date: 2014-01-30 (Thu, 30 Jan 2014) Changed paths: M js/functions.js M libraries/Util.class.php M libraries/insert_edit.lib.php Log Message: ----------- bug#4257 - fixed datetimepicker view of record edit page Signed-off-by: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Commit: 2f2dd3b548e769f2e65ab838cd5cca9fbb8c2561 https://github.com/phpmyadmin/phpmyadmin/commit/2f2dd3b548e769f2e65ab838cd5… Author: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Date: 2014-01-30 (Thu, 30 Jan 2014) Changed paths: M js/functions.js Log Message: ----------- bug#4257 - refixed datetimepicker view of record edit page Signed-off-by: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Commit: 8cc01b38ae313d5f3e8576b1b4180e8ee1e92896 https://github.com/phpmyadmin/phpmyadmin/commit/8cc01b38ae313d5f3e8576b1b41… Author: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Date: 2014-01-30 (Thu, 30 Jan 2014) Changed paths: M js/functions.js M libraries/DisplayResults.class.php M libraries/Util.class.php M libraries/insert_edit.lib.php Log Message: ----------- bug#4257 - fixed test failures Signed-off-by: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Commit: 4616eb093ecd8b2f4a5fbb29f641a7f64fc238b4 https://github.com/phpmyadmin/phpmyadmin/commit/4616eb093ecd8b2f4a5fbb29f64… Author: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Date: 2014-01-30 (Thu, 30 Jan 2014) Changed paths: M libraries/insert_edit.lib.php Log Message: ----------- bug#4257 - readded something missed Signed-off-by: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Commit: 2bca34d2f8030ff5b0705ff63fa8a592650430c1 https://github.com/phpmyadmin/phpmyadmin/commit/2bca34d2f8030ff5b0705ff63fa… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M js/functions.js M js/jquery/jquery-ui-timepicker-addon.js M js/makegrid.js M libraries/DisplayResults.class.php M libraries/Util.class.php M libraries/insert_edit.lib.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 03e61d4f510b4cb454f4858465a025c028520d71 https://github.com/phpmyadmin/phpmyadmin/commit/03e61d4f510b4cb454f4858465a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for fix of bug #4257 Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 82a549714e56acbc3d50247fee09bc38f6710e6d https://github.com/phpmyadmin/phpmyadmin/commit/82a549714e56acbc3d50247fee0… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M ChangeLog M js/functions.js M js/jquery/jquery-ui-timepicker-addon.js M js/makegrid.js M libraries/DisplayResults.class.php M libraries/insert_edit.lib.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc(a)infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/27143a758cd5...82a549714e56

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d483b9: fixed bug #4257 Hide fractional seconds
by Marc Delisle 31 Jan '14

31 Jan '14

Branch: refs/heads/QA_4_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: d483b9f03af05f646ee33f406e5a8bb1b5d13e0a https://github.com/phpmyadmin/phpmyadmin/commit/d483b9f03af05f646ee33f406e5… Author: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Date: 2014-01-30 (Thu, 30 Jan 2014) Changed paths: M js/functions.js M js/jquery/jquery-ui-timepicker-addon.js M js/makegrid.js M libraries/DisplayResults.class.php Log Message: ----------- fixed bug #4257 Hide fractional seconds Signed-off-by: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Commit: efa453a8a0603d1350c74656785fb17f0bc0fcd3 https://github.com/phpmyadmin/phpmyadmin/commit/efa453a8a0603d1350c74656785… Author: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Date: 2014-01-30 (Thu, 30 Jan 2014) Changed paths: M js/makegrid.js Log Message: ----------- fixed bug #4257 Hide fractional seconds #2 Signed-off-by: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Commit: fc4ad4b6acfbde357309a98dc9cdeedc08c626fe https://github.com/phpmyadmin/phpmyadmin/commit/fc4ad4b6acfbde357309a98dc9c… Author: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Date: 2014-01-30 (Thu, 30 Jan 2014) Changed paths: M js/jquery/jquery-ui-timepicker-addon.js Log Message: ----------- fixed bug #4257 Hide fractional seconds #3 Signed-off-by: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Commit: b93e4269985688eab4b8899347e4c3040d10d0ea https://github.com/phpmyadmin/phpmyadmin/commit/b93e4269985688eab4b8899347e… Author: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Date: 2014-01-30 (Thu, 30 Jan 2014) Changed paths: M js/functions.js M libraries/Util.class.php M libraries/insert_edit.lib.php Log Message: ----------- bug#4257 - fixed datetimepicker view of record edit page Signed-off-by: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Commit: 2f2dd3b548e769f2e65ab838cd5cca9fbb8c2561 https://github.com/phpmyadmin/phpmyadmin/commit/2f2dd3b548e769f2e65ab838cd5… Author: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Date: 2014-01-30 (Thu, 30 Jan 2014) Changed paths: M js/functions.js Log Message: ----------- bug#4257 - refixed datetimepicker view of record edit page Signed-off-by: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Commit: 8cc01b38ae313d5f3e8576b1b4180e8ee1e92896 https://github.com/phpmyadmin/phpmyadmin/commit/8cc01b38ae313d5f3e8576b1b41… Author: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Date: 2014-01-30 (Thu, 30 Jan 2014) Changed paths: M js/functions.js M libraries/DisplayResults.class.php M libraries/Util.class.php M libraries/insert_edit.lib.php Log Message: ----------- bug#4257 - fixed test failures Signed-off-by: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Commit: 4616eb093ecd8b2f4a5fbb29f641a7f64fc238b4 https://github.com/phpmyadmin/phpmyadmin/commit/4616eb093ecd8b2f4a5fbb29f64… Author: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Date: 2014-01-30 (Thu, 30 Jan 2014) Changed paths: M libraries/insert_edit.lib.php Log Message: ----------- bug#4257 - readded something missed Signed-off-by: Viduranga Wijesooriya <vpowerrc(a)gmail.com> Commit: 2bca34d2f8030ff5b0705ff63fa8a592650430c1 https://github.com/phpmyadmin/phpmyadmin/commit/2bca34d2f8030ff5b0705ff63fa… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M js/functions.js M js/jquery/jquery-ui-timepicker-addon.js M js/makegrid.js M libraries/DisplayResults.class.php M libraries/Util.class.php M libraries/insert_edit.lib.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 03e61d4f510b4cb454f4858465a025c028520d71 https://github.com/phpmyadmin/phpmyadmin/commit/03e61d4f510b4cb454f4858465a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for fix of bug #4257 Signed-off-by: Marc Delisle <marc(a)infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b7dfae03b90e...03e61d4f510b

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git January 2014