Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 0647138e7e0dc5e394b2b05fbfdd8afeec4ec938
https://github.com/phpmyadmin/phpmyadmin/commit/0647138e7e0dc5e394b2b05fbfdd8afeec4ec938
Author: Michal Čihař <[email protected]>
Date: 2017-05-04 (Thu, 04 May 2017)
Changed paths:
M ChangeLog
M libraries/session.inc.php
Log Message:
-----------
Properly report not working sessions
If saved session no longer contains variable we have just saved to it,
there is some problem. It's better to warn user right now than failing
later.
Fixes #13234
Signed-off-by: Michal Čihař <[email protected]>
Commit: 964d189f5c8a603de5758622b38310589a57be53
https://github.com/phpmyadmin/phpmyadmin/commit/964d189f5c8a603de5758622b38310589a57be53
Author: Michal Čihař <[email protected]>
Date: 2017-05-04 (Thu, 04 May 2017)
Changed paths:
M ChangeLog
M libraries/session.inc.php
Log Message:
-----------
Merge branch 'QA_4_7'
Commit: 604e3329f1e06a9fdd03a7b882819fe708cc93b2
https://github.com/phpmyadmin/phpmyadmin/commit/604e3329f1e06a9fdd03a7b882819fe708cc93b2
Author: Michal Čihař <[email protected]>
Date: 2017-05-04 (Thu, 04 May 2017)
Changed paths:
M libraries/Template.php
A libraries/twig/SanitizeExtension.php
M libraries/twig/UtilExtension.php
M scripts/generate-twig-cache
R templates/columns_definitions/column_adjust_privileges.phtml
A templates/columns_definitions/column_adjust_privileges.twig
R templates/columns_definitions/column_auto_increment.phtml
A templates/columns_definitions/column_auto_increment.twig
R templates/columns_definitions/column_extra.phtml
A templates/columns_definitions/column_extra.twig
R templates/columns_definitions/column_indexes.phtml
A templates/columns_definitions/column_indexes.twig
R templates/columns_definitions/column_length.phtml
A templates/columns_definitions/column_length.twig
R templates/columns_definitions/column_null.phtml
A templates/columns_definitions/column_null.twig
R templates/columns_definitions/column_type.phtml
A templates/columns_definitions/column_type.twig
R templates/columns_definitions/transformation_option.phtml
A templates/columns_definitions/transformation_option.twig
M templates/console/toolbar.twig
R templates/database/designer/aggregate_query_panel.phtml
A templates/database/designer/aggregate_query_panel.twig
R templates/database/designer/canvas.phtml
A templates/database/designer/canvas.twig
R templates/database/designer/delete_relation_panel.phtml
A templates/database/designer/delete_relation_panel.twig
R templates/database/designer/having_query_panel.phtml
A templates/database/designer/having_query_panel.twig
R templates/database/designer/new_relation_panel.phtml
A templates/database/designer/new_relation_panel.twig
R templates/database/designer/options_panel.phtml
A templates/database/designer/options_panel.twig
R templates/database/designer/rename_to_panel.phtml
A templates/database/designer/rename_to_panel.twig
R templates/database/designer/where_query_panel.phtml
A templates/database/designer/where_query_panel.twig
R templates/database/structure/browse_table.phtml
A templates/database/structure/browse_table.twig
R templates/database/structure/browse_table_label.phtml
A templates/database/structure/browse_table_label.twig
R templates/database/structure/empty_table.phtml
A templates/database/structure/empty_table.twig
R templates/database/structure/print_view_data_dictionary_link.phtml
A templates/database/structure/print_view_data_dictionary_link.twig
R templates/database/structure/search_table.phtml
A templates/database/structure/search_table.twig
R templates/database/structure/tracking_icon.phtml
A templates/database/structure/tracking_icon.twig
R templates/header_location.phtml
A templates/header_location.twig
Log Message:
-----------
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/61f294062a51...604e3329f1e0_______________________________________________
Git mailing list
[email protected]
https://lists.phpmyadmin.net/mailman/listinfo/git
