Git April 2015

git@phpmyadmin.net

30 participants
566 discussions

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] cfa542: Bug #4845 White screen (Cloudflare)

by Marc Delisle

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

9 years, 5 months

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0f3840: bug #4207 json_encode error due to strftime return...

by Madhura Jayaratne

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0f3840138f970f7ff23ce2ff46a9cd3ee2625826 https://github.com/phpmyadmin/phpmyadmin/commit/0f3840138f970f7ff23ce2ff46a… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-04-14 (Tue, 14 Apr 2015) Changed paths: M ChangeLog M libraries/Util.class.php Log Message: ----------- bug #4207 json_encode error due to strftime returning non utf8 chars in Windows 8.1 Chinese version Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 5b8b8bc8dc2c536f3fd8178dd1e64344a67f2c02 https://github.com/phpmyadmin/phpmyadmin/commit/5b8b8bc8dc2c536f3fd8178dd1e… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-04-14 (Tue, 14 Apr 2015) Changed paths: M ChangeLog M libraries/Util.class.php Log Message: ----------- Merge branch 'QA_4_4' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3dbc09a2b343...5b8b8bc8dc2c

9 years, 5 months

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] cfa542: Bug #4845 White screen (Cloudflare)

by Marc Delisle

Branch: refs/heads/QA_4_4 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: 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> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ff8b956d2bbe...c16798e0b41a

9 years, 5 months

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 8d745a: Translated using Weblate (Catalan)

by Weblate

Branch: refs/heads/QA_4_4 Home: https://github.com/phpmyadmin/phpmyadmin 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 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0f3840138f97...ff8b956d2bbe

9 years, 5 months

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0f3840: bug #4207 json_encode error due to strftime return...

by Madhura Jayaratne

Branch: refs/heads/QA_4_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0f3840138f970f7ff23ce2ff46a9cd3ee2625826 https://github.com/phpmyadmin/phpmyadmin/commit/0f3840138f970f7ff23ce2ff46a… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-04-14 (Tue, 14 Apr 2015) Changed paths: M ChangeLog M libraries/Util.class.php Log Message: ----------- bug #4207 json_encode error due to strftime returning non utf8 chars in Windows 8.1 Chinese version Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

9 years, 5 months

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d5ce38: Ignore ./vendor directory of composer

by Marc Delisle

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d5ce381e943bece7224f081d94ef76fc84fb9acb https://github.com/phpmyadmin/phpmyadmin/commit/d5ce381e943bece7224f081d94e… Author: P.Alex <web.is.art(a)p-alex.com> Date: 2015-04-13 (Mon, 13 Apr 2015) Changed paths: M .gitignore Log Message: ----------- Ignore ./vendor directory of composer Signed-off-by: P.Alex <web.is.art(a)p-alex.com> Commit: 3dbc09a2b3437a058063e06bf38d3d9bead113d3 https://github.com/phpmyadmin/phpmyadmin/commit/3dbc09a2b3437a058063e06bf38… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-04-14 (Tue, 14 Apr 2015) Changed paths: M .gitignore Log Message: ----------- Merge pull request #1643 from PAlexcom/master-composer Ignore ./vendor directory of composer Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fe958159ac5f...3dbc09a2b343

9 years, 5 months

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] fe9581: Translated using Weblate (French)

by Marc Delisle

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: fe958159ac5fefa4904afddb1e0af0b366e297a6 https://github.com/phpmyadmin/phpmyadmin/commit/fe958159ac5fefa4904afddb1e0… 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% (3075 of 3075 strings) [CI skip]

9 years, 5 months

[Phpmyadmin-git] [phpmyadmin/scripts] 4ef1f1: Automatically include set of themes in demo

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/scripts Commit: 4ef1f1e50c6cf94807eb742b978e43911823ef90 https://github.com/phpmyadmin/scripts/commit/4ef1f1e50c6cf94807eb742b978e43… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-04-14 (Tue, 14 Apr 2015) Changed paths: M demo/bin/pma-demo-update M demo/php/versions.ini Log Message: ----------- Automatically include set of themes in demo Signed-off-by: Michal Čihař <michal(a)cihar.com>

9 years, 5 months

[Phpmyadmin-git] [phpmyadmin/scripts] d15410: Automatically clone themes for demo server

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/scripts Commit: d15410adc91ebcd576d9b73b592d237ce821dab2 https://github.com/phpmyadmin/scripts/commit/d15410adc91ebcd576d9b73b592d23… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-04-14 (Tue, 14 Apr 2015) Changed paths: M demo/bin/pma-demo-update Log Message: ----------- Automatically clone themes for demo server Signed-off-by: Michal Čihař <michal(a)cihar.com>

9 years, 5 months

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9d080a: Use verbatim GPL 2.0 licence text

by Andreas Stieger

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9d080a482fae73bde5049620088d4687da245163 https://github.com/phpmyadmin/phpmyadmin/commit/9d080a482fae73bde5049620088… Author: Andreas Stieger <andreas.stieger(a)gmx.de> Date: 2015-04-14 (Tue, 14 Apr 2015) Changed paths: M LICENSE Log Message: ----------- Use verbatim GPL 2.0 licence text Signed-off-by: Marc Delisle <marc(a)infomarc.info>

9 years, 5 months

← Newer
1
...
20
21
22
23
24
25
26
...
57
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git April 2015