[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 2b5056: Merge remote-tracking branch 'origin/MAINT_3_4_9' ...
Branch: refs/heads/STABLE Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2b5056326227cf5e63d2f74cced9fd45929bfdfe https://github.com/phpmyadmin/phpmyadmin/commit/2b5056326227cf5e63d2f74cced9... Author: Michal Čihař mcihar@suse.cz Date: 2011-12-23 (Fri, 23 Dec 2011)
Log Message: ----------- Merge remote-tracking branch 'origin/MAINT_3_4_9' into QA_3_4
Commit: d3207af8af2641fc7e6f6ad7371f8a93f18454a2 https://github.com/phpmyadmin/phpmyadmin/commit/d3207af8af2641fc7e6f6ad7371f... Author: Michal Čihař mcihar@suse.cz Date: 2011-12-23 (Fri, 23 Dec 2011)
Changed paths: M po/th.po M po/uk.po
Log Message: ----------- Update translations from master
Commit: cd294e5b97c723fa85e29d2b2c43eaa48e60c60a https://github.com/phpmyadmin/phpmyadmin/commit/cd294e5b97c723fa85e29d2b2c43... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2011-12-24 (Sat, 24 Dec 2011)
Changed paths: M ChangeLog M libraries/import/ods.php
Log Message: ----------- bug #3049209 [import] Import from ODS ignores cell that is the same as cell before
Commit: f7a9d2a36a5cedd0b380e8ca89de856a44da1874 https://github.com/phpmyadmin/phpmyadmin/commit/f7a9d2a36a5cedd0b380e8ca89de... Author: Marc Delisle marc@infomarc.info Date: 2011-12-28 (Wed, 28 Dec 2011)
Changed paths: M ChangeLog M sql.php
Log Message: ----------- bug #3463933 [display] SELECT DISTINCT displays wrong total records found
Commit: 8697ec3d488b03d2fdcee13c03492bc9a7fe219d https://github.com/phpmyadmin/phpmyadmin/commit/8697ec3d488b03d2fdcee13c0349... Author: Glenn glennh-satx@users.sourceforge.net Date: 2011-12-29 (Thu, 29 Dec 2011)
Changed paths: M ChangeLog M libraries/Table.class.php
Log Message: ----------- patch #3458944 copy table data missing SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO'
Commit: 5d1fa1cc6b9cd6b2a96a67cd79216354a3c3e77f https://github.com/phpmyadmin/phpmyadmin/commit/5d1fa1cc6b9cd6b2a96a67cd7921... Author: Michal Čihař mcihar@suse.cz Date: 2012-01-16 (Mon, 16 Jan 2012)
Changed paths: M po/lt.po M po/ta.po M po/te.po M po/th.po
Log Message: ----------- Merge translations from master
Commit: 346c70d6fd7a6e402e41dfd552f70e3bdaf83323 https://github.com/phpmyadmin/phpmyadmin/commit/346c70d6fd7a6e402e41dfd552f7... Author: Marc Delisle marc@infomarc.info Date: 2012-01-21 (Sat, 21 Jan 2012)
Changed paths: M ChangeLog M tbl_replace.php
Log Message: ----------- bug #3469254 [edit] Setting data to NULL and drop-downs
Commit: 5da1aaa0fe7493afecde8ac92a0b561337bf217e https://github.com/phpmyadmin/phpmyadmin/commit/5da1aaa0fe7493afecde8ac92a0b... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-01-21 (Sat, 21 Jan 2012)
Changed paths: M libraries/tbl_replace_fields.inc.php
Log Message: ----------- To avoid warnings when strlen() is called on the array containing chosen values for set field
Commit: 3c7b233d9c83b501f5e220a6dcba8259b7554a87 https://github.com/phpmyadmin/phpmyadmin/commit/3c7b233d9c83b501f5e220a6dcba... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-01-21 (Sat, 21 Jan 2012)
Changed paths: M ChangeLog M libraries/tbl_replace_fields.inc.php M tbl_replace.php
Log Message: ----------- bug #3477063 [edit] Missing set fields and values in generated INSERT query
Commit: 6d58b78a322a8a0fecd5c914d04cb4402cdab910 https://github.com/phpmyadmin/phpmyadmin/commit/6d58b78a322a8a0fecd5c914d04c... Author: Marc Delisle marc@infomarc.info Date: 2012-01-24 (Tue, 24 Jan 2012)
Changed paths: M Documentation.html M README M libraries/Config.class.php
Log Message: ----------- 3.4.10-rc1
Commit: 6072137cddb683349ca038cacec5b70910809ad8 https://github.com/phpmyadmin/phpmyadmin/commit/6072137cddb683349ca038cacec5... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-01-29 (Sun, 29 Jan 2012)
Changed paths: R libraries/tcpdf/CHANGELOG.TXT M libraries/tcpdf/LICENSE.TXT M libraries/tcpdf/README.TXT R libraries/tcpdf/cache/chapter_demo_1.txt R libraries/tcpdf/cache/chapter_demo_2.txt R libraries/tcpdf/cache/table_data_demo.txt R libraries/tcpdf/cache/utf8test.txt R libraries/tcpdf/config/lang/afr.php R libraries/tcpdf/config/lang/ara.php R libraries/tcpdf/config/lang/aze.php R libraries/tcpdf/config/lang/bel.php R libraries/tcpdf/config/lang/bra.php R libraries/tcpdf/config/lang/cat.php R libraries/tcpdf/config/lang/ces.php R libraries/tcpdf/config/lang/chi.php R libraries/tcpdf/config/lang/cym.php R libraries/tcpdf/config/lang/dan.php R libraries/tcpdf/config/lang/eng.php R libraries/tcpdf/config/lang/est.php R libraries/tcpdf/config/lang/eus.php R libraries/tcpdf/config/lang/fra.php R libraries/tcpdf/config/lang/ger.php R libraries/tcpdf/config/lang/gle.php R libraries/tcpdf/config/lang/glg.php R libraries/tcpdf/config/lang/hat.php R libraries/tcpdf/config/lang/heb.php R libraries/tcpdf/config/lang/hrv.php R libraries/tcpdf/config/lang/hun.php R libraries/tcpdf/config/lang/hye.php R libraries/tcpdf/config/lang/ind.php R libraries/tcpdf/config/lang/ita.php R libraries/tcpdf/config/lang/kat.php R libraries/tcpdf/config/lang/kor.php R libraries/tcpdf/config/lang/mkd.php R libraries/tcpdf/config/lang/mlt.php R libraries/tcpdf/config/lang/msa.php R libraries/tcpdf/config/lang/nld.php R libraries/tcpdf/config/lang/nob.php R libraries/tcpdf/config/lang/pol.php R libraries/tcpdf/config/lang/por.php R libraries/tcpdf/config/lang/ron.php R libraries/tcpdf/config/lang/rus.php R libraries/tcpdf/config/lang/slv.php R libraries/tcpdf/config/lang/spa.php R libraries/tcpdf/config/lang/sqi.php R libraries/tcpdf/config/lang/srp.php R libraries/tcpdf/config/lang/swa.php R libraries/tcpdf/config/lang/swe.php R libraries/tcpdf/config/lang/urd.php R libraries/tcpdf/config/lang/yid.php R libraries/tcpdf/config/lang/zho.php M libraries/tcpdf/config/tcpdf_config.php R libraries/tcpdf/config/tcpdf_config_alt.php A libraries/tcpdf/encodings_maps.php R libraries/tcpdf/fonts/README.TXT R libraries/tcpdf/fonts/courier.php R libraries/tcpdf/fonts/courierb.php R libraries/tcpdf/fonts/courierbi.php R libraries/tcpdf/fonts/courieri.php R libraries/tcpdf/fonts/dejavu-fonts-ttf-2.32/LICENSE R libraries/tcpdf/fonts/dejavu-fonts-ttf-2.32/README A libraries/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE M libraries/tcpdf/fonts/dejavusans.ctg.z M libraries/tcpdf/fonts/dejavusans.php M libraries/tcpdf/fonts/dejavusans.z M libraries/tcpdf/fonts/dejavusansb.ctg.z M libraries/tcpdf/fonts/dejavusansb.php M libraries/tcpdf/fonts/dejavusansb.z M libraries/tcpdf/fonts/dejavuserif.ctg.z M libraries/tcpdf/fonts/dejavuserif.php M libraries/tcpdf/fonts/dejavuserif.z M libraries/tcpdf/fonts/dejavuserifb.ctg.z M libraries/tcpdf/fonts/dejavuserifb.php M libraries/tcpdf/fonts/dejavuserifb.z M libraries/tcpdf/fonts/helvetica.php R libraries/tcpdf/fonts/helveticab.php R libraries/tcpdf/fonts/helveticabi.php R libraries/tcpdf/fonts/helveticai.php R libraries/tcpdf/fonts/symbol.php R libraries/tcpdf/fonts/times.php R libraries/tcpdf/fonts/timesb.php R libraries/tcpdf/fonts/timesbi.php R libraries/tcpdf/fonts/timesi.php R libraries/tcpdf/fonts/zapfdingbats.php M libraries/tcpdf/htmlcolors.php R libraries/tcpdf/spotcolors.php R libraries/tcpdf/tcpdf.crt R libraries/tcpdf/tcpdf.fdf R libraries/tcpdf/tcpdf.p12 M libraries/tcpdf/tcpdf.php M libraries/tcpdf/unicode_data.php
Log Message: ----------- TCPDF updated to version 5.9.145
Commit: 12e2e8b7fc67fe4378d7a60d595345ac92b0912a https://github.com/phpmyadmin/phpmyadmin/commit/12e2e8b7fc67fe4378d7a60d5953... Author: Marc Delisle marc@infomarc.info Date: 2012-01-30 (Mon, 30 Jan 2012)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog for bug #3460867 [libraries] license issue with TCPDF (updated to 5.9.145)
Commit: 3471319da3a7aed0e4dda170626cc5937e145713 https://github.com/phpmyadmin/phpmyadmin/commit/3471319da3a7aed0e4dda170626c... Author: Marc Delisle marc@infomarc.info Date: 2012-02-14 (Tue, 14 Feb 2012)
Changed paths: M ChangeLog
Log Message: ----------- 3.4.10 release
Commit: e8a12582f9fc7737a6346e26ec9c5de01ced8d52 https://github.com/phpmyadmin/phpmyadmin/commit/e8a12582f9fc7737a6346e26ec9c... Author: Marc Delisle marc@infomarc.info Date: 2012-02-14 (Tue, 14 Feb 2012)
Changed paths: M Documentation.html M README M libraries/Config.class.php
Log Message: ----------- 3.4.10 release
Commit: c5edaf3140023819586f3c74ada7cf2c53b7cde5 https://github.com/phpmyadmin/phpmyadmin/commit/c5edaf3140023819586f3c74ada7... Author: Marc Delisle marc@infomarc.info Date: 2012-02-14 (Tue, 14 Feb 2012)
Changed paths: M ChangeLog M Documentation.html M README M libraries/Config.class.php M libraries/Table.class.php M libraries/export/php_array.php M libraries/import/ods.php M libraries/sql_query_form.lib.php M libraries/tbl_replace_fields.inc.php R libraries/tcpdf/CHANGELOG.TXT M libraries/tcpdf/LICENSE.TXT M libraries/tcpdf/README.TXT R libraries/tcpdf/cache/chapter_demo_1.txt R libraries/tcpdf/cache/chapter_demo_2.txt R libraries/tcpdf/cache/table_data_demo.txt R libraries/tcpdf/cache/utf8test.txt R libraries/tcpdf/config/lang/afr.php R libraries/tcpdf/config/lang/ara.php R libraries/tcpdf/config/lang/aze.php R libraries/tcpdf/config/lang/bel.php R libraries/tcpdf/config/lang/bra.php R libraries/tcpdf/config/lang/cat.php R libraries/tcpdf/config/lang/ces.php R libraries/tcpdf/config/lang/chi.php R libraries/tcpdf/config/lang/cym.php R libraries/tcpdf/config/lang/dan.php R libraries/tcpdf/config/lang/eng.php R libraries/tcpdf/config/lang/est.php R libraries/tcpdf/config/lang/eus.php R libraries/tcpdf/config/lang/fra.php R libraries/tcpdf/config/lang/ger.php R libraries/tcpdf/config/lang/gle.php R libraries/tcpdf/config/lang/glg.php R libraries/tcpdf/config/lang/hat.php R libraries/tcpdf/config/lang/heb.php R libraries/tcpdf/config/lang/hrv.php R libraries/tcpdf/config/lang/hun.php R libraries/tcpdf/config/lang/hye.php R libraries/tcpdf/config/lang/ind.php R libraries/tcpdf/config/lang/ita.php R libraries/tcpdf/config/lang/kat.php R libraries/tcpdf/config/lang/kor.php R libraries/tcpdf/config/lang/mkd.php R libraries/tcpdf/config/lang/mlt.php R libraries/tcpdf/config/lang/msa.php R libraries/tcpdf/config/lang/nld.php R libraries/tcpdf/config/lang/nob.php R libraries/tcpdf/config/lang/pol.php R libraries/tcpdf/config/lang/por.php R libraries/tcpdf/config/lang/ron.php R libraries/tcpdf/config/lang/rus.php R libraries/tcpdf/config/lang/slv.php R libraries/tcpdf/config/lang/spa.php R libraries/tcpdf/config/lang/sqi.php R libraries/tcpdf/config/lang/srp.php R libraries/tcpdf/config/lang/swa.php R libraries/tcpdf/config/lang/swe.php R libraries/tcpdf/config/lang/urd.php R libraries/tcpdf/config/lang/yid.php R libraries/tcpdf/config/lang/zho.php M libraries/tcpdf/config/tcpdf_config.php R libraries/tcpdf/config/tcpdf_config_alt.php A libraries/tcpdf/encodings_maps.php R libraries/tcpdf/fonts/README.TXT R libraries/tcpdf/fonts/courier.php R libraries/tcpdf/fonts/courierb.php R libraries/tcpdf/fonts/courierbi.php R libraries/tcpdf/fonts/courieri.php R libraries/tcpdf/fonts/dejavu-fonts-ttf-2.32/LICENSE R libraries/tcpdf/fonts/dejavu-fonts-ttf-2.32/README A libraries/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE M libraries/tcpdf/fonts/dejavusans.ctg.z M libraries/tcpdf/fonts/dejavusans.php M libraries/tcpdf/fonts/dejavusans.z M libraries/tcpdf/fonts/dejavusansb.ctg.z M libraries/tcpdf/fonts/dejavusansb.php M libraries/tcpdf/fonts/dejavusansb.z M libraries/tcpdf/fonts/dejavuserif.ctg.z M libraries/tcpdf/fonts/dejavuserif.php M libraries/tcpdf/fonts/dejavuserif.z M libraries/tcpdf/fonts/dejavuserifb.ctg.z M libraries/tcpdf/fonts/dejavuserifb.php M libraries/tcpdf/fonts/dejavuserifb.z M libraries/tcpdf/fonts/helvetica.php R libraries/tcpdf/fonts/helveticab.php R libraries/tcpdf/fonts/helveticabi.php R libraries/tcpdf/fonts/helveticai.php R libraries/tcpdf/fonts/symbol.php R libraries/tcpdf/fonts/times.php R libraries/tcpdf/fonts/timesb.php R libraries/tcpdf/fonts/timesbi.php R libraries/tcpdf/fonts/timesi.php R libraries/tcpdf/fonts/zapfdingbats.php M libraries/tcpdf/htmlcolors.php R libraries/tcpdf/spotcolors.php R libraries/tcpdf/tcpdf.crt R libraries/tcpdf/tcpdf.fdf R libraries/tcpdf/tcpdf.p12 M libraries/tcpdf/tcpdf.php M libraries/tcpdf/unicode_data.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/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/id.po M po/it.po M po/ja.po M po/ka.po M po/ko.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/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/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/zh_CN.po M po/zh_TW.po M sql.php M tbl_replace.php
Log Message: ----------- Merge branch 'MAINT_3_4_10' into STABLE
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/48f545c...c5edaf3
-
Marc Delisle