Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: f63148b99871a95479d1a845498f70cc14717883
https://github.com/phpmyadmin/phpmyadmin/commit/f63148b99871a95479d1a845498…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-11-10 (Sun, 10 Nov 2013)
Changed paths:
M libraries/navigation/NavigationHeader.class.php
Log Message:
-----------
We no longer use frames
Commit: 7a777bbc20a237f9ea79bbb59c7a4ff9ea2033e6
https://github.com/phpmyadmin/phpmyadmin/commit/7a777bbc20a237f9ea79bbb59c7…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-11-10 (Sun, 10 Nov 2013)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)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/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(a)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(a)latin.po
M po/vls.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Update po files
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/329e408a82e4...7a777bbc20a2
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 2fc0ca777d54a6a561b7695e4147738f8c54fa5a
https://github.com/phpmyadmin/phpmyadmin/commit/2fc0ca777d54a6a561b7695e414…
Author: Hugues Peccatte <hugues.peccatte(a)gmail.com>
Date: 2013-11-10 (Sun, 10 Nov 2013)
Changed paths:
M libraries/Advisor.class.php
M libraries/Config.class.php
M libraries/DBQbe.class.php
M libraries/Error_Handler.class.php
M libraries/File.class.php
M libraries/Footer.class.php
M libraries/Header.class.php
M libraries/List.class.php
M libraries/List_Database.class.php
M libraries/Menu.class.php
M libraries/OutputBuffering.class.php
M libraries/RecentTable.class.php
M libraries/Response.class.php
M libraries/ServerStatusData.class.php
M libraries/Table.class.php
M libraries/TableSearch.class.php
Log Message:
-----------
Update PHPDoc.
Commit: d3601abf969eba80349a091b4df28ca1e3c4bcc7
https://github.com/phpmyadmin/phpmyadmin/commit/d3601abf969eba80349a091b4df…
Author: Hugues Peccatte <hugues.peccatte(a)gmail.com>
Date: 2013-11-10 (Sun, 10 Nov 2013)
Changed paths:
M libraries/Util.class.php
M libraries/config/ConfigFile.class.php
M libraries/dbi/DBIDummy.class.php
M libraries/dbi/DBIMysql.class.php
M libraries/plugins/PluginManager.class.php
M libraries/plugins/PluginObserver.class.php
M libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/DownloadTransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/HexTransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/LongToIPv4TransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php
M libraries/schema/Dia_Relation_Schema.class.php
M libraries/schema/Eps_Relation_Schema.class.php
M libraries/schema/Export_Relation_Schema.class.php
M libraries/schema/Pdf_Relation_Schema.class.php
M libraries/schema/Svg_Relation_Schema.class.php
M setup/lib/ConfigGenerator.class.php
Log Message:
-----------
Global PHPDoc update.
Commit: 2f1176d27c8c93dcaf2223680b8c3787e1b2de8f
https://github.com/phpmyadmin/phpmyadmin/commit/2f1176d27c8c93dcaf2223680b8…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-11-10 (Sun, 10 Nov 2013)
Changed paths:
M libraries/Advisor.class.php
M libraries/Config.class.php
M libraries/DBQbe.class.php
M libraries/Error_Handler.class.php
M libraries/File.class.php
M libraries/Footer.class.php
M libraries/Header.class.php
M libraries/List.class.php
M libraries/List_Database.class.php
M libraries/Menu.class.php
M libraries/OutputBuffering.class.php
M libraries/RecentTable.class.php
M libraries/Response.class.php
M libraries/ServerStatusData.class.php
M libraries/Table.class.php
M libraries/TableSearch.class.php
M libraries/Util.class.php
M libraries/config/ConfigFile.class.php
M libraries/dbi/DBIDummy.class.php
M libraries/dbi/DBIMysql.class.php
M libraries/plugins/PluginManager.class.php
M libraries/plugins/PluginObserver.class.php
M libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/DownloadTransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/HexTransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/LongToIPv4TransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php
M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php
M libraries/schema/Dia_Relation_Schema.class.php
M libraries/schema/Eps_Relation_Schema.class.php
M libraries/schema/Export_Relation_Schema.class.php
M libraries/schema/Pdf_Relation_Schema.class.php
M libraries/schema/Svg_Relation_Schema.class.php
Log Message:
-----------
Fix merge conflicts
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/226295fa39b7...2f1176d27c8c