Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 38c0177b3ad3a81c06060e46e741280f044cc0df https://github.com/phpmyadmin/phpmyadmin/commit/38c0177b3ad3a81c06060e46e741... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-06-01 (Mon, 01 Jun 2015)

Changed paths: M js/db_structure.js

Log Message: ----------- Remove the anchor if total row count is not approximate

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 234e72a5822c2f9601f954cfc29c5f43b18cef13 https://github.com/phpmyadmin/phpmyadmin/commit/234e72a5822c2f9601f954cfc29c... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-06-01 (Mon, 01 Jun 2015)

Changed paths: M .scrutinizer.yml M .travis.yml M ChangeLog M composer.json M db_structure.php M doc/config.rst M import.php M js/db_central_columns.js M js/functions.js M js/messages.php M libraries/DatabaseInterface.class.php M libraries/TableSearch.class.php M libraries/Types.class.php M libraries/Util.class.php M libraries/config.default.php M libraries/config.values.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php M libraries/display_import.lib.php M libraries/import.lib.php M libraries/mult_submits.inc.php M libraries/mult_submits.lib.php M libraries/normalization.lib.php M libraries/sql_query_form.lib.php M libraries/tbl_columns_definition_form.lib.php M libraries/tbl_gis_visualization.lib.php M libraries/tbl_indexes.lib.php M libraries/tbl_printview.lib.php M libraries/tbl_relation.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/eo.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/fy.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/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/li.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/ne.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/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po A templates/columns_definitions/column_adjust_privileges.phtml A templates/columns_definitions/column_attribute.phtml A templates/columns_definitions/column_auto_increment.phtml A templates/columns_definitions/column_comment.phtml A templates/columns_definitions/column_default.phtml A templates/columns_definitions/column_definitions_form.phtml A templates/columns_definitions/column_extra.phtml A templates/columns_definitions/column_indexes.phtml A templates/columns_definitions/column_length.phtml A templates/columns_definitions/column_null.phtml A templates/columns_definitions/column_type.phtml A templates/columns_definitions/mime_type.phtml A templates/columns_definitions/move_column.phtml A templates/columns_definitions/table_fields_definitions.phtml A templates/columns_definitions/transformation.phtml A templates/columns_definitions/transformation_option.phtml A templates/gis_visualization/gis_visualization.phtml A templates/index_form.phtml A templates/printview/columns.phtml A templates/printview/footer.phtml A templates/printview/row_statistics.phtml A templates/printview/space_usage.phtml A templates/printview/space_usage_and_row_statistics.phtml A templates/printview/tables_detail.phtml A templates/printview/tables_info.phtml A templates/printview/tables_structure.phtml A templates/table/column_comparison_operators.phtml A templates/table/fields_table.phtml A templates/table/form_tag.phtml A templates/table/geom_func.phtml A templates/table/input_box.phtml A templates/table/options.phtml A templates/table/options_zoom.phtml A templates/table/replace_preview.phtml A templates/table/rows_normal.phtml A templates/table/rows_zoom.phtml A templates/table/search_and_replace.phtml A templates/table/secondary_tabs.phtml A templates/table/selection_form.phtml A templates/table/table_header.phtml A templates/table/zoom_result_form.phtml M templates/tbl_chart.phtml A templates/tbl_relation/common_form.phtml A templates/tbl_relation/dropdown_generate.phtml A templates/tbl_relation/foreign_key_row.phtml A templates/tbl_relation/internal_relational_row.phtml A templates/tbl_relation/relational_dropdown.phtml M test/bootstrap-dist.php M test/classes/PMA_TableReplaceSearch_test.php M test/classes/PMA_TableSearch_test.php M test/classes/PMA_Types_MySQL_test.php M test/libraries/PMA_Tracker_test.php M test/libraries/PMA_tbl_columns_definition_form_test.php M test/libraries/PMA_tbl_gis_visualization_test.php M test/libraries/PMA_tbl_indexes_test.php M test/libraries/PMA_tbl_relation_test.php

Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Commit: d4235da3b8065184585ad1bf9b065a18c9e30ff1 https://github.com/phpmyadmin/phpmyadmin/commit/d4235da3b8065184585ad1bf9b06... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-06-01 (Mon, 01 Jun 2015)

Changed paths: M ChangeLog

Log Message: ----------- ChangeLog entry for rfe #1676

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/59525a59fa21...d4235da3b806