Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 7ab40e1deb8bdc9a4f7405c7e92784de34bba476
https://github.com/phpmyadmin/phpmyadmin/commit/7ab40e1deb8bdc9a4f7405c7e92784de34bba476
Author: Atul Pratap Singh <[email protected]>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M db_search.php
M libraries/db_search.lib.php
Log Message:
-----------
Variable improvement left in 417856ee9f7e1aa94721
Commit: 49b5e42372cb50d1b95cd371fc1be67d7fc559db
https://github.com/phpmyadmin/phpmyadmin/commit/49b5e42372cb50d1b95cd371fc1be67d7fc559db
Author: Atul Pratap Singh <[email protected]>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M db_operations.php
M libraries/display_import_ajax.lib.php
M po/pt_BR.po
M po/sk.po
A test/classes/PMA_DisplayResults_test.php
M test/libraries/core/PMA_getTableCount_test_dis.php
M test/libraries/core/PMA_headerLocation_test_disabled.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Commit: 362213af2023f24f87c45335a38ffa14863227f5
https://github.com/phpmyadmin/phpmyadmin/commit/362213af2023f24f87c45335a38ffa14863227f5
Author: Atul Pratap Singh <[email protected]>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M libraries/db_search.lib.php
Log Message:
-----------
Move variables to appropriate function
Commit: 0fc4d56effbd927e106125446d91e2eee78e7c93
https://github.com/phpmyadmin/phpmyadmin/commit/0fc4d56effbd927e106125446d91e2eee78e7c93
Author: Atul Pratap Singh <[email protected]>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
A test/classes/PMA_Error_test.php
M test/classes/PMA_Message_test.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Commit: 82ff5dc5e065e142b501ec5c91c4b8b5b6ce08ab
https://github.com/phpmyadmin/phpmyadmin/commit/82ff5dc5e065e142b501ec5c91c4b8b5b6ce08ab
Author: Atul Pratap Singh <[email protected]>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M db_search.php
M libraries/db_search.lib.php
Log Message:
-----------
Improve usage visibility of criteriaSearchString variable
Commit: 4203ca5d5429518ab0e301d1c475dd31b4ab3367
https://github.com/phpmyadmin/phpmyadmin/commit/4203ca5d5429518ab0e301d1c475dd31b4ab3367
Author: Atul Pratap Singh <[email protected]>
Date: 2012-06-30 (Sat, 30 Jun 2012)
Changed paths:
M libraries/db_search.lib.php
Log Message:
-----------
Add some more comments
Commit: 714e9106110d0e0a336207ac10c60e93de0ebcaa
https://github.com/phpmyadmin/phpmyadmin/commit/714e9106110d0e0a336207ac10c60e93de0ebcaa
Author: Atul Pratap Singh <[email protected]>
Date: 2012-06-30 (Sat, 30 Jun 2012)
Changed paths:
M libraries/db_search.lib.php
Log Message:
-----------
Some coding style improvements
Commit: 9281d8b3a464882ef8566698fb3efedabc1449cc
https://github.com/phpmyadmin/phpmyadmin/commit/9281d8b3a464882ef8566698fb3efedabc1449cc
Author: Atul Pratap Singh <[email protected]>
Date: 2012-06-30 (Sat, 30 Jun 2012)
Changed paths:
M libraries/db_search.lib.php
Log Message:
-----------
Fix doc comment
Commit: 9e5201ef2e3c2bc3f3fbfed7d9be645fa615fbee
https://github.com/phpmyadmin/phpmyadmin/commit/9e5201ef2e3c2bc3f3fbfed7d9be645fa615fbee
Author: Atul Pratap Singh <[email protected]>
Date: 2012-06-30 (Sat, 30 Jun 2012)
Changed paths:
M import_status.php
M libraries/DisplayResults.class.php
M libraries/insert_edit.lib.php
M po/ru.po
M po/sl.po
M tbl_change.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Commit: 81d15e860b647f176de968aae9cc1c64c1ffc0d0
https://github.com/phpmyadmin/phpmyadmin/commit/81d15e860b647f176de968aae9cc1c64c1ffc0d0
Author: Atul Pratap Singh <[email protected]>
Date: 2012-06-30 (Sat, 30 Jun 2012)
Changed paths:
M libraries/db_search.lib.php
Log Message:
-----------
Fix typo in 82ff5dc5e065e142b501
Commit: 21eff5b2fcdc0de1c87731ec39c165ab3d5b0187
https://github.com/phpmyadmin/phpmyadmin/commit/21eff5b2fcdc0de1c87731ec39c165ab3d5b0187
Author: Atul Pratap Singh <[email protected]>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M ChangeLog
M browse_foreigners.php
M db_create.php
M db_datadict.php
M db_events.php
M db_operations.php
M db_printview.php
M db_qbe.php
M db_routines.php
M db_search.php
M db_structure.php
M db_tables_search.php
M db_tracking.php
M export.php
M import.php
M index.php
M js/db_operations.js
M js/functions.js
M js/tbl_change.js
M libraries/Advisor.class.php
A libraries/CommonFunctions.class.php
M libraries/DisplayResults.class.php
M libraries/File.class.php
M libraries/Footer.class.php
M libraries/Header.class.php
M libraries/Index.class.php
M libraries/List_Database.class.php
M libraries/Menu.class.php
M libraries/Message.class.php
M libraries/PDF.class.php
M libraries/RecentTable.class.php
M libraries/StorageEngine.class.php
M libraries/Table.class.php
M libraries/TableSearch.class.php
M libraries/Tracker.class.php
M libraries/bookmark.lib.php
M libraries/build_html_for_db.lib.php
M libraries/check_user_privileges.lib.php
M libraries/common.inc.php
R libraries/common.lib.php
M libraries/config/FormDisplay.tpl.php
M libraries/core.lib.php
M libraries/database_interface.lib.php
M libraries/db_common.inc.php
M libraries/db_info.inc.php
M libraries/db_structure.lib.php
M libraries/db_table_exists.lib.php
M libraries/display_create_database.lib.php
M libraries/display_create_table.lib.php
M libraries/display_export.lib.php
M libraries/display_git_revision.lib.php
M libraries/display_import.lib.php
M libraries/display_import_ajax.lib.php
M libraries/display_select_lang.lib.php
M libraries/engines/innodb.lib.php
M libraries/engines/pbxt.lib.php
M libraries/gis/pma_gis_polygon.php
M libraries/import.lib.php
M libraries/insert_edit.lib.php
M libraries/ip_allow_deny.lib.php
M libraries/js_escape.lib.php
M libraries/mult_submits.inc.php
M libraries/mysql_charsets.lib.php
M libraries/navigation_header.inc.php
M libraries/plugin_interface.lib.php
M libraries/plugins/auth/AuthenticationConfig.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M libraries/plugins/auth/AuthenticationSignon.class.php
M libraries/plugins/export/ExportCodegen.class.php
M libraries/plugins/export/ExportHtmlword.class.php
M libraries/plugins/export/ExportLatex.class.php
M libraries/plugins/export/ExportMediawiki.class.php
M libraries/plugins/export/ExportOdt.class.php
M 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/import/ImportCsv.class.php
M libraries/plugins/import/ImportDocsql.class.php
M libraries/plugins/import/ImportLdi.class.php
M libraries/plugins/import/ImportXml.class.php
M
libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php
M libraries/pmd_common.php
M libraries/relation.lib.php
M libraries/relation_cleanup.lib.php
M libraries/replication_gui.lib.php
M libraries/rte/rte_events.lib.php
M libraries/rte/rte_export.lib.php
M libraries/rte/rte_footer.lib.php
M libraries/rte/rte_list.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/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/server_common.inc.php
M libraries/server_synchronize.lib.php
M libraries/server_variables_doc.php
M libraries/sql_query_form.lib.php
M libraries/sqlparser.lib.php
M libraries/tbl_common.inc.php
M libraries/tbl_info.inc.php
M libraries/tbl_properties.inc.php
M libraries/tcpdf/tcpdf.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 pmd_display_field.php
M pmd_general.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/[email protected]
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/[email protected]
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/[email protected]
M po/zh_CN.po
M po/zh_TW.po
M prefs_manage.php
M querywindow.php
M schema_edit.php
M server_binlog.php
M server_collations.php
M server_databases.php
M server_engines.php
M server_plugins.php
M server_privileges.php
M server_replication.php
M server_status.php
M server_synchronize.php
M server_variables.php
M sql.php
M tbl_addfield.php
M tbl_alter.php
M tbl_change.php
M tbl_create.php
M tbl_export.php
M tbl_get_field.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_structure.php
M tbl_tracking.php
M tbl_zoom_select.php
M test/classes/PMA_DisplayResults_test.php
A test/classes/PMA_Error_Handler_test.php
M test/classes/PMA_File_test.php
A test/classes/PMA_Footer_test.php
M test/classes/PMA_List_Database_test.php
M test/classes/PMA_PDF_test.php
M test/classes/PMA_Theme_Manager_test.php
M test/classes/PMA_Theme_test.php
M test/libraries/PMA_GIS_modifyQuery_test.php
M test/libraries/PMA_STR_sub_test.php
M test/libraries/common/PMA_browseUploadFile_test.php
M test/libraries/common/PMA_buildActionTitles_test.php
M test/libraries/common/PMA_cache_test.php
M test/libraries/common/PMA_checkParameters_test.php
M test/libraries/common/PMA_contains_nonprintable_ascii_test.php
M test/libraries/common/PMA_convert_bit_default_value_test.php
M test/libraries/common/PMA_escapeMySqlWildcards_test.php
M test/libraries/common/PMA_expandUserString_test.php
M test/libraries/common/PMA_extractColumnSpec_test.php
M test/libraries/common/PMA_extractValueFromFormattedSize_test.php
M test/libraries/common/PMA_foreignKeySupported_test.php
M test/libraries/common/PMA_formatNumberByteDown_test.php
M test/libraries/common/PMA_formatSql_test.php
M test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
M test/libraries/common/PMA_getCheckbox_test.php
M test/libraries/common/PMA_getDbLink_test.php
M test/libraries/common/PMA_getDivForSliderEffect_test.php
M test/libraries/common/PMA_getDropdown_test.php
M test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
M test/libraries/common/PMA_getIcon_test.php
M test/libraries/common/PMA_getRadioFields_test.php
M test/libraries/common/PMA_getTitleForTarget_test.php
M test/libraries/common/PMA_localisedDateTimespan_test.php
M test/libraries/common/PMA_pow_test.php
M test/libraries/common/PMA_printableBitValue_test.php
M test/libraries/common/PMA_quoting_slashing_test.php
M test/libraries/common/PMA_showDocu_test.php
M test/libraries/common/PMA_showMessage_test_disabled.php
M test/libraries/common/PMA_showPHPDocu_test.php
M test/libraries/common/PMA_stringOperations_test.php
M test/libraries/common/PMA_unsupportedDatatypes_test.php
M test/libraries/common/PMA_whichCrlf_test.php
M test/libraries/core/PMA_fatalError_test.php
M test/libraries/core/PMA_getTableCount_test_dis.php
M test/libraries/core/PMA_headerLocation_test_disabled.php
M test/libraries/js_escape_test.php
M test/libraries/rte/PMA_EVN_getEditorForm_test.php
M test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php
M test/libraries/rte/PMA_RTN_ParameterParser_test.php
M test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
M test/libraries/rte/PMA_RTN_getEditorForm_test.php
M test/libraries/rte/PMA_RTN_getExecuteForm_test.php
M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
M test/libraries/rte/PMA_TRI_getEditorForm_test.php
M test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
M test/theme.php
M transformation_wrapper.php
M url.php
M user_password.php
M view_create.php
M view_operations.php
Log Message:
-----------
Resolve conlicts in db_search.php
Commit: 0a8dd19414ed5f3bdbbf2d149eaad4566057e83f
https://github.com/phpmyadmin/phpmyadmin/commit/0a8dd19414ed5f3bdbbf2d149eaad4566057e83f
Author: Atul Pratap Singh <[email protected]>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M libraries/db_search.lib.php
Log Message:
-----------
Use PMA_CommonFunctions in libraries/db_search.lib.php
Commit: 7a87b4df33301107c62a01ecb7ea73774381cd7f
https://github.com/phpmyadmin/phpmyadmin/commit/7a87b4df33301107c62a01ecb7ea73774381cd7f
Author: Atul Pratap Singh <[email protected]>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M libraries/CommonFunctions.class.php
M libraries/plugins/export/ExportJson.class.php
A libraries/plugins/export/README
M libraries/plugins/import/README
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Commit: 75e283ab9c20a619c7dc8ff01dd22bd4e2e0aa1a
https://github.com/phpmyadmin/phpmyadmin/commit/75e283ab9c20a619c7dc8ff01dd22bd4e2e0aa1a
Author: Marc Delisle <[email protected]>
Date: 2012-07-04 (Wed, 04 Jul 2012)
Changed paths:
M db_search.php
M libraries/db_search.lib.php
Log Message:
-----------
Merge commit '7a87b4df33301107c62a01ecb7ea73774381cd7f'
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/549b5de9f803...75e283ab9c20
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
