Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 58f810628b110d02b1502f26d4c58f31b5e5c966 https://github.com/phpmyadmin/phpmyadmin/commit/58f810628b110d02b1502f26d4c5... Author: Denver Gingerich <denver@ossguy.com> Date: 2013-11-22 (Fri, 22 Nov 2013) Changed paths: A DCO M README Log Message: ----------- Add DCO and note on how contributions are licensed phpMyAdmin begins using a DCO as of 2013-12-01 to ensure changes are GPLv2-or-later. Conservancy has drafted and approved the included Developer's Certificate of Origin ("DCO") and a related patch to the README to create a procedure whereby future contributors can use Signed-Off-By: in Git commits to confirm the patch is licensed under terms compatible with GPLv2-or-later. Signed-Off-By: "Bradley M. Kuhn" <bkuhn@ebb.org> Signed-Off-By: Tony Sebro <tony@sfconservancy.org> Signed-Off-By: Denver Gingerich <denver@ossguy.com> Commit: df5f144a6042f8fe01d012f1d9a3815767c5abfd https://github.com/phpmyadmin/phpmyadmin/commit/df5f144a6042f8fe01d012f1d9a3... Author: Denver Gingerich <denver@ossguy.com> Date: 2013-11-29 (Fri, 29 Nov 2013) Changed paths: M .gitignore M ChangeLog M README M doc/conf.py M doc/config.rst M doc/credits.rst M doc/setup.rst M error_report.php M import.php M js/error_report.js M js/makegrid.js M libraries/Config.class.php A libraries/Font.class.php M libraries/Footer.class.php M libraries/Header.class.php M libraries/Response.class.php M libraries/Types.class.php M libraries/Util.class.php M libraries/config.default.php M libraries/dbi/DBIDummy.class.php M libraries/insert_edit.lib.php M libraries/navigation/Nodes/Node_Database.class.php M libraries/navigation/Nodes/Node_DatabaseChild.class.php M libraries/schema/Eps_Relation_Schema.class.php M libraries/schema/Svg_Relation_Schema.class.php M libraries/sql_query_form.lib.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/gl.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/kn.po M po/ko.po M po/ky.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M prefs_manage.php A test/classes/PMA_Font_test.php R test/classes/schema/Svg_test.php M test/libraries/PMA_insert_edit_test.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge remote branch 'upstream/master' Commit: 0275254a8f289a18f9ee7e3ee0b250c7948bb56f https://github.com/phpmyadmin/phpmyadmin/commit/0275254a8f289a18f9ee7e3ee0b2... Author: Denver Gingerich <denver@ossguy.com> Date: 2013-11-29 (Fri, 29 Nov 2013) Changed paths: M CONTRIBUTING.md Log Message: ----------- Fix 47e0223 contributor file patch submission text Commit: 5ca674a93a8a3ab6ebe2e9ed190bd97787687609 https://github.com/phpmyadmin/phpmyadmin/commit/5ca674a93a8a3ab6ebe2e9ed190b... Author: Denver Gingerich <denver@ossguy.com> Date: 2013-11-29 (Fri, 29 Nov 2013) Changed paths: M CONTRIBUTING.md Log Message: ----------- Contributor file DCO text for 58f8106 per mynetx Commit: 7bf7fb83311a77002cce982cccd7f5cde3553208 https://github.com/phpmyadmin/phpmyadmin/commit/7bf7fb83311a77002cce982cccd7... Author: Denver Gingerich <denver@ossguy.com> Date: 2013-11-29 (Fri, 29 Nov 2013) Log Message: ----------- Merge remote branch 'upstream/master' Commit: 7244fc89236c08854ed22f4f2a2d121877813180 https://github.com/phpmyadmin/phpmyadmin/commit/7244fc89236c08854ed22f4f2a2d... Author: Michal Čihař <michal@cihar.com> Date: 2013-12-03 (Tue, 03 Dec 2013) Changed paths: M CONTRIBUTING.md A DCO M README Log Message: ----------- Merge pull request #768 from ossguy/master Add DCO and note on how contributions are licensed Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4fb20e027141...7244fc89236c