Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: cedc7a442c7a636ec7caad62f0d3cc177b5bc365
      
https://github.com/phpmyadmin/phpmyadmin/commit/cedc7a442c7a636ec7caad62f0d3cc177b5bc365
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2016-01-05 (Tue, 05 Jan 2016)

  Changed paths:
    M ChangeLog
    M js/cross_framing_protection.js

  Log Message:
  -----------
  Fix hiding of page content behind menu

We use jQuery to to the initializaton rather than directly overwriting
onload, which breaks other things,

Fixes #11820, #11812

Signed-off-by: Michal Čihař <mic...@cihar.com>


  Commit: 592207946ecd5e143660548a468dd83ef7a658b2
      
https://github.com/phpmyadmin/phpmyadmin/commit/592207946ecd5e143660548a468dd83ef7a658b2
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2016-01-05 (Tue, 05 Jan 2016)

  Changed paths:
    M ChangeLog
    M js/cross_framing_protection.js

  Log Message:
  -----------
  Merge branch 'QA_4_5'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/e23ad2e57d1a...592207946ecd
_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

Reply via email to