Git December 2014

git@phpmyadmin.net

24 participants
453 discussions

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] f6b7f9: Fix merge conflicts
by Marc Delisle 23 Dec '14

23 Dec '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f6b7f98322e51188011195c06dd0946dbb70040b https://github.com/phpmyadmin/phpmyadmin/commit/f6b7f98322e51188011195c06dd… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M libraries/Util.class.php M libraries/plugins/export/ExportSql.class.php M test/classes/plugin/export/PMA_ExportSql_test.php M test/libraries/common/PMA_quoting_slashing_test.php Log Message: ----------- Fix merge conflicts Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: f6bafdc45e9478768265454e9f88e21c3b01b0ed https://github.com/phpmyadmin/phpmyadmin/commit/f6bafdc45e9478768265454e9f8… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Marc Delisle <marc(a)infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3be2f44e3a11...f6bafdc45e94

1 0

[Phpmyadmin-git] [phpmyadmin/localized_docs] 0a8bbb: Translated using Weblate (Estonian)
by Kristjan Räts 23 Dec '14

23 Dec '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/localized_docs Commit: 0a8bbb46fecd5e567727b29328b34dc86b4e687f https://github.com/phpmyadmin/localized_docs/commit/0a8bbb46fecd5e567727b29… Author: Kristjan Räts <kristjanrats(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M po/et.mo M po/et.po Log Message: ----------- Translated using Weblate (Estonian) Currently translated at 17.3% (287 of 1657 strings) [CI skip]

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0430ac: #4663 Export missing back ticks for order table na...
by Atul Pratap Singh 23 Dec '14

23 Dec '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0430ac63371e42fa0847ed78655b48769ba5fc6a https://github.com/phpmyadmin/phpmyadmin/commit/0430ac63371e42fa0847ed78655… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M libraries/Util.class.php M libraries/plugins/export/ExportSql.class.php M test/classes/plugin/export/PMA_ExportSql_test.php M test/libraries/common/PMA_quoting_slashing_test.php Log Message: ----------- #4663 Export missing back ticks for order table name Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: ac6657c1fd4e208e91dbb84a7e878095fbae1adf https://github.com/phpmyadmin/phpmyadmin/commit/ac6657c1fd4e208e91dbb84a7e8… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M libraries/Util.class.php M libraries/plugins/export/ExportSql.class.php M test/classes/plugin/export/PMA_ExportSql_test.php M test/libraries/common/PMA_quoting_slashing_test.php Log Message: ----------- Merge pull request #1435 from madhuracj/Bug4663 #4663 Export missing back ticks for order table name Commit: a6c53149be8d357283436ad409a217c7c91a3ce4 https://github.com/phpmyadmin/phpmyadmin/commit/a6c53149be8d357283436ad409a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: af33e8a1443a8a62987b17cca0d5c797cf5d7d6f https://github.com/phpmyadmin/phpmyadmin/commit/af33e8a1443a8a62987b17cca0d… Author: Smita Kumari <kumarismita62(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M libraries/central_columns.lib.php Log Message: ----------- fix bug #4665 Signed-off-by: Smita Kumari <kumarismita62(a)gmail.com> Commit: b9cb88c5fc4fd72cce1d0534ad6bb5de5acde060 https://github.com/phpmyadmin/phpmyadmin/commit/b9cb88c5fc4fd72cce1d0534ad6… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M libraries/central_columns.lib.php Log Message: ----------- Merge pull request #1436 from smita786/QA_4_3 fix bug #4665 Commit: fdac93897ad564ed7645f6c59a0e7bad68b89cfd https://github.com/phpmyadmin/phpmyadmin/commit/fdac93897ad564ed7645f6c59a0… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Log Message: ----------- Merge commit 'a6c53149be8d357283436ad409a217c7c91a3ce4' Commit: 3be2f44e3a11c830466dd64662b37f0afde3574b https://github.com/phpmyadmin/phpmyadmin/commit/3be2f44e3a11c830466dd64662b… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M libraries/central_columns.lib.php Log Message: ----------- Merge branch 'QA_4_3' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6f43628f0639...3be2f44e3a11

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] af33e8: fix bug #4665
by Atul Pratap Singh 23 Dec '14

23 Dec '14

Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: af33e8a1443a8a62987b17cca0d5c797cf5d7d6f https://github.com/phpmyadmin/phpmyadmin/commit/af33e8a1443a8a62987b17cca0d… Author: Smita Kumari <kumarismita62(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M libraries/central_columns.lib.php Log Message: ----------- fix bug #4665 Signed-off-by: Smita Kumari <kumarismita62(a)gmail.com> Commit: b9cb88c5fc4fd72cce1d0534ad6bb5de5acde060 https://github.com/phpmyadmin/phpmyadmin/commit/b9cb88c5fc4fd72cce1d0534ad6… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M libraries/central_columns.lib.php Log Message: ----------- Merge pull request #1436 from smita786/QA_4_3 fix bug #4665 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a6c53149be8d...b9cb88c5fc4f

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] a6c531: ChangeLog entry
by Marc Delisle 23 Dec '14

23 Dec '14

Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: a6c53149be8d357283436ad409a217c7c91a3ce4 https://github.com/phpmyadmin/phpmyadmin/commit/a6c53149be8d357283436ad409a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0430ac: #4663 Export missing back ticks for order table na...
by Marc Delisle 23 Dec '14

23 Dec '14

Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0430ac63371e42fa0847ed78655b48769ba5fc6a https://github.com/phpmyadmin/phpmyadmin/commit/0430ac63371e42fa0847ed78655… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M libraries/Util.class.php M libraries/plugins/export/ExportSql.class.php M test/classes/plugin/export/PMA_ExportSql_test.php M test/libraries/common/PMA_quoting_slashing_test.php Log Message: ----------- #4663 Export missing back ticks for order table name Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: ac6657c1fd4e208e91dbb84a7e878095fbae1adf https://github.com/phpmyadmin/phpmyadmin/commit/ac6657c1fd4e208e91dbb84a7e8… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M libraries/Util.class.php M libraries/plugins/export/ExportSql.class.php M test/classes/plugin/export/PMA_ExportSql_test.php M test/libraries/common/PMA_quoting_slashing_test.php Log Message: ----------- Merge pull request #1435 from madhuracj/Bug4663 #4663 Export missing back ticks for order table name Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a98ec2c16228...ac6657c1fd4e

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] a98ec2: Fix js reports; TypeError: /([a-zA-Z]+):/.exec(......
by Atul Pratap Singh 23 Dec '14

23 Dec '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a98ec2c16228290f213ec1a85751e058a707891f https://github.com/phpmyadmin/phpmyadmin/commit/a98ec2c16228290f213ec1a8575… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M js/error_report.js Log Message: ----------- Fix js reports; TypeError: /([a-zA-Z]+):/.exec(...) is null Signed-off-by: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Commit: 6f43628f063920c78256227d913d2629eac80eb1 https://github.com/phpmyadmin/phpmyadmin/commit/6f43628f063920c78256227d913… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M js/error_report.js Log Message: ----------- Merge branch 'QA_4_3' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/62b04a7b532e...6f43628f0639

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] a98ec2: Fix js reports; TypeError: /([a-zA-Z]+):/.exec(......
by Atul Pratap Singh 23 Dec '14

23 Dec '14

Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: a98ec2c16228290f213ec1a85751e058a707891f https://github.com/phpmyadmin/phpmyadmin/commit/a98ec2c16228290f213ec1a8575… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M js/error_report.js Log Message: ----------- Fix js reports; TypeError: /([a-zA-Z]+):/.exec(...) is null Signed-off-by: Atul Pratap Singh <atulpratapsingh05(a)gmail.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] c44579: bug #4666 Undefined indexes in table stucture prin...
by Madhura Jayaratne 23 Dec '14

23 Dec '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c445794bde26af0374d44ac18a57f546235a9707 https://github.com/phpmyadmin/phpmyadmin/commit/c445794bde26af0374d44ac18a5… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M ChangeLog M libraries/tbl_printview.lib.php M test/libraries/PMA_tbl_printview_test.php Log Message: ----------- bug #4666 Undefined indexes in table stucture print view of a view Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 62b04a7b532e8b0fc6d4e3f64617c4b291e41e33 https://github.com/phpmyadmin/phpmyadmin/commit/62b04a7b532e8b0fc6d4e3f6461… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M ChangeLog M libraries/tbl_printview.lib.php M test/libraries/PMA_tbl_printview_test.php Log Message: ----------- Merge branch 'QA_4_3' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0bc4e2e6049f...62b04a7b532e

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] c44579: bug #4666 Undefined indexes in table stucture prin...
by Madhura Jayaratne 23 Dec '14

23 Dec '14

Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: c445794bde26af0374d44ac18a57f546235a9707 https://github.com/phpmyadmin/phpmyadmin/commit/c445794bde26af0374d44ac18a5… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M ChangeLog M libraries/tbl_printview.lib.php M test/libraries/PMA_tbl_printview_test.php Log Message: ----------- bug #4666 Undefined indexes in table stucture print view of a view Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git December 2014