Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 373a7a025e981bef46489ec77647e06bf0a9c6a9
https://github.com/phpmyadmin/phpmyadmin/commit/373a7a025e981bef46489ec77647e06bf0a9c6a9
Author: Marc Delisle <[email protected]>
Date: 2013-01-15 (Tue, 15 Jan 2013)
Changed paths:
M ChangeLog
M libraries/Error_Handler.class.php
M libraries/core.lib.php
M test/libraries/core/PMA_warnMissingExtension_test.php
Log Message:
-----------
bug #3599362 [core] Double-escaped error message
Commit: 6314225f415a53fa0581eae0024d0b83b4bdf89e
https://github.com/phpmyadmin/phpmyadmin/commit/6314225f415a53fa0581eae0024d0b83b4bdf89e
Author: Marc Delisle <[email protected]>
Date: 2013-01-15 (Tue, 15 Jan 2013)
Changed paths:
M js/server_status_monitor.js
M js/tbl_chart.js
M po/cs.po
M po/ro.po
M po/sv.po
Log Message:
-----------
Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5
Commit: 0fb7b5907d9206efb3d155f467c9b40c29485a31
https://github.com/phpmyadmin/phpmyadmin/commit/0fb7b5907d9206efb3d155f467c9b40c29485a31
Author: Marc Delisle <[email protected]>
Date: 2013-01-15 (Tue, 15 Jan 2013)
Changed paths:
M ChangeLog
M libraries/Error_Handler.class.php
M libraries/core.lib.php
M test/libraries/core/PMA_warnMissingExtension_test.php
Log Message:
-----------
Fix merge conflicts
Commit: 86ebd0130d277a0c35c5739215bda9e3669cbe08
https://github.com/phpmyadmin/phpmyadmin/commit/86ebd0130d277a0c35c5739215bda9e3669cbe08
Author: Marc Delisle <[email protected]>
Date: 2013-01-15 (Tue, 15 Jan 2013)
Changed paths:
M test/classes/PMA_Error_Handler_test.php
Log Message:
-----------
I don't understand this test (which now fails)
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/86dfd2506c15...86ebd0130d27
------------------------------------------------------------------------------
Master SQL Server Development, Administration, T-SQL, SSAS, SSIS, SSRS
and more. Get SQL Server skills now (including 2012) with LearnDevNow -
200+ hours of step-by-step video tutorials by Microsoft MVPs and experts.
SALE $99.99 this month only - learn more at:
http://p.sf.net/sfu/learnmore_122512
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
