Branch: refs/heads/master
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: cfa542cfa9b8e9869c5a6c55d7db594261a93548
https://github.com/phpmyadmin/phpmyadmin/commit/cfa542cfa9b8e9869c5a6c55d7d…
Author: Ryan Stasel <staze(a)staze.org>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Changed paths:
M libraries/Scripts.class.php
Log Message:
-----------
Bug #4845 White screen (Cloudflare)
Signed-off-by: Ryan Stasel <staze(a)staze.org>
Commit: 6806cff46857acf6b89e4670932bc1956cbaaf58
https://github.com/phpmyadmin/phpmyadmin/commit/6806cff46857acf6b89e4670932…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
ChangeLog entry
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: 8d745ab4eb2968f3334614fc0dcbfb7ad4a61a34
https://github.com/phpmyadmin/phpmyadmin/commit/8d745ab4eb2968f3334614fc0dc…
Author: Xavier Navarro <xvnavarro(a)gmail.com>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Changed paths:
M po/ca.po
Log Message:
-----------
Translated using Weblate (Catalan)
Currently translated at 100.0% (3035 of 3035 strings)
[CI skip]
Commit: bfbbafdcb652023869bc47d23aa87090c90d100b
https://github.com/phpmyadmin/phpmyadmin/commit/bfbbafdcb652023869bc47d23aa…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Changed paths:
M po/fr.po
Log Message:
-----------
Translated using Weblate (French)
Currently translated at 100.0% (3035 of 3035 strings)
[CI skip]
Commit: ff8b956d2bbef43299ab5b5c4366c5002b722236
https://github.com/phpmyadmin/phpmyadmin/commit/ff8b956d2bbef43299ab5b5c436…
Author: Weblate <noreply(a)weblate.org>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Changed paths:
M ChangeLog
M libraries/Util.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4
Commit: 0acbf9954955a94f9373ea65cc38536689d8bac4
https://github.com/phpmyadmin/phpmyadmin/commit/0acbf9954955a94f9373ea65cc3…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Changed paths:
M test/classes/PMA_Footer_test.php
M test/classes/PMA_Scripts_test.php
Log Message:
-----------
Fix unit tests for Cloudflare support
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: c16798e0b41ae52fb0bb5f05dbc7501ecd31ea7d
https://github.com/phpmyadmin/phpmyadmin/commit/c16798e0b41ae52fb0bb5f05dbc…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Changed paths:
M ChangeLog
M libraries/Util.class.php
M po/ca.po
M po/fr.po
Log Message:
-----------
Fix merge conflict
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: 0327c0273dc0ee86c59795ca7438f6da6fc3d74a
https://github.com/phpmyadmin/phpmyadmin/commit/0327c0273dc0ee86c59795ca743…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Changed paths:
M libraries/Scripts.class.php
Log Message:
-----------
Merge commit 'cfa542c'
Commit: bc76252f269f1dd58746cb92ca170c6786182bf8
https://github.com/phpmyadmin/phpmyadmin/commit/bc76252f269f1dd58746cb92ca1…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix merge conflict
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: b764ec89717586cea090bb6f523ed5b641d5f92c
https://github.com/phpmyadmin/phpmyadmin/commit/b764ec89717586cea090bb6f523…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Log Message:
-----------
Merge commit 'ff8b956'
Commit: 965075452a6d430cffcffa5763d18134faeefa3d
https://github.com/phpmyadmin/phpmyadmin/commit/965075452a6d430cffcffa5763d…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Changed paths:
M test/classes/PMA_Footer_test.php
M test/classes/PMA_Scripts_test.php
Log Message:
-----------
Merge commit '0acbf99'
Commit: c9dc6408b2a12becc8d2592de84b0302e529a7d9
https://github.com/phpmyadmin/phpmyadmin/commit/c9dc6408b2a12becc8d2592de84…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-04-14 (Tue, 14 Apr 2015)
Log Message:
-----------
Merge branch 'QA_4_4'
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/5b8b8bc8dc2c...c9dc6408b2a1