Git November 2016

git@phpmyadmin.net

22 participants
263 discussions

[phpmyadmin/docker] 071536: Add version label

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: 0715366ee317fd43589cc1a85d09ed3edbbd4c57 https://github.com/phpmyadmin/docker/commit/0715366ee317fd43589cc1a85d09ed3… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M Dockerfile Log Message: ----------- Add version label Issue #85 Signed-off-by: Michal Čihař <michal(a)cihar.com>

7 years, 9 months

[phpmyadmin/phpmyadmin] 09f56a: Fix test expectations

by Michal Čihař

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 09f56abed65186216858cf30bdb6f3bea01c708f https://github.com/phpmyadmin/phpmyadmin/commit/09f56abed65186216858cf30bdb… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M test/libraries/core/PMA_headerLocation_test.php Log Message: ----------- Fix test expectations Signed-off-by: Michal Čihař <michal(a)cihar.com>

7 years, 9 months

[phpmyadmin/phpmyadmin] 62cf19: remove unused property "$_isAjaxPage"

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 62cf19dbd70335d24f2e21cb95f495c40b95a64f https://github.com/phpmyadmin/phpmyadmin/commit/62cf19dbd70335d24f2e21cb95f… Author: Arrizal Amin <arrizalamin(a)gmail.com> Date: 2016-11-20 (Sun, 20 Nov 2016) Changed paths: M libraries/Response.php Log Message: ----------- remove unused property "$_isAjaxPage" Signed-off-by: Arrizal Amin <arrizalamin(a)gmail.com> Commit: 09f56abed65186216858cf30bdb6f3bea01c708f https://github.com/phpmyadmin/phpmyadmin/commit/09f56abed65186216858cf30bdb… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M test/libraries/core/PMA_headerLocation_test.php Log Message: ----------- Fix test expectations Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: d3b6d1e7fda368c4422fdbff2bd1bad970fd7a88 https://github.com/phpmyadmin/phpmyadmin/commit/d3b6d1e7fda368c4422fdbff2bd… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M test/libraries/core/PMA_headerLocation_test.php Log Message: ----------- Merge branch 'QA_4_6' Commit: 2a2b52bbec90c4d08bcb63fe9eb613d59eda0262 https://github.com/phpmyadmin/phpmyadmin/commit/2a2b52bbec90c4d08bcb63fe9eb… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/Response.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12721' Commit: 2d2bc08d6c307815ca03ea8ae88dee6f0476be64 https://github.com/phpmyadmin/phpmyadmin/commit/2d2bc08d6c307815ca03ea8ae88… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/Response.php Log Message: ----------- Remove obsolete comment Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/519bddaa0988...2d2bc08d6c30

7 years, 9 months

[phpmyadmin/phpmyadmin] 48ebdf: Add missing end of meta tags in header

by Michal Čihař

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 48ebdf1852bae90f0f1431fc7983f591ce540025 https://github.com/phpmyadmin/phpmyadmin/commit/48ebdf1852bae90f0f1431fc798… Author: Jees K Denny <jees.jees5(a)gmail.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/Header.php Log Message: ----------- Add missing end of meta tags in header Issue #12746 Signed-off-by: Jees K Denny <jees.jees5(a)gmail.com> Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 068eae7e676fb7f6962036c71074707c13ccf216 https://github.com/phpmyadmin/phpmyadmin/commit/068eae7e676fb7f6962036c7107… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M templates/header_location.phtml Log Message: ----------- Add missing end of tags Fixes #12746 Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ad55a6eba86d...068eae7e676f

7 years, 9 months

[phpmyadmin/phpmyadmin] 48ebdf: Add missing end of meta tags in header

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 48ebdf1852bae90f0f1431fc7983f591ce540025 https://github.com/phpmyadmin/phpmyadmin/commit/48ebdf1852bae90f0f1431fc798… Author: Jees K Denny <jees.jees5(a)gmail.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/Header.php Log Message: ----------- Add missing end of meta tags in header Issue #12746 Signed-off-by: Jees K Denny <jees.jees5(a)gmail.com> Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 068eae7e676fb7f6962036c71074707c13ccf216 https://github.com/phpmyadmin/phpmyadmin/commit/068eae7e676fb7f6962036c7107… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M templates/header_location.phtml Log Message: ----------- Add missing end of tags Fixes #12746 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 519bddaa0988bebac11060922b0ad82b815e6dfd https://github.com/phpmyadmin/phpmyadmin/commit/519bddaa0988bebac11060922b0… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/Header.php M templates/header_location.phtml Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/84971eaf4f1b...519bddaa0988

7 years, 9 months

[phpmyadmin/website] 9133db: Document not acceptable sites

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/website Commit: 9133db77a6014b27eb80fa0befc93c0adb691894 https://github.com/phpmyadmin/website/commit/9133db77a6014b27eb80fa0befc93c… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-21 (Mon, 21 Nov 2016) Changed paths: M pmaweb/templates/_sponsorship_conditions.html Log Message: ----------- Document not acceptable sites As agreed on the team meeting, see https://irc.phpmyadmin.net/meetbot/phpmyadmin/2016/phpmyadmin.2016-11-09-12… Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 6333b4807ccd100796894af1c5c85269a66453c6 https://github.com/phpmyadmin/website/commit/6333b4807ccd100796894af1c5c852… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M pmaweb/templates/_sponsorship_conditions.html Log Message: ----------- Update to mention illegal content links See team mailing list thread for decision (needs login): https://lists.phpmyadmin.net/mailman/private/team/2016-November/004976.html Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 3bb28f0db497da67b5a62c1a12caf331764fc09b https://github.com/phpmyadmin/website/commit/3bb28f0db497da67b5a62c1a12caf3… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M pmaweb/templates/_sponsorship_conditions.html Log Message: ----------- Add missing comma Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: c9f2dfca931a3541d9247f438b9b4194937f5d26 https://github.com/phpmyadmin/website/commit/c9f2dfca931a3541d9247f438b9b41… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M pmaweb/templates/_sponsorship_conditions.html Log Message: ----------- Merge pull request #44 from nijel/sponsor-areas Document not acceptable sites Compare: https://github.com/phpmyadmin/website/compare/876dc426c44c...c9f2dfca931a

7 years, 9 months

[phpmyadmin/phpmyadmin] b8a9b0: Share code for getting temporary directory

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b8a9b0f30d3d83746967ef457cca641e014c32a5 https://github.com/phpmyadmin/phpmyadmin/commit/b8a9b0f30d3d83746967ef457cc… Author: osaid <osaid.nasir(a)gmail.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/Encoding.php M libraries/File.php M libraries/config/ConfigFile.php Log Message: ----------- Share code for getting temporary directory Changed Encoding.php and File.php. Fixes #12514 Signed-off-by: Osaid <osaid.nasir(a)gmail.com> Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 84971eaf4f1b47a148e60a0042291e5ccb45ea3d https://github.com/phpmyadmin/phpmyadmin/commit/84971eaf4f1b47a148e60a00422… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/config/ConfigFile.php Log Message: ----------- Make function static as it's called statically Issue #12690, #12514 Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ef1f3b5cf7da...84971eaf4f1b

7 years, 9 months

[phpmyadmin/phpmyadmin] ad55a6: Avoid listing demo.phpmyadmin.net twice

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ad55a6eba86d9fdd6e2062fc7644aa1180eac0bd https://github.com/phpmyadmin/phpmyadmin/commit/ad55a6eba86d9fdd6e2062fc764… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/core.lib.php Log Message: ----------- Avoid listing demo.phpmyadmin.net twice Fixes #12744 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ef1f3b5cf7da0f8798c4156e3c7ca2e88205b9ac https://github.com/phpmyadmin/phpmyadmin/commit/ef1f3b5cf7da0f8798c4156e3c7… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/core.lib.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/df66e4fa080e...ef1f3b5cf7da

7 years, 9 months

[phpmyadmin/phpmyadmin] ad55a6: Avoid listing demo.phpmyadmin.net twice

by Michal Čihař

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: ad55a6eba86d9fdd6e2062fc7644aa1180eac0bd https://github.com/phpmyadmin/phpmyadmin/commit/ad55a6eba86d9fdd6e2062fc764… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/core.lib.php Log Message: ----------- Avoid listing demo.phpmyadmin.net twice Fixes #12744 Signed-off-by: Michal Čihař <michal(a)cihar.com>

7 years, 9 months

[phpmyadmin/phpmyadmin] df66e4: Share code for handling uploaded file

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: df66e4fa080e2aa938bc415a5be9bfe7af611301 https://github.com/phpmyadmin/phpmyadmin/commit/df66e4fa080e2aa938bc415a5be… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/File.php M prefs_manage.php Log Message: ----------- Share code for handling uploaded file There is no need to duplicate the incomplete logic in several places. Issue #12514, #12690 Signed-off-by: Michal Čihař <michal(a)cihar.com>

7 years, 9 months

← Newer
1
2
3
4
5
6
7
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git November 2016