[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 50edaf: Load JSON rather than javascript from phpmyadmin.n...
Michal Čihař
mcihar at suse.cz
Mon Sep 3 15:04:12 CEST 2012
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 50edafc0884aa15d0a1aa178089ac6a1ad2eb18a
https://github.com/phpmyadmin/phpmyadmin/commit/50edafc0884aa15d0a1aa178089ac6a1ad2eb18a
Author: Michal Čihař <mcihar at suse.cz>
Date: 2012-09-03 (Mon, 03 Sep 2012)
Changed paths:
M js/functions.js
M libraries/header_http.inc.php
Log Message:
-----------
Load JSON rather than javascript from phpmyadmin.net
Conflicts:
js/functions.js
libraries/Header.class.php
Commit: a547f3d3e2cf36c6a904fa3e053fd8bddd3fbbb0
https://github.com/phpmyadmin/phpmyadmin/commit/a547f3d3e2cf36c6a904fa3e053fd8bddd3fbbb0
Author: Michal Čihař <mcihar at suse.cz>
Date: 2012-09-03 (Mon, 03 Sep 2012)
Changed paths:
M js/functions.js
Log Message:
-----------
Escape json reply received from server
Commit: 2d8dea9702d899e4ecc78e8385666e407a713540
https://github.com/phpmyadmin/phpmyadmin/commit/2d8dea9702d899e4ecc78e8385666e407a713540
Author: Michal Čihař <mcihar at suse.cz>
Date: 2012-09-03 (Mon, 03 Sep 2012)
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_3_5'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/05a7630c09aa...2d8dea9702d8
More information about the Git
mailing list