Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 66361530713fcf99b9e090b82ccd016dc3c287b2
https://github.com/phpmyadmin/phpmyadmin/commit/66361530713fcf99b9e090b82cc…
Author: Jason <jason.daurus(a)gmail.com>
Date: 2015-07-23 (Thu, 23 Jul 2015)
Changed paths:
M db_structure.php
M libraries/DBQbe.class.php
M libraries/DatabaseInterface.class.php
M libraries/DisplayResults.class.php
M libraries/Menu.class.php
M libraries/Table.class.php
R libraries/TableSearch.class.php
M libraries/Util.class.php
M libraries/controllers/TableRelationController.class.php
A libraries/controllers/TableSearchController.class.php
M libraries/db_table_exists.lib.php
M libraries/display_export.lib.php
M libraries/export.lib.php
M libraries/import.lib.php
M libraries/operations.lib.php
M libraries/plugins/export/ExportSql.class.php
M libraries/plugins/export/ExportXml.class.php
M libraries/relation.lib.php
M libraries/sql.lib.php
M libraries/structure.lib.php
M libraries/tbl_info.inc.php
M libraries/tracking.lib.php
M tbl_find_replace.php
M tbl_operations.php
M tbl_replace.php
M tbl_select.php
M tbl_tracking.php
M tbl_zoom_select.php
M test/classes/PMA_Table_test.php
M test/classes/plugin/export/PMA_ExportSql_test.php
M test/libraries/PMA_display_export_test.php
Log Message:
-----------
Resolve conflicts from upstream
Signed-off-by: Jason <jason.daurus(a)gmail.com>
Commit: 12ac57e0bd60ef1e3b63e95ce64d0137a8df25d8
https://github.com/phpmyadmin/phpmyadmin/commit/12ac57e0bd60ef1e3b63e95ce64…
Author: Jason <jason.daurus(a)gmail.com>
Date: 2015-07-23 (Thu, 23 Jul 2015)
Changed paths:
R test/classes/PMA_TableReplaceSearch_test.php
R test/classes/PMA_TableSearch_test.php
Log Message:
-----------
Remove references to TableSearch.class.php
Signed-off-by: Jason <jason.daurus(a)gmail.com>
Commit: 6fd29078b645c9f8a3c38cf9e9a346ee4aa303af
https://github.com/phpmyadmin/phpmyadmin/commit/6fd29078b645c9f8a3c38cf9e9a…
Author: Jason <jason.daurus(a)gmail.com>
Date: 2015-07-23 (Thu, 23 Jul 2015)
Changed paths:
M db_datadict.php
M libraries/DatabaseInterface.class.php
M libraries/DisplayResults.class.php
M libraries/Table.class.php
M libraries/controllers/TableRelationController.class.php
M libraries/plugins/export/ExportSql.class.php
M libraries/plugins/export/ExportXml.class.php
M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
M libraries/structure.lib.php
M libraries/tbl_info.inc.php
M tbl_relation.php
M tbl_structure.php
M templates/tbl_relation/foreign_key_row.phtml
A test/classes/PMA_TableReplaceSearch_test.php
A test/classes/PMA_TableSearch_test.php
M test/classes/plugin/export/PMA_ExportSql_test.php
M test/classes/plugin/export/PMA_ExportXml_test.php
M test/libraries/PMA_insert_edit_test.php
Log Message:
-----------
Fix test failures
Signed-off-by: Jason <jason.daurus(a)gmail.com>
Commit: 682614277c35bcaf388589ad139fd1aaf709e9db
https://github.com/phpmyadmin/phpmyadmin/commit/682614277c35bcaf388589ad139…
Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com>
Date: 2015-07-23 (Thu, 23 Jul 2015)
Changed paths:
M db_datadict.php
M db_structure.php
M libraries/DBQbe.class.php
M libraries/DatabaseInterface.class.php
M libraries/DisplayResults.class.php
M libraries/Menu.class.php
M libraries/Table.class.php
R libraries/TableSearch.class.php
M libraries/Util.class.php
M libraries/controllers/TableRelationController.class.php
A libraries/controllers/TableSearchController.class.php
M libraries/db_table_exists.lib.php
M libraries/display_export.lib.php
M libraries/export.lib.php
M libraries/import.lib.php
M libraries/operations.lib.php
M libraries/plugins/export/ExportSql.class.php
M libraries/plugins/export/ExportXml.class.php
M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
M libraries/relation.lib.php
M libraries/sql.lib.php
M libraries/structure.lib.php
M libraries/tbl_info.inc.php
M libraries/tracking.lib.php
M tbl_find_replace.php
M tbl_operations.php
M tbl_relation.php
M tbl_replace.php
M tbl_select.php
M tbl_structure.php
M tbl_tracking.php
M tbl_zoom_select.php
M templates/tbl_relation/foreign_key_row.phtml
M test/classes/PMA_TableReplaceSearch_test.php
M test/classes/PMA_TableSearch_test.php
M test/classes/PMA_Table_test.php
M test/classes/plugin/export/PMA_ExportSql_test.php
M test/classes/plugin/export/PMA_ExportXml_test.php
M test/libraries/PMA_display_export_test.php
M test/libraries/PMA_insert_edit_test.php
Log Message:
-----------
Merge pull request #1777 from gzzhanghao/table
WIP: Refining Table & TableSearch class
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/84baa4df3ed8...682614277c35
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: bf61709259e4b953bced1f332e29b375c5243ba4
https://github.com/phpmyadmin/phpmyadmin/commit/bf61709259e4b953bced1f332e2…
Author: Hugues Peccatte <hugues.peccatte(a)gmail.com>
Date: 2015-07-23 (Thu, 23 Jul 2015)
Changed paths:
M export.php
M gis_data_editor.php
M import.php
M index.php
M license.php
M prefs_forms.php
M tbl_chart.php
M tbl_export.php
M tbl_get_field.php
M tbl_gis_visualization.php
M tbl_indexes.php
Log Message:
-----------
Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: befdbb5b3cc0f0ace3f25a31a695d7def69ee2e6
https://github.com/phpmyadmin/phpmyadmin/commit/befdbb5b3cc0f0ace3f25a31a69…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-07-23 (Thu, 23 Jul 2015)
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/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(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/vi.po
M po/vls.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Update po files
[CI skip]
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: e3ff2b35f6c411b10e7ff7c21aa525e28121fdfb
https://github.com/phpmyadmin/phpmyadmin/commit/e3ff2b35f6c411b10e7ff7c21aa…
Author: josep constanti <jconstanti(a)yahoo.es>
Date: 2015-07-23 (Thu, 23 Jul 2015)
Changed paths:
M po/ca.po
Log Message:
-----------
Translated using Weblate (Catalan)
Currently translated at 96.2% (3044 of 3161 strings)
[CI skip]
Commit: ecd94743c01ecc07dddb47bb211b93123386a05b
https://github.com/phpmyadmin/phpmyadmin/commit/ecd94743c01ecc07dddb47bb211…
Author: Weblate <noreply(a)weblate.org>
Date: 2015-07-23 (Thu, 23 Jul 2015)
Changed paths:
M js/codemirror/addon/lint/sql-lint.js
M libraries/Linter.class.php
M libraries/config/messages.inc.php
M libraries/sql-parser/src/Component.php
M libraries/sql-parser/src/Components/AlterOperation.php
M libraries/sql-parser/src/Components/Array2d.php
M libraries/sql-parser/src/Components/ArrayObj.php
M libraries/sql-parser/src/Components/DataType.php
M libraries/sql-parser/src/Components/Expression.php
M libraries/sql-parser/src/Components/ExpressionArray.php
M libraries/sql-parser/src/Components/FieldDefinition.php
M libraries/sql-parser/src/Components/Limit.php
M libraries/sql-parser/src/Components/OptionsArray.php
M libraries/sql-parser/src/Components/RenameOperation.php
M libraries/sql-parser/src/Lexer.php
M libraries/sql-parser/src/Parser.php
M libraries/sql-parser/src/Statement.php
M libraries/sql-parser/src/Statements/CreateStatement.php
M lint.php
M test/libraries/PMA_Linter_Test.php
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b3996650855e...ecd94743c01e
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 2b3febf65272edabaeeb7a7f0a5862fc87a1d4a2
https://github.com/phpmyadmin/phpmyadmin/commit/2b3febf65272edabaeeb7a7f0a5…
Author: Dan Ungureanu <udan1107(a)gmail.com>
Date: 2015-07-22 (Wed, 22 Jul 2015)
Changed paths:
M js/codemirror/addon/lint/sql-lint.js
M libraries/Linter.class.php
M libraries/config/messages.inc.php
M libraries/sql-parser/src/Component.php
M libraries/sql-parser/src/Components/AlterOperation.php
M libraries/sql-parser/src/Components/Array2d.php
M libraries/sql-parser/src/Components/ArrayObj.php
M libraries/sql-parser/src/Components/DataType.php
M libraries/sql-parser/src/Components/Expression.php
M libraries/sql-parser/src/Components/ExpressionArray.php
M libraries/sql-parser/src/Components/FieldDefinition.php
M libraries/sql-parser/src/Components/Limit.php
M libraries/sql-parser/src/Components/OptionsArray.php
M libraries/sql-parser/src/Components/RenameOperation.php
M libraries/sql-parser/src/Lexer.php
M libraries/sql-parser/src/Parser.php
M libraries/sql-parser/src/Statement.php
M libraries/sql-parser/src/Statements/CreateStatement.php
M lint.php
M test/libraries/PMA_Linter_Test.php
Log Message:
-----------
Localization.
Updated sql-parser library to udan11/sql-parser@e1b91ed.
Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com>
Commit: b3996650855ef5f4fcf10b1f3066c469047e5656
https://github.com/phpmyadmin/phpmyadmin/commit/b3996650855ef5f4fcf10b1f306…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-07-23 (Thu, 23 Jul 2015)
Changed paths:
M js/codemirror/addon/lint/sql-lint.js
M libraries/Linter.class.php
M libraries/config/messages.inc.php
M libraries/sql-parser/src/Component.php
M libraries/sql-parser/src/Components/AlterOperation.php
M libraries/sql-parser/src/Components/Array2d.php
M libraries/sql-parser/src/Components/ArrayObj.php
M libraries/sql-parser/src/Components/DataType.php
M libraries/sql-parser/src/Components/Expression.php
M libraries/sql-parser/src/Components/ExpressionArray.php
M libraries/sql-parser/src/Components/FieldDefinition.php
M libraries/sql-parser/src/Components/Limit.php
M libraries/sql-parser/src/Components/OptionsArray.php
M libraries/sql-parser/src/Components/RenameOperation.php
M libraries/sql-parser/src/Lexer.php
M libraries/sql-parser/src/Parser.php
M libraries/sql-parser/src/Statement.php
M libraries/sql-parser/src/Statements/CreateStatement.php
M lint.php
M test/libraries/PMA_Linter_Test.php
Log Message:
-----------
Merge pull request #1807 from udan11/l10n
Improved localization.
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/465a9ed5f2dd...b3996650855e
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/localized_docs
Commit: b54148dac482ae03333cf01ed75de7d93a618f95
https://github.com/phpmyadmin/localized_docs/commit/b54148dac482ae03333cf01…
Author: Vinícius Araújo <vinipitta(a)gmail.com>
Date: 2015-07-23 (Thu, 23 Jul 2015)
Changed paths:
M po/pt_BR.mo
M po/pt_BR.po
Log Message:
-----------
Translated using Weblate (Portuguese (Brazil))
Currently translated at 95.7% (1639 of 1712 strings)
[CI skip]
Procurei um expressão que deixe claro que a confiabilidade das chaves é definida pelo usuário ou pelas fontes de chave.