Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a87f283a23e2b2d0e4a11c14e5b484ed57d865b5 https://github.com/phpmyadmin/phpmyadmin/commit/a87f283a23e2b2d0e4a11c14e5b4... Author: Alex Marin alex.ukf@gmail.com Date: 2012-05-27 (Sun, 27 May 2012)

Changed paths: M export.php M import.php M libraries/common.lib.php M libraries/display_export.lib.php M libraries/display_import.lib.php M libraries/import.lib.php M libraries/plugin_interface.lib.php A libraries/plugins/AuthenticationPlugin.class.php A libraries/plugins/ExportPlugin.class.php A libraries/plugins/ImportPlugin.class.php A libraries/plugins/PluginManager.class.php A libraries/plugins/PluginObserver.class.php A libraries/plugins/TransformationsPlugin.class.php A libraries/plugins/export/ExportXML.class.php

Log Message: ----------- plugins and OOP: create general class structure and ExportXML

Commit: b0e8486ef1e2be20b65492a8017b143f53b406a2 https://github.com/phpmyadmin/phpmyadmin/commit/b0e8486ef1e2be20b65492a8017b... Author: Alex Marin alex.ukf@gmail.com Date: 2012-05-27 (Sun, 27 May 2012)

Changed paths: A libraries/plugins/auth/AuthenticationConfig.class.php A libraries/plugins/auth/AuthenticationCookie.class.php A libraries/plugins/auth/AuthenticationHTTP.class.php A libraries/plugins/auth/AuthenticationSIgnOn.class.php A libraries/plugins/auth/swekey/authentication.inc.php A libraries/plugins/auth/swekey/musbe-ca.crt A libraries/plugins/auth/swekey/swekey.auth.lib.php A libraries/plugins/auth/swekey/swekey.php A libraries/plugins/export/ExportSQL.class.php A libraries/plugins/import/ImportSQL.class.php A libraries/plugins/import/ImportXML.class.php

Log Message: ----------- plugins and OOP: import XML, export and import SQL; auth structure

Commit: 0ff6393062cfba09254778b52c379fea324a3d02 https://github.com/phpmyadmin/phpmyadmin/commit/0ff6393062cfba09254778b52c37... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-04 (Mon, 04 Jun 2012)

Changed paths: M ChangeLog M Documentation.html M export.php M file_echo.php M import.php M import_status.php M index.php M js/functions.js M js/messages.php M js/server_privileges.js M js/tbl_zoom_plot_jqplot.js M libraries/Config.class.php M libraries/List.class.php M libraries/List_Database.class.php M libraries/PDF.class.php M libraries/StorageEngine.class.php M libraries/Theme.class.php M libraries/Theme_Manager.class.php M libraries/Types.class.php M libraries/common.inc.php M libraries/common.lib.php M libraries/config.default.php M libraries/config/ConfigFile.class.php M libraries/config/validate.lib.php M libraries/core.lib.php M libraries/display_change_password.lib.php M libraries/display_tbl.lib.php M libraries/gis/pma_gis_visualization.php M libraries/header.inc.php M libraries/header_http.inc.php M libraries/iconv_wrapper.lib.php M libraries/import.lib.php M libraries/insert_edit.lib.php M libraries/schema/Dia_Relation_Schema.class.php M libraries/schema/Eps_Relation_Schema.class.php M libraries/schema/Svg_Relation_Schema.class.php M libraries/schema/Visio_Relation_Schema.class.php M libraries/server_synchronize.lib.php M libraries/server_variables_doc.php M libraries/session.inc.php M libraries/sqlparser.data.php M libraries/sqlparser.lib.php M libraries/sqlvalidator.lib.php M libraries/tbl_properties.inc.php M libraries/tbl_replace_fields.inc.php M libraries/tbl_select.lib.php M libraries/transformations.lib.php M libraries/user_preferences.inc.php M libraries/user_preferences.lib.php M main.php M navigation.php M phpmyadmin.css.php M pmd_general.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/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.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/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/zh_CN.po M po/zh_TW.po M prefs_manage.php M server_privileges.php M server_status.php M server_variables.php M setup/config.php M tbl_get_field.php M tbl_printview.php M tbl_select.php M tbl_structure.php M tbl_tracking.php M tbl_zoom_select.php M test/classes/PMA_Config_test.php M test/classes/PMA_Theme_test.php M test/classes/gis/PMA_GIS_Geometry_test.php M test/libraries/core/PMA_array_test.php M test/libraries/core/PMA_fatalError_test.php M test/libraries/core/PMA_getTableCount_test_dis.php M test/libraries/core/PMA_get_real_size_test.php M test/libraries/js_escape_test.php M test/libraries/php-gettext/Parsing_test.php M themes/original/css/common.css.php R themes/original/img/pmd/1.png R themes/original/img/pmd/2.png R themes/original/img/pmd/2leftarrow.png R themes/original/img/pmd/2leftarrow_m.png R themes/original/img/pmd/2rightarrow.png R themes/original/img/pmd/2rightarrow_m.png R themes/original/img/pmd/3.png R themes/original/img/pmd/4.png R themes/original/img/pmd/5.png R themes/original/img/pmd/6.png R themes/original/img/pmd/7.png R themes/original/img/pmd/8.png R themes/original/img/pmd/FieldKey_small.png R themes/original/img/pmd/Field_small.png R themes/original/img/pmd/Field_small_char.png R themes/original/img/pmd/Field_small_date.png R themes/original/img/pmd/Field_small_int.png R themes/original/img/pmd/Header.png R themes/original/img/pmd/Header_Linked.png R themes/original/img/pmd/and_icon.png R themes/original/img/pmd/ang_direct.png R themes/original/img/pmd/bord.png R themes/original/img/pmd/bottom.png R themes/original/img/pmd/def.png R themes/original/img/pmd/display_field.png R themes/original/img/pmd/downarrow1.png R themes/original/img/pmd/downarrow2.png R themes/original/img/pmd/downarrow2_m.png R themes/original/img/pmd/exec.png R themes/original/img/pmd/exec_small.png R themes/original/img/pmd/favicon.ico R themes/original/img/pmd/grid.png R themes/original/img/pmd/help.png R themes/original/img/pmd/help_relation.png R themes/original/img/pmd/left_panel_butt.png R themes/original/img/pmd/left_panel_tab.png R themes/original/img/pmd/minus.png R themes/original/img/pmd/or_icon.png R themes/original/img/pmd/pdf.png R themes/original/img/pmd/plus.png R themes/original/img/pmd/query_builder.png R themes/original/img/pmd/relation.png R themes/original/img/pmd/reload.png R themes/original/img/pmd/resize.png R themes/original/img/pmd/rightarrow1.png R themes/original/img/pmd/rightarrow2.png R themes/original/img/pmd/save.png R themes/original/img/pmd/small_tab.png R themes/original/img/pmd/table.png R themes/original/img/pmd/toggle_lines.png R themes/original/img/pmd/top_panel.png R themes/original/img/pmd/uparrow2_m.png A themes/pmahomme/css/codemirror.css.php M themes/pmahomme/css/common.css.php M themes/pmahomme/css/pmd.css.php M transformation_wrapper.php M url.php M webapp.php

Log Message: ----------- plugins and OOP: merge master, fix conflicts

Commit: d30bd45c95fbc46f9f0eb1dd057ad5f1887eacb0 https://github.com/phpmyadmin/phpmyadmin/commit/d30bd45c95fbc46f9f0eb1dd057a... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-07 (Thu, 07 Jun 2012)

Changed paths: M db_qbe.php M js/functions.js M libraries/Table.class.php M libraries/engines/bdb.lib.php M libraries/engines/berkeleydb.lib.php M libraries/engines/innodb.lib.php M libraries/engines/memory.lib.php M libraries/engines/merge.lib.php M libraries/engines/myisam.lib.php M libraries/engines/ndbcluster.lib.php M libraries/engines/pbxt.lib.php M libraries/import/upload/apc.php M libraries/import/upload/noplugin.php M libraries/import/upload/session.php M libraries/import/upload/uploadprogress.php M libraries/relation.lib.php M libraries/schema/Pdf_Relation_Schema.class.php M libraries/schema/User_Schema.class.php M libraries/select_lang.lib.php M phpinfo.php M pmd_pdf.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/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.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/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/zh_CN.po M po/zh_TW.po M scripts/update-po M server_status.php M show_config_errors.php M test/classes/gis/PMA_GIS_Factory_test.php M test/classes/gis/PMA_GIS_Geom_test.php M test/classes/gis/PMA_GIS_Geometry_test.php M test/classes/gis/PMA_GIS_Linestring_test.php M test/classes/gis/PMA_GIS_Multilinestring_test.php M test/classes/gis/PMA_GIS_Multipoint_test.php M test/classes/gis/PMA_GIS_Multipolygon_test.php M test/classes/gis/PMA_GIS_Point_test.php M test/classes/gis/PMA_GIS_Polygon_test.php M themes/original/layout.inc.php M themes/pmahomme/css/codemirror.css.php M themes/pmahomme/info.inc.php M themes/pmahomme/layout.inc.php M view_operations.php

Log Message: ----------- Merge branch 'master' into plugins-and-OOP

Commit: 1e4b0cd0dd8df49bfc2c4ce96f6bd422d2482839 https://github.com/phpmyadmin/phpmyadmin/commit/1e4b0cd0dd8df49bfc2c4ce96f6b... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-07 (Thu, 07 Jun 2012)

Changed paths: A libraries/plugins/transformations/TransformationApplicationOctetStreamDownload.class.php A libraries/plugins/transformations/TransformationApplicationOctetStreamHex.class.php A libraries/plugins/transformations/TransformationImageJPEGInline.class.php A libraries/plugins/transformations/TransformationImageJPEGLink.class.php A libraries/plugins/transformations/TransformationImagePNGInline.class.php A libraries/plugins/transformations/TransformationTextPlainAppend.class.php A libraries/plugins/transformations/TransformationTextPlainDateFormat.class.php A libraries/plugins/transformations/TransformationTextPlainExternal.class.php A libraries/plugins/transformations/TransformationTextPlainFormatted.class.php A libraries/plugins/transformations/TransformationTextPlainImageLink.class.php A libraries/plugins/transformations/TransformationTextPlainLink.class.php A libraries/plugins/transformations/TransformationTextPlainLongToIPv4.class.php A libraries/plugins/transformations/TransformationTextPlainSQL.class.php A libraries/plugins/transformations/TransformationTextPlainSubstring.class.php A libraries/plugins/transformations/abstract/AppendTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/DownloadTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/HexTransformationsPlugin.class.php.php A libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php.php A libraries/plugins/transformations/abstract/LinkTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/LongToIPv4TransformationsPlugin.class.php A libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php

Log Message: ----------- oop: transformations backbone

Commit: 04f82137cbb76aa5dca53e28a29cc1cb9d099fcf https://github.com/phpmyadmin/phpmyadmin/commit/04f82137cbb76aa5dca53e28a29c... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-07 (Thu, 07 Jun 2012)

Changed paths: M export.php A libraries/plugins/export/ExportCodegen.class.php

Log Message: ----------- oop: export properties bug

Commit: 54098d08ddfdd6df2fbf6b95846518cdff9102b4 https://github.com/phpmyadmin/phpmyadmin/commit/54098d08ddfdd6df2fbf6b958465... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-07 (Thu, 07 Jun 2012)

Changed paths: M libraries/plugins/export/ExportXML.class.php

Log Message: ----------- oop: small comment errors export xml

Commit: 683d7677b9d60ed389c4d1efae31df968217effa https://github.com/phpmyadmin/phpmyadmin/commit/683d7677b9d60ed389c4d1efae31... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-08 (Fri, 08 Jun 2012)

Changed paths: M export.php M libraries/plugin_interface.lib.php M libraries/plugins/ExportPlugin.class.php M libraries/plugins/export/ExportCodegen.class.php R libraries/plugins/export/ExportSQL.class.php A libraries/plugins/export/ExportSql.class.php R libraries/plugins/export/ExportXML.class.php A libraries/plugins/export/ExportXml.class.php A libraries/plugins/export/TableProperty.class.php

Log Message: ----------- oop: export codegen; camel caps export naming convention

Commit: 4e764e76b86e58954f5acaf6968f3f234341215f https://github.com/phpmyadmin/phpmyadmin/commit/4e764e76b86e58954f5acaf6968f... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-08 (Fri, 08 Jun 2012)

Changed paths: M libraries/plugin_interface.lib.php R libraries/plugins/import/ImportSQL.class.php A libraries/plugins/import/ImportSql.class.php R libraries/plugins/import/ImportXML.class.php A libraries/plugins/import/ImportXml.class.php

Log Message: ----------- oop: camel caps for import plugins

Commit: 9d6bed8d34534b97abb16899efc828a8a4d2b764 https://github.com/phpmyadmin/phpmyadmin/commit/9d6bed8d34534b97abb16899efc8... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-08 (Fri, 08 Jun 2012)

Changed paths: A libraries/plugins/export/ExportCsv.class.php

Log Message: ----------- oop: export csv

Commit: 42360abcfb375296945bb06b0e8c3d2d4d863da2 https://github.com/phpmyadmin/phpmyadmin/commit/42360abcfb375296945bb06b0e8c... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-08 (Fri, 08 Jun 2012)

Changed paths: M libraries/plugins/export/ExportCsv.class.php A libraries/plugins/export/ExportExcel.class.php

Log Message: ----------- oop: export csv for excel

Commit: 3e406e2a7676c02b770fa306403698b6243db32e https://github.com/phpmyadmin/phpmyadmin/commit/3e406e2a7676c02b770fa3064036... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-08 (Fri, 08 Jun 2012)

Changed paths: M libraries/plugins/export/ExportCsv.class.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/export/ExportXml.class.php M libraries/plugins/import/ImportXml.class.php

Log Message: ----------- oop: fix class variables names

Commit: ff930b788ad5f066e34d1e0a214963ba143d6b3a https://github.com/phpmyadmin/phpmyadmin/commit/ff930b788ad5f066e34d1e0a2149... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-09 (Sat, 09 Jun 2012)

Changed paths: M db_operations.php M libraries/Table.class.php M libraries/Tracker.class.php

Log Message: ----------- oop: modify PMA_getTableDef and PMA_getTableDefStandIn usage

Commit: b190d924d39c9114980af4841ec2dd52fc750156 https://github.com/phpmyadmin/phpmyadmin/commit/b190d924d39c9114980af4841ec2... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-09 (Sat, 09 Jun 2012)

Changed paths: M libraries/plugins/export/ExportCodegen.class.php M libraries/plugins/export/ExportCsv.class.php

Log Message: ----------- oop: exportDBHeader coding style

Commit: 09f1ae13bd09a2731d5349ecd62dda95af0ce909 https://github.com/phpmyadmin/phpmyadmin/commit/09f1ae13bd09a2731d5349ecd62d... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-09 (Sat, 09 Jun 2012)

Changed paths: M libraries/plugins/ExportPlugin.class.php A libraries/plugins/export/ExportHtmlword.class.php

Log Message: ----------- oop: ExportHtmlWord

Commit: bdf17eee3286428ea96dedfb043c3b89e9c679e2 https://github.com/phpmyadmin/phpmyadmin/commit/bdf17eee3286428ea96dedfb043c... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-09 (Sat, 09 Jun 2012)

Changed paths: A libraries/plugins/export/ExportJson.class.php

Log Message: ----------- oop: ExportJson

Commit: 4b0dbf6a428e710a232f91ee9f0322f689c962b1 https://github.com/phpmyadmin/phpmyadmin/commit/4b0dbf6a428e710a232f91ee9f03... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-15 (Fri, 15 Jun 2012)

Changed paths: M export.php M libraries/common.lib.php M libraries/plugins/export/ExportCodegen.class.php A libraries/plugins/export/ExportLatex.class.php

Log Message: ----------- oop: ExportLatex

Commit: b5f2788aded7b505bbd529b36aa8b7c6424c9d54 https://github.com/phpmyadmin/phpmyadmin/commit/b5f2788aded7b505bbd529b36aa8... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-15 (Fri, 15 Jun 2012)

Changed paths: M libraries/plugins/export/ExportLatex.class.php A libraries/plugins/export/ExportMediawiki.class.php

Log Message: ----------- oop: ExportMediawiki

Commit: fa004ee3c05e5670f1300ddd28594b89f6f82900 https://github.com/phpmyadmin/phpmyadmin/commit/fa004ee3c05e5670f1300ddd2859... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-15 (Fri, 15 Jun 2012)

Changed paths: A libraries/plugins/export/ExportOds.class.php

Log Message: ----------- oop: ExportOds

Commit: 16252e4dbaee668ffae781f2028f27c263fbf20e https://github.com/phpmyadmin/phpmyadmin/commit/16252e4dbaee668ffae781f2028f... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-16 (Sat, 16 Jun 2012)

Changed paths: M libraries/plugins/ExportPlugin.class.php A libraries/plugins/export/ExportOdt.class.php

Log Message: ----------- oop: ExportOdt

Commit: c34d3bc003f6126b325e3df8c70e0c4c23ddd83d https://github.com/phpmyadmin/phpmyadmin/commit/c34d3bc003f6126b325e3df8c70e... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-16 (Sat, 16 Jun 2012)

Changed paths: M libraries/plugins/export/ExportMediawiki.class.php M libraries/plugins/export/ExportOds.class.php M libraries/plugins/export/ExportOdt.class.php A libraries/plugins/export/ExportPdf.class.php A libraries/plugins/export/PMA_ExportPdf.class.php

Log Message: ----------- oop: ExportPdf

Commit: 06d6645eb346678938816d6aed10d7e4ff29bbd4 https://github.com/phpmyadmin/phpmyadmin/commit/06d6645eb346678938816d6aed10... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-16 (Sat, 16 Jun 2012)

Changed paths: M export.php M libraries/plugins/export/ExportOds.class.php A libraries/plugins/export/ExportPhp_array.class.php

Log Message: ----------- oop: ExportPhparray

Commit: 88a958828be389b4787779f5a7bc36a96cc8548c https://github.com/phpmyadmin/phpmyadmin/commit/88a958828be389b4787779f5a7bc... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-16 (Sat, 16 Jun 2012)

Changed paths: M export.php

Log Message: ----------- oop: remove debugging echo from export.php

Commit: a1cbfe7ffdc8bf032e126d7c798526efcab8b755 https://github.com/phpmyadmin/phpmyadmin/commit/a1cbfe7ffdc8bf032e126d7c7985... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-16 (Sat, 16 Jun 2012)

Changed paths: A libraries/plugins/export/ExportTexytext.class.php

Log Message: ----------- oop: ExportTexytext

Commit: 34db0b775e1513b0afbeafc77f616df5eaea42e4 https://github.com/phpmyadmin/phpmyadmin/commit/34db0b775e1513b0afbeafc77f61... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-16 (Sat, 16 Jun 2012)

Changed paths: M libraries/plugins/export/ExportHtmlword.class.php

Log Message: ----------- oop: ExportHtmlword - add cfgRelation

Commit: 52f593c302a69c46e181bac8aacc8989c8bf2319 https://github.com/phpmyadmin/phpmyadmin/commit/52f593c302a69c46e181bac8aacc... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-16 (Sat, 16 Jun 2012)

Changed paths: A libraries/plugins/export/ExportYaml.class.php

Log Message: ----------- oop: ExportYaml

Commit: 4e93893b388c7a474224260ced30b0ec449f746a https://github.com/phpmyadmin/phpmyadmin/commit/4e93893b388c7a474224260ced30... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-17 (Sun, 17 Jun 2012)

Changed paths: M libraries/plugins/import/ImportSql.class.php

Log Message: ----------- oop: ImportSql phpcs errors

Commit: 0899d6722ef25d9f2e387e35e837d73f5ebd044f https://github.com/phpmyadmin/phpmyadmin/commit/0899d6722ef25d9f2e387e35e837... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-17 (Sun, 17 Jun 2012)

Changed paths: M ChangeLog M Documentation.html M browse_foreigners.php M chk_rel.php M config.sample.inc.php M db_create.php M db_datadict.php M db_events.php M db_export.php M db_import.php M db_operations.php M db_printview.php M db_qbe.php M db_routines.php M db_search.php M db_sql.php M db_structure.php M db_tables_search.php M db_tracking.php M db_triggers.php M export.php M gis_data_editor.php M import.php M index.php M js/common.js M js/config.js M js/cross_framing_protection.js M js/db_operations.js M js/db_search.js M js/db_structure.js M js/functions.js M js/gis_data_editor.js M js/makegrid.js M js/navigation.js M js/server_databases.js M js/server_privileges.js M js/server_status.js M js/server_status_monitor.js M js/server_variables.js M js/sql.js M js/tbl_change.js M js/tbl_select.js M js/tbl_structure.js M js/tbl_zoom_plot_jqplot.js M libraries/Error.class.php M libraries/Error_Handler.class.php A libraries/Footer.class.php A libraries/Header.class.php M libraries/Menu.class.php M libraries/Message.class.php A libraries/OutputBuffering.class.php M libraries/PDF.class.php A libraries/Response.class.php A libraries/Scripts.class.php A libraries/TableSearch.class.php M libraries/Theme.class.php M libraries/Theme_Manager.class.php M libraries/auth/config.auth.lib.php M libraries/auth/cookie.auth.lib.php M libraries/auth/http.auth.lib.php M libraries/common.inc.php M libraries/common.lib.php M libraries/core.lib.php M libraries/db_common.inc.php M libraries/display_export.lib.php M libraries/display_git_revision.lib.php M libraries/display_import.lib.php M libraries/display_tbl.lib.php M libraries/error.inc.php R libraries/footer.inc.php R libraries/header.inc.php R libraries/header_http.inc.php R libraries/header_meta_style.inc.php R libraries/header_printview.inc.php R libraries/header_scripts.inc.php M libraries/insert_edit.lib.php M libraries/mult_submits.inc.php M libraries/navigation_header.inc.php R libraries/ob.lib.php M libraries/pmd_common.php M libraries/relation.lib.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_export.lib.php M libraries/rte/rte_main.inc.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_triggers.lib.php M libraries/schema/Export_Relation_Schema.class.php M libraries/server_common.inc.php M libraries/tbl_common.inc.php M libraries/tbl_info.inc.php R libraries/tbl_select.lib.php M libraries/user_preferences.inc.php M libraries/user_preferences.lib.php M main.php M navigation.php M pmd_display_field.php M pmd_general.php M pmd_pdf.php M pmd_relation_new.php M pmd_relation_upd.php M prefs_forms.php M prefs_manage.php M querywindow.php M schema_edit.php M schema_export.php M server_binlog.php M server_collations.php M server_databases.php M server_engines.php M server_export.php M server_import.php M server_plugins.php M server_privileges.php M server_replication.php M server_sql.php M server_status.php M server_synchronize.php M server_variables.php M setup/index.php M setup/styles.css M sql.php M tbl_addfield.php M tbl_alter.php M tbl_change.php M tbl_chart.php M tbl_create.php M tbl_export.php M tbl_gis_visualization.php M tbl_import.php M tbl_indexes.php M tbl_move_copy.php M tbl_operations.php M tbl_printview.php M tbl_relation.php M tbl_replace.php M tbl_row_action.php M tbl_select.php M tbl_sql.php M tbl_structure.php M tbl_tracking.php M tbl_zoom_select.php R test/PMA_showHint_test.php R test/libraries/common/PMA_ajaxResponse_test.php M test/libraries/core/PMA_getLinks_test.php M test/libraries/core/PMA_headerLocation_test_disabled.php M themes.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php M themes/sprites.css.php M transformation_overview.php M transformation_wrapper.php M user_password.php M view_create.php M view_operations.php

Log Message: ----------- oop: merge master

Commit: 2c9fba05603f41e94c70761cbbd890f323f23d94 https://github.com/phpmyadmin/phpmyadmin/commit/2c9fba05603f41e94c70761cbbd8... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-17 (Sun, 17 Jun 2012)

Changed paths: M export.php M libraries/common.lib.php M libraries/plugins/ExportPlugin.class.php M libraries/plugins/export/ExportCodegen.class.php M libraries/plugins/export/ExportHtmlword.class.php A libraries/plugins/export/ExportLatex.class.php A libraries/plugins/export/ExportMediawiki.class.php A libraries/plugins/export/ExportOds.class.php A libraries/plugins/export/ExportOdt.class.php A libraries/plugins/export/ExportPdf.class.php A libraries/plugins/export/ExportPhp_array.class.php A libraries/plugins/export/ExportTexytext.class.php A libraries/plugins/export/ExportYaml.class.php A libraries/plugins/export/PMA_ExportPdf.class.php M libraries/plugins/import/ImportSql.class.php

Log Message: ----------- Merge branch 'work_week3' into plugins-and-OOP

Commit: 5623356e7a305217bf1bf4c4565408c81c176fdc https://github.com/phpmyadmin/phpmyadmin/commit/5623356e7a305217bf1bf4c45654... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-18 (Mon, 18 Jun 2012)

Changed paths: M db_operations.php M export.php M libraries/config.default.php M libraries/plugins/ExportPlugin.class.php M libraries/plugins/export/ExportCodegen.class.php M libraries/plugins/export/ExportCsv.class.php M libraries/plugins/export/ExportHtmlword.class.php M libraries/plugins/export/ExportJson.class.php M libraries/plugins/export/ExportLatex.class.php M libraries/plugins/export/ExportMediawiki.class.php M libraries/plugins/export/ExportOds.class.php M libraries/plugins/export/ExportOdt.class.php M libraries/plugins/export/ExportPdf.class.php R libraries/plugins/export/ExportPhp_array.class.php A libraries/plugins/export/ExportPhparray.class.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/export/ExportTexytext.class.php M libraries/plugins/export/ExportXml.class.php M libraries/plugins/export/PMA_ExportPdf.class.php M libraries/plugins/export/TableProperty.class.php

Log Message: ----------- oop: fix bugs and phpcs errors for all export plugins

Commit: 1ef56d1662f90fc51882161497d7b47345f73c6f https://github.com/phpmyadmin/phpmyadmin/commit/1ef56d1662f90fc51882161497d7... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-18 (Mon, 18 Jun 2012)

Changed paths: M db_datadict.php M db_printview.php M db_structure.php M js/functions.js M js/server_databases.js A libraries/DisplayResults.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/Menu.class.php M libraries/Scripts.class.php M libraries/TableSearch.class.php M libraries/common.lib.php M libraries/display_export.lib.php M libraries/display_import.lib.php R libraries/display_tbl.lib.php M libraries/error.inc.php M libraries/gis/pma_gis_geometrycollection.php M libraries/user_preferences.inc.php M navigation.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/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.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/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/zh_CN.po M po/zh_TW.po M querywindow.php M server_databases.php M sql.php M tbl_printview.php M tbl_replace.php M test/classes/gis/PMA_GIS_Geometry_test.php A test/classes/gis/PMA_GIS_Geometrycollection_test.php M test/classes/gis/PMA_GIS_Linestring_test.php M test/classes/gis/PMA_GIS_Multilinestring_test.php M test/classes/gis/PMA_GIS_Multipoint_test.php M test/classes/gis/PMA_GIS_Multipolygon_test.php M test/classes/gis/PMA_GIS_Point_test.php M test/classes/gis/PMA_GIS_Polygon_test.php M test/libraries/common/PMA_browseUploadFile_test.php M test/theme.php

Log Message: ----------- Merge branch 'master' into plugins-and-OOP

Commit: 6d852da6c1cca5580376d73620298ea73191b5fb https://github.com/phpmyadmin/phpmyadmin/commit/6d852da6c1cca5580376d7362029... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-18 (Mon, 18 Jun 2012)

Changed paths: M libraries/plugins/ImportPlugin.class.php M libraries/plugins/import/ImportSql.class.php M libraries/plugins/import/ImportXml.class.php

Log Message: ----------- oop: fix phpcs errors for ImportSql, ImportXml and ImportPlugin

Commit: 02e4babdb45cd9e47dc9c8f473ace3d0b3d2feff https://github.com/phpmyadmin/phpmyadmin/commit/02e4babdb45cd9e47dc9c8f473ac... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-18 (Mon, 18 Jun 2012)

Changed paths: A libraries/plugins/import/ImportCsv.class.php

Log Message: ----------- oop: ImportCsv

Commit: f21dfd6646e12cbd215e7b94f427629354aa2dba https://github.com/phpmyadmin/phpmyadmin/commit/f21dfd6646e12cbd215e7b94f427... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-18 (Mon, 18 Jun 2012)

Changed paths: M libraries/plugins/import/ImportCsv.class.php A libraries/plugins/import/ImportDocsql.class.php

Log Message: ----------- oop: ImportDocsql

Commit: f6c7bac2c793945562d5a52c06ab648c8af7c787 https://github.com/phpmyadmin/phpmyadmin/commit/f6c7bac2c793945562d5a52c06ab... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-18 (Mon, 18 Jun 2012)

Changed paths: M libraries/plugins/ImportPlugin.class.php M libraries/plugins/import/ImportCsv.class.php M libraries/plugins/import/ImportDocsql.class.php M libraries/plugins/import/ImportSql.class.php M libraries/plugins/import/ImportXml.class.php

Log Message: ----------- oop: import - remove getters and setters for globals

Commit: 9abc518e9e370e5a8c51480512d334534601c8a1 https://github.com/phpmyadmin/phpmyadmin/commit/9abc518e9e370e5a8c51480512d3... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-18 (Mon, 18 Jun 2012)

Changed paths: A libraries/plugins/import/ImportLdi.class.php

Log Message: ----------- oop: ImportLdi

Commit: 1df80ed79adc98a2c197045317af48cd1f0414ea https://github.com/phpmyadmin/phpmyadmin/commit/1df80ed79adc98a2c197045317af... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-18 (Mon, 18 Jun 2012)

Changed paths: M libraries/plugins/import/ImportDocsql.class.php

Log Message: ----------- oop: ImportDocsql clear spaces

Commit: 7248bf87fad6f371943c7b26c3a597bc04265dc7 https://github.com/phpmyadmin/phpmyadmin/commit/7248bf87fad6f371943c7b26c3a5... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-18 (Mon, 18 Jun 2012)

Changed paths: A libraries/plugins/import/ImportMediawiki.class.php

Log Message: ----------- oop: ImportMediawiki

Commit: a62dda15f6cb7245a654ead54442ca067b63e33f https://github.com/phpmyadmin/phpmyadmin/commit/a62dda15f6cb7245a654ead54442... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-18 (Mon, 18 Jun 2012)

Changed paths: A libraries/plugins/import/ImportOds.class.php

Log Message: ----------- oop: ImportOds

Commit: 0cfb03331c62864d5690299a9b28f5fb1d6748b7 https://github.com/phpmyadmin/phpmyadmin/commit/0cfb03331c62864d5690299a9b28... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-18 (Mon, 18 Jun 2012)

Changed paths: A libraries/plugins/import/ImportShp.class.php A libraries/plugins/import/PMA_ShapeFile.class.php A libraries/plugins/import/PMA_ShapeRecord.class.php

Log Message: ----------- oop: ImportShp

Commit: ab436a573c7193f6bf06a9360e9ff53bdcc0de15 https://github.com/phpmyadmin/phpmyadmin/commit/ab436a573c7193f6bf06a9360e9f... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-19 (Tue, 19 Jun 2012)

Changed paths: M libraries/plugin_interface.lib.php M libraries/plugins/import/ImportCsv.class.php M libraries/plugins/import/ImportDocsql.class.php M libraries/plugins/import/ImportLdi.class.php M libraries/plugins/import/ImportMediawiki.class.php M libraries/plugins/import/ImportShp.class.php

Log Message: ----------- oop: fix display import plugins list bug

Commit: afc81bfa6e1c2c2e827cbe978565b563c31539a8 https://github.com/phpmyadmin/phpmyadmin/commit/afc81bfa6e1c2c2e827cbe978565... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-19 (Tue, 19 Jun 2012)

Changed paths: M libraries/insert_edit.lib.php M libraries/transformations/text_plain__append.inc.php M po/cs.po M po/hy.po M po/sl.po M po/tr.po M test/classes/gis/PMA_GIS_Geometry_test.php M test/classes/gis/PMA_GIS_Geometrycollection_test.php M test/classes/gis/PMA_GIS_Linestring_test.php M test/classes/gis/PMA_GIS_Multilinestring_test.php M test/classes/gis/PMA_GIS_Multipoint_test.php M test/classes/gis/PMA_GIS_Multipolygon_test.php M test/classes/gis/PMA_GIS_Point_test.php M test/classes/gis/PMA_GIS_Polygon_test.php

Log Message: ----------- Merge branch 'master' into plugins-and-OOP

Commit: 507be981fee972cb559d986787b44e8702b97de7 https://github.com/phpmyadmin/phpmyadmin/commit/507be981fee972cb559d986787b4... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-19 (Tue, 19 Jun 2012)

Changed paths: M libraries/plugins/TransformationsPlugin.class.php A libraries/plugins/transformations/Application_Octetstream_Download.class.php A libraries/plugins/transformations/Application_Octetstream_Hex.class.php A libraries/plugins/transformations/Image_JPEG_Inline.class.php A libraries/plugins/transformations/Image_JPEG_Link.class.php A libraries/plugins/transformations/Image_PNG_Inline.class.php A libraries/plugins/transformations/Text_Plain_Append.class.php A libraries/plugins/transformations/Text_Plain_Dateformat.class.php A libraries/plugins/transformations/Text_Plain_External.class.php A libraries/plugins/transformations/Text_Plain_Formatted.class.php A libraries/plugins/transformations/Text_Plain_Imagelink.class.php A libraries/plugins/transformations/Text_Plain_Link.class.php A libraries/plugins/transformations/Text_Plain_Longtoipv4.class.php A libraries/plugins/transformations/Text_Plain_Sql.class.php A libraries/plugins/transformations/Text_Plain_Substring.class.php R libraries/plugins/transformations/TransformationApplicationOctetStreamDownload.class.php R libraries/plugins/transformations/TransformationApplicationOctetStreamHex.class.php R libraries/plugins/transformations/TransformationImageJPEGInline.class.php R libraries/plugins/transformations/TransformationImageJPEGLink.class.php R libraries/plugins/transformations/TransformationImagePNGInline.class.php R libraries/plugins/transformations/TransformationTextPlainAppend.class.php R libraries/plugins/transformations/TransformationTextPlainDateFormat.class.php R libraries/plugins/transformations/TransformationTextPlainExternal.class.php R libraries/plugins/transformations/TransformationTextPlainFormatted.class.php R libraries/plugins/transformations/TransformationTextPlainImageLink.class.php R libraries/plugins/transformations/TransformationTextPlainLink.class.php R libraries/plugins/transformations/TransformationTextPlainLongToIPv4.class.php R libraries/plugins/transformations/TransformationTextPlainSQL.class.php R libraries/plugins/transformations/TransformationTextPlainSubstring.class.php M libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/LongToIPv4TransformationsPlugin.class.php

Log Message: ----------- oop: transformations rename classes

Commit: 1ad049d8239853516d7c007e98a2fee09ac9115c https://github.com/phpmyadmin/phpmyadmin/commit/1ad049d8239853516d7c007e98a2... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-19 (Tue, 19 Jun 2012)

Changed paths: A libraries/plugins/TransformationsInterface.int.php M libraries/plugins/TransformationsPlugin.class.php M libraries/plugins/transformations/Application_Octetstream_Download.class.php M libraries/plugins/transformations/Application_Octetstream_Hex.class.php M libraries/plugins/transformations/Image_JPEG_Inline.class.php M libraries/plugins/transformations/Image_JPEG_Link.class.php M libraries/plugins/transformations/Image_PNG_Inline.class.php M libraries/plugins/transformations/Text_Plain_Append.class.php M libraries/plugins/transformations/Text_Plain_Dateformat.class.php M libraries/plugins/transformations/Text_Plain_External.class.php M libraries/plugins/transformations/Text_Plain_Formatted.class.php M libraries/plugins/transformations/Text_Plain_Imagelink.class.php M libraries/plugins/transformations/Text_Plain_Link.class.php M libraries/plugins/transformations/Text_Plain_Longtoipv4.class.php M libraries/plugins/transformations/Text_Plain_Sql.class.php M libraries/plugins/transformations/Text_Plain_Substring.class.php M libraries/plugins/transformations/abstract/AppendTransformationsPlugin.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 A libraries/plugins/transformations/abstract/HexTransformationsPlugin.class.php R libraries/plugins/transformations/abstract/HexTransformationsPlugin.class.php.php M libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php R libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php.php M libraries/plugins/transformations/abstract/LinkTransformationsPlugin.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/transformations.lib.php M transformation_overview.php

Log Message: ----------- oop: transformations - fix classes, add interface and use descriptions

Commit: 02dbd14fc7a212b591ae050998c6eebf60298b00 https://github.com/phpmyadmin/phpmyadmin/commit/02dbd14fc7a212b591ae050998c6... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-20 (Wed, 20 Jun 2012)

Changed paths: M libraries/DisplayResults.class.php M libraries/insert_edit.lib.php M libraries/plugins/TransformationsPlugin.class.php M libraries/plugins/transformations/Application_Octetstream_Download.class.php M libraries/plugins/transformations/Application_Octetstream_Hex.class.php M libraries/plugins/transformations/Image_JPEG_Inline.class.php M libraries/plugins/transformations/Image_JPEG_Link.class.php M libraries/plugins/transformations/Image_PNG_Inline.class.php M libraries/plugins/transformations/Text_Plain_Append.class.php M libraries/plugins/transformations/Text_Plain_Dateformat.class.php M libraries/plugins/transformations/Text_Plain_External.class.php M libraries/plugins/transformations/Text_Plain_Formatted.class.php M libraries/plugins/transformations/Text_Plain_Imagelink.class.php M libraries/plugins/transformations/Text_Plain_Link.class.php M libraries/plugins/transformations/Text_Plain_Longtoipv4.class.php M libraries/plugins/transformations/Text_Plain_Sql.class.php M libraries/plugins/transformations/Text_Plain_Substring.class.php M libraries/plugins/transformations/abstract/AppendTransformationsPlugin.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 R libraries/plugins/transformations/abstract/LinkTransformationsPlugin.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 A libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php M tbl_replace.php

Log Message: ----------- oop: integrate transformations - no errors, but not working.

Commit: 11596ca702fc506d7e0743b95bc09cf1853a54c0 https://github.com/phpmyadmin/phpmyadmin/commit/11596ca702fc506d7e0743b95bc0... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-20 (Wed, 20 Jun 2012)

Changed paths: M ChangeLog M js/db_search.js M libraries/insert_edit.lib.php M tbl_replace.php

Log Message: ----------- oop: merge master, fix conflicts

Commit: b0248d0e4d786aa5f943d3464e0b4e2180534a9d https://github.com/phpmyadmin/phpmyadmin/commit/b0248d0e4d786aa5f943d3464e0b... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-20 (Wed, 20 Jun 2012)

Changed paths: M libraries/DisplayResults.class.php M tbl_replace.php

Log Message: ----------- oop: fix transformations bug

Commit: 6efd5422f7e37375063a16a92518b940712922ea https://github.com/phpmyadmin/phpmyadmin/commit/6efd5422f7e37375063a16a92518... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-20 (Wed, 20 Jun 2012)

Changed paths: M libraries/plugins/transformations/Image_JPEG_Link.class.php M libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php M libraries/tbl_properties.inc.php M tbl_alter.php

Log Message: ----------- oop: transformations phpcs errors

Commit: bb77c8ede68750db750a0949dd2574a51b914ee2 https://github.com/phpmyadmin/phpmyadmin/commit/bb77c8ede68750db750a0949dd25... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-21 (Thu, 21 Jun 2012)

Changed paths: M libraries/DisplayResults.class.php M libraries/gis_visualization.lib.php M libraries/insert_edit.lib.php M libraries/rte/rte_routines.lib.php M pmd_general.php M po/fr.po M server_status.php M tbl_change.php

Log Message: ----------- oop: merge master

Commit: aad914f7b8dfc0d95b49dff54ee87a4f479768ee https://github.com/phpmyadmin/phpmyadmin/commit/aad914f7b8dfc0d95b49dff54ee8... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-21 (Thu, 21 Jun 2012)

Changed paths: M libraries/plugins/auth/AuthenticationConfig.class.php

Log Message: ----------- oop: AuthenticationConfig

Commit: c91e80b6ca98aed4eaa8ab5fda006c3f4c54d890 https://github.com/phpmyadmin/phpmyadmin/commit/c91e80b6ca98aed4eaa8ab5fda00... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-22 (Fri, 22 Jun 2012)

Changed paths: M libraries/blowfish.php M libraries/plugins/auth/AuthenticationCookie.class.php A libraries/plugins/auth/HordeCipherBlowfishOperations.class.php

Log Message: ----------- oop: AuthenticationCookie

Commit: 6d1f1132dae70360f16e1d04b9dd2ca8d181192e https://github.com/phpmyadmin/phpmyadmin/commit/6d1f1132dae70360f16e1d04b9dd... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-22 (Fri, 22 Jun 2012)

Changed paths: M libraries/plugins/auth/AuthenticationHTTP.class.php

Log Message: ----------- oop: AuthenticationHTTP

Commit: 096a0a224f59da82942460be0367a17ba75abda8 https://github.com/phpmyadmin/phpmyadmin/commit/096a0a224f59da82942460be0367... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-22 (Fri, 22 Jun 2012)

Changed paths: R libraries/plugins/auth/AuthenticationSIgnOn.class.php A libraries/plugins/auth/AuthenticationSignOn.class.php

Log Message: ----------- oop: AuthenticationSignon

Commit: 2640b1399f8c82f7dc7c02e10bbb0d8513377035 https://github.com/phpmyadmin/phpmyadmin/commit/2640b1399f8c82f7dc7c02e10bbb... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-22 (Fri, 22 Jun 2012)

Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php

Log Message: ----------- oop: AuthenticationCookie bug

Commit: 29cb9811d33c10b1c50ace568f37fa76041f2c75 https://github.com/phpmyadmin/phpmyadmin/commit/29cb9811d33c10b1c50ace568f37... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-22 (Fri, 22 Jun 2012)

Changed paths: M libraries/plugins/auth/AuthenticationConfig.class.php M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/plugins/auth/AuthenticationHTTP.class.php M libraries/plugins/auth/AuthenticationSignOn.class.php M libraries/plugins/auth/HordeCipherBlowfishOperations.class.php

Log Message: ----------- oop: Auth - phpcs errors; remove php+html mix

Commit: 1df5cc8eae24a6f45707fc43939de2ab07ac4063 https://github.com/phpmyadmin/phpmyadmin/commit/1df5cc8eae24a6f45707fc43939d... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-22 (Fri, 22 Jun 2012)

Changed paths: M test/libraries/PMA_blowfish_test.php

Log Message: ----------- oop: remake PMA_blowfish_test

Commit: 0565b0e12aef4456f0172669659d63ebb1659c4f https://github.com/phpmyadmin/phpmyadmin/commit/0565b0e12aef4456f0172669659d... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-22 (Fri, 22 Jun 2012)

Changed paths: M libraries/common.inc.php M libraries/dbi/drizzle.dbi.lib.php M libraries/dbi/mysql.dbi.lib.php M libraries/dbi/mysqli.dbi.lib.php R libraries/plugins/auth/AuthenticationHTTP.class.php A libraries/plugins/auth/AuthenticationHttp.class.php R libraries/plugins/auth/AuthenticationSignOn.class.php A libraries/plugins/auth/AuthenticationSignon.class.php M user_password.php

Log Message: ----------- oop: integrate authentication plugins

Commit: 65467e9c77a7ca91c462bfcac91efc56423e9324 https://github.com/phpmyadmin/phpmyadmin/commit/65467e9c77a7ca91c462bfcac91e... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-22 (Fri, 22 Jun 2012)

Changed paths: M libraries/common.inc.php M libraries/plugins/auth/AuthenticationCookie.class.php

Log Message: ----------- oop: AuthenticationCookie bug

Commit: c10ee4dc9fbb5cc62680d59491d2f70448e6632e https://github.com/phpmyadmin/phpmyadmin/commit/c10ee4dc9fbb5cc62680d59491d2... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-22 (Fri, 22 Jun 2012)

Changed paths: M po/ko.po M po/ru.po M po/sv.po

Log Message: ----------- Merge branch 'master' into plugins-and-OOP

Commit: 89570a547573df90e0c0830bb78e8ea810ed83bb https://github.com/phpmyadmin/phpmyadmin/commit/89570a547573df90e0c0830bb78e... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-22 (Fri, 22 Jun 2012)

Changed paths: M libraries/display_import.lib.php M libraries/display_import_ajax.lib.php M libraries/plugins/PluginManager.class.php M libraries/plugins/TransformationsInterface.int.php M libraries/plugins/TransformationsPlugin.class.php A libraries/plugins/UploadInterface.int.php M libraries/plugins/import/ImportShp.class.php A libraries/plugins/import/upload/UploadApc.class.php A libraries/plugins/import/upload/UploadNoplugin.class.php A libraries/plugins/import/upload/UploadProgress.class.php A libraries/plugins/import/upload/UploadSession.class.php

Log Message: ----------- oop: import/upload interface and classes

Commit: c9218f08a6db138100053c78b760f1332b38f3bf https://github.com/phpmyadmin/phpmyadmin/commit/c9218f08a6db138100053c78b760... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-22 (Fri, 22 Jun 2012)

Changed paths: M libraries/DisplayResults.class.php M libraries/display_import_ajax.lib.php M libraries/plugins/UploadInterface.int.php

Log Message: ----------- oop: plugins bugs

Commit: 415bd34b1cb6bac37397dc11c9663dd75ecbadfe https://github.com/phpmyadmin/phpmyadmin/commit/415bd34b1cb6bac37397dc11c966... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-22 (Fri, 22 Jun 2012)

Changed paths: M libraries/auth/cookie.auth.lib.php M libraries/check_user_privileges.lib.php M libraries/common.inc.php M libraries/plugins/auth/swekey/swekey.auth.lib.php

Log Message: ----------- oop: change include locations for plugins

Commit: 5078d65d0676355ebeb2dd9bb2ed34bc4e2eca6c https://github.com/phpmyadmin/phpmyadmin/commit/5078d65d0676355ebeb2dd9bb2ed... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-22 (Fri, 22 Jun 2012)

Changed paths: R libraries/auth/config.auth.lib.php R libraries/auth/cookie.auth.lib.php R libraries/auth/http.auth.lib.php R libraries/auth/signon.auth.lib.php R libraries/auth/swekey/authentication.inc.php R libraries/auth/swekey/musbe-ca.crt R libraries/auth/swekey/swekey.auth.lib.php R libraries/auth/swekey/swekey.php R libraries/export/codegen.php R libraries/export/csv.php R libraries/export/excel.php R libraries/export/htmlword.php R libraries/export/json.php R libraries/export/latex.php R libraries/export/mediawiki.php R libraries/export/ods.php R libraries/export/odt.php R libraries/export/pdf.php R libraries/export/php_array.php R libraries/export/sql.php R libraries/export/texytext.php R libraries/export/xml.php R libraries/export/yaml.php R libraries/import/README R libraries/import/csv.php R libraries/import/docsql.php R libraries/import/ldi.php R libraries/import/mediawiki.php R libraries/import/ods.php R libraries/import/shp.php R libraries/import/sql.php R libraries/import/upload/apc.php R libraries/import/upload/noplugin.php R libraries/import/upload/session.php R libraries/import/upload/uploadprogress.php R libraries/import/xml.php A libraries/plugins/import/README A libraries/plugins/transformations/todo_rewrite/README A libraries/plugins/transformations/todo_rewrite/TEMPLATE A libraries/plugins/transformations/todo_rewrite/TEMPLATE_MIMETYPE A libraries/plugins/transformations/todo_rewrite/generator.sh A libraries/plugins/transformations/todo_rewrite/template_generator.sh A libraries/plugins/transformations/todo_rewrite/template_generator_mimetype.sh R libraries/transformations/README R libraries/transformations/TEMPLATE R libraries/transformations/TEMPLATE_MIMETYPE R libraries/transformations/application_octetstream__download.inc.php R libraries/transformations/application_octetstream__hex.inc.php R libraries/transformations/generator.sh R libraries/transformations/image_jpeg__inline.inc.php R libraries/transformations/image_jpeg__link.inc.php R libraries/transformations/image_png__inline.inc.php R libraries/transformations/template_generator.sh R libraries/transformations/template_generator_mimetype.sh R libraries/transformations/text_plain__append.inc.php R libraries/transformations/text_plain__dateformat.inc.php R libraries/transformations/text_plain__external.inc.php R libraries/transformations/text_plain__formatted.inc.php R libraries/transformations/text_plain__imagelink.inc.php R libraries/transformations/text_plain__link.inc.php R libraries/transformations/text_plain__longToIpv4.inc.php R libraries/transformations/text_plain__sql.inc.php R libraries/transformations/text_plain__substr.inc.php

Log Message: ----------- oop: remove old plugins

Commit: 3fa180b2283c7645eb2251e132872c3b17f01f1e https://github.com/phpmyadmin/phpmyadmin/commit/3fa180b2283c7645eb2251e13287... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-27 (Wed, 27 Jun 2012)

Changed paths: M ChangeLog M db_operations.php M db_search.php M db_structure.php M db_tracking.php M export.php M import_status.php M js/functions.js M js/server_databases.js M libraries/Config.class.php M libraries/DisplayResults.class.php M libraries/Footer.class.php M libraries/Header.class.php M libraries/Index.class.php M libraries/Menu.class.php M libraries/OutputBuffering.class.php M libraries/RecentTable.class.php M libraries/StorageEngine.class.php M libraries/Table.class.php M libraries/Tracker.class.php M libraries/build_html_for_db.lib.php M libraries/core.lib.php M libraries/database_interface.lib.php M libraries/display_import_ajax.lib.php M libraries/gis/pma_gis_visualization.php M libraries/import.lib.php M libraries/insert_edit.lib.php M libraries/navigation_header.inc.php M libraries/opendocument.lib.php M libraries/plugins/auth/AuthenticationConfig.class.php M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/relation.lib.php M libraries/relation_cleanup.lib.php M libraries/sanitizing.lib.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 libraries/schema/User_Schema.class.php M libraries/schema/Visio_Relation_Schema.class.php M libraries/select_server.lib.php M libraries/server_common.inc.php M libraries/server_synchronize.lib.php M libraries/sql_query_form.lib.php M libraries/sqlvalidator.class.php R libraries/tbl_replace_fields.inc.php M libraries/transformations.lib.php M libraries/url_generating.lib.php M libraries/zip.lib.php M main.php M navigation.php M pmd_display_field.php M pmd_pdf.php M pmd_relation_new.php M pmd_relation_upd.php M pmd_save_pos.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/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.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/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/zh_CN.po M po/zh_TW.po M server_databases.php M server_privileges.php M tbl_change.php M tbl_operations.php M tbl_relation.php M tbl_replace.php M tbl_structure.php M tbl_tracking.php M test/libraries/core/PMA_fatalError_test.php M themes/original/css/navigation.css.php M themes/pmahomme/css/navigation.css.php M webapp.php

Log Message: ----------- oop: merge master, fix commits

Commit: beba0419ba410f4f5efb6d071d368816249a3a6c https://github.com/phpmyadmin/phpmyadmin/commit/beba0419ba410f4f5efb6d071d36... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-27 (Wed, 27 Jun 2012)

Changed paths: M libraries/DisplayResults.class.php

Log Message: ----------- oop: DisplayResults bug

Commit: db4e781485f70e47de90d70d01d6e4d92ed3c2c1 https://github.com/phpmyadmin/phpmyadmin/commit/db4e781485f70e47de90d70d01d6... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-27 (Wed, 27 Jun 2012)

Changed paths: M libraries/Header.class.php M libraries/TableSearch.class.php M libraries/sql_query_form.lib.php

Log Message: ----------- Merge branch 'master' into plugins-and-OOP

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/98e1debafa20...db4e781485f7