6 Aug
2015
6 Aug
'15
7:35 a.m.
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 34a484ec96b9998a3db1383c0275042222767910
https://github.com/phpmyadmin/phpmyadmin/commit/34a484ec96b9998a3db1383c027…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-08-06 (Thu, 06 Aug 2015)
Changed paths:
M js/codemirror/addon/lint/sql-lint.js
Log Message:
-----------
Fix #11345 Token mismatch error
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: a60987cee18fd893f4889267e98b12896544fe86
https://github.com/phpmyadmin/phpmyadmin/commit/a60987cee18fd893f4889267e98…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-08-06 (Thu, 06 Aug 2015)
Changed paths:
M ChangeLog
M db_operations.php
M db_sql_format.php
M db_structure.php
M db_tracking.php
M import.php
M js/console.js
M js/functions.js
M js/makegrid.js
M js/pmd/designer_page.js
M libraries/DisplayResults.class.php
M libraries/File.class.php
M libraries/Linter.class.php
M libraries/Scripts.class.php
M libraries/SystemDatabase.class.php
M libraries/Table.class.php
M libraries/config.default.php
A libraries/controllers/StructureController.class.php
M libraries/controllers/TableRelationController.class.php
M libraries/controllers/TableSearchController.class.php
M libraries/create_addfield.lib.php
M libraries/db_common.inc.php
M libraries/db_info.inc.php
M libraries/dbi/DBIDummy.class.php
M libraries/display_change_password.lib.php
M libraries/display_create_table.lib.php
R libraries/display_structure.inc.php
M libraries/mult_submits.inc.php
M libraries/mult_submits.lib.php
M libraries/plugins/export/PMA_ExportPdf.class.php
M libraries/plugins/import/ImportSql.class.php
M libraries/server_privileges.lib.php
R libraries/sql-formatter/LICENSE.txt
R libraries/sql-formatter/README.md
R libraries/sql-formatter/lib/SqlFormatter.php
M libraries/sql-parser/src/Component.php
M libraries/sql-parser/src/Components/AlterOperation.php
M libraries/sql-parser/src/Components/UnionKeyword.php
M libraries/sql-parser/src/Context.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/ReplaceStatement.php
A libraries/sql-parser/src/Statements/SetStatement.php
M libraries/sql-parser/src/Statements/TransactionStatement.php
M libraries/sql-parser/src/UtfString.php
A libraries/sql-parser/src/Utils/Formatter.php
M libraries/sql-parser/src/Utils/Query.php
M libraries/sql_query_form.lib.php
R libraries/structure.lib.php
M libraries/tbl_columns_definition_form.inc.php
M lint.php
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
M tbl_structure.php
A templates/components/error_message.phtml
A templates/structure/browse_table.phtml
A templates/structure/browse_table_label.phtml
A templates/structure/display_structure.phtml
A templates/structure/empty_table.phtml
M templates/structure/favorite_anchor.phtml
M templates/structure/row_stats_table.phtml
A templates/structure/search_table.phtml
A templates/structure/secondary_tabs.phtml
A templates/structure/sortable_header.phtml
M templates/structure/structure_table_row.phtml
M templates/structure/table_header.phtml
M templates/structure/table_structure_row.phtml
A templates/structure/tracking_icon.phtml
A templates/table/create_table.phtml
M test/libraries/PMA_mult_submits_test.php
M test/libraries/PMA_structure_test.php
R test/libraries/sql-formatter/lib/SqlFormatter_test.php
Log Message:
-----------
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9ad20e82d50c...a60987cee18f