Git March 2016

git@phpmyadmin.net

12 participants
155 discussions

[phpmyadmin/phpmyadmin] 3c583b: Merge branch 'MAINT_4_5_5' into MAINT_4_5_5-securi...

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3c583b86d46f72f3ac331fea64fa02c3fbf38561 https://github.com/phpmyadmin/phpmyadmin/commit/3c583b86d46f72f3ac331fea64f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M ChangeLog M libraries/sql-parser/autoload.php Log Message: ----------- Merge branch 'MAINT_4_5_5' into MAINT_4_5_5-security Commit: 51a0d2f25a71432570f59dd9053b9dbbc93733b3 https://github.com/phpmyadmin/phpmyadmin/commit/51a0d2f25a71432570f59dd9053… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.5.5.1 release Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: 9eee3353a6141342f8b109d09737afde5550daf9 https://github.com/phpmyadmin/phpmyadmin/commit/9eee3353a6141342f8b109d0973… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M ChangeLog Log Message: ----------- Merge branch 'QA_4_5' into QA_4_6 Commit: 4efb1c8a595f0fcbef5aad4d7460ec7b228f0cc4 https://github.com/phpmyadmin/phpmyadmin/commit/4efb1c8a595f0fcbef5aad4d746… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M ChangeLog Log Message: ----------- Merge branch 'QA_4_6' Commit: 380deb4f3956cba4a6f5e3781cc0c0d14752556d https://github.com/phpmyadmin/phpmyadmin/commit/380deb4f3956cba4a6f5e3781cc… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M libraries/session.inc.php M libraries/session.lib.php Log Message: ----------- Share code for generating token There is no need to have two copies of that. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: b856502d6443a41b1772661ad9f33da01758d7e9 https://github.com/phpmyadmin/phpmyadmin/commit/b856502d6443a41b1772661ad9f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M libraries/plugins/auth/AuthenticationCookie.php M libraries/session.lib.php Log Message: ----------- Prefer phpseclib if avaible It does better decisions about which backend to use than simply using openssl. Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/eb536f2c764d...b856502d6443

8 years, 6 months

[phpmyadmin/phpmyadmin] 12bf06: Add changelog for issue #12055

by Michal Čihař

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 12bf06e0166a6779b88e2c6f1a28edde546f9682 https://github.com/phpmyadmin/phpmyadmin/commit/12bf06e0166a6779b88e2c6f1a2… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M ChangeLog Log Message: ----------- Add changelog for issue #12055 Signed-off-by: Michal Čihař <michal(a)cihar.com>

8 years, 6 months

[phpmyadmin/phpmyadmin] 12bf06: Add changelog for issue #12055

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 12bf06e0166a6779b88e2c6f1a28edde546f9682 https://github.com/phpmyadmin/phpmyadmin/commit/12bf06e0166a6779b88e2c6f1a2… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M ChangeLog Log Message: ----------- Add changelog for issue #12055 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: eb536f2c764d06b78db0be8734adf235adf95066 https://github.com/phpmyadmin/phpmyadmin/commit/eb536f2c764d06b78db0be8734a… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M ChangeLog Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4dce6ec2db40...eb536f2c764d

8 years, 6 months

[phpmyadmin/phpmyadmin] a6b3a9: Fix error when we can not generate random string

by Michal Čihař

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: a6b3a9ce5132af6000d204760b9bfd51cd3e0ac8 https://github.com/phpmyadmin/phpmyadmin/commit/a6b3a9ce5132af6000d204760b9… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M ChangeLog M libraries/session.inc.php Log Message: ----------- Fix error when we can not generate random string Fixes #12056 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 02aa0729dcb876e0c87f6744309b6e5880f4e663 https://github.com/phpmyadmin/phpmyadmin/commit/02aa0729dcb876e0c87f6744309… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M libraries/Util.php M libraries/core.lib.php Log Message: ----------- Make PMA_fatalError work even early The messaging framework can not make assumptions about available objects as this doesn't have to be satisfied in early PMA_fatalError case. Issue #12056 Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8eee22be3ae7...02aa0729dcb8

8 years, 6 months

[phpmyadmin/phpmyadmin] a6b3a9: Fix error when we can not generate random string

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a6b3a9ce5132af6000d204760b9bfd51cd3e0ac8 https://github.com/phpmyadmin/phpmyadmin/commit/a6b3a9ce5132af6000d204760b9… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M ChangeLog M libraries/session.inc.php Log Message: ----------- Fix error when we can not generate random string Fixes #12056 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 02aa0729dcb876e0c87f6744309b6e5880f4e663 https://github.com/phpmyadmin/phpmyadmin/commit/02aa0729dcb876e0c87f6744309… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M libraries/Util.php M libraries/core.lib.php Log Message: ----------- Make PMA_fatalError work even early The messaging framework can not make assumptions about available objects as this doesn't have to be satisfied in early PMA_fatalError case. Issue #12056 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 4dce6ec2db4001c5af5c8dae7c077334c55c145a https://github.com/phpmyadmin/phpmyadmin/commit/4dce6ec2db4001c5af5c8dae7c0… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M ChangeLog M libraries/Util.php M libraries/core.lib.php M libraries/session.inc.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/faa1229ed7ee...4dce6ec2db40

8 years, 6 months

[phpmyadmin/website] cfb2b8: Adjust sponsors alt text

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/website Commit: cfb2b88f58b61a9e0ac46942e2c81937f4234394 https://github.com/phpmyadmin/website/commit/cfb2b88f58b61a9e0ac46942e2c819… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M pmaweb/templates/_sponsors.html M pmaweb/templates/sponsors.html Log Message: ----------- Adjust sponsors alt text Signed-off-by: Michal Čihař <michal(a)cihar.com>

8 years, 6 months

[phpmyadmin/website] afae12: Add new gold sponsor

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/website Commit: afae129c8bd0cbd8c37bb4e7784d1cf0ecb21d9c https://github.com/phpmyadmin/website/commit/afae129c8bd0cbd8c37bb4e7784d1c… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: A pmaweb/static/images/chameleon-john.png M pmaweb/templates/_sponsors.html M pmaweb/templates/sponsors.html Log Message: ----------- Add new gold sponsor Signed-off-by: Michal Čihař <michal(a)cihar.com>

8 years, 6 months

[phpmyadmin/phpmyadmin] 35becb: Fix duplicate function call

by Michal Čihař

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 35becb00ee77438873d82f32e7a225ccf138696e https://github.com/phpmyadmin/phpmyadmin/commit/35becb00ee77438873d82f32e7a… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M templates/database/structure/sortable_header.phtml Log Message: ----------- Fix duplicate function call Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 8eee22be3ae7c1696aaa136efa5e5875d7b0b92b https://github.com/phpmyadmin/phpmyadmin/commit/8eee22be3ae7c1696aaa136efa5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M build.xml Log Message: ----------- Lint templates as well This will help us spotting syntax errors even in files which are not covered by tests. Fixes #12055 Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ed5a8307c762...8eee22be3ae7

8 years, 6 months

[phpmyadmin/phpmyadmin] 35becb: Fix duplicate function call

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 35becb00ee77438873d82f32e7a225ccf138696e https://github.com/phpmyadmin/phpmyadmin/commit/35becb00ee77438873d82f32e7a… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M templates/database/structure/sortable_header.phtml Log Message: ----------- Fix duplicate function call Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 8eee22be3ae7c1696aaa136efa5e5875d7b0b92b https://github.com/phpmyadmin/phpmyadmin/commit/8eee22be3ae7c1696aaa136efa5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M build.xml Log Message: ----------- Lint templates as well This will help us spotting syntax errors even in files which are not covered by tests. Fixes #12055 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: faa1229ed7ee43ef19b0d0ac0c48ad0c81305e9f https://github.com/phpmyadmin/phpmyadmin/commit/faa1229ed7ee43ef19b0d0ac0c4… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M build.xml Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/85972d35293e...faa1229ed7ee

8 years, 6 months

[phpmyadmin/phpmyadmin] ed5a83: Fix wrong merge

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ed5a8307c7629e04bff0b89595cd98228e2e7d87 https://github.com/phpmyadmin/phpmyadmin/commit/ed5a8307c7629e04bff0b89595c… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M templates/table/search/input_box.phtml Log Message: ----------- Fix wrong merge Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 85972d35293e6458d00d09fe5bea7448448f4c17 https://github.com/phpmyadmin/phpmyadmin/commit/85972d35293e6458d00d09fe5be… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M templates/table/search/input_box.phtml Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4e5b08e26cc2...85972d35293e

8 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git March 2016