Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 417c51ce673e9854e208fd7da9aa79329a522150
https://github.com/phpmyadmin/phpmyadmin/commit/417c51ce673e9854e208fd7da9aa79329a522150
Author: xmujay <xmu...@gmail.com>
Date: 2013-07-20 (Sat, 20 Jul 2013)
Changed paths:
M libraries/mult_submits.inc.php
M libraries/sql.lib.php
M sql.php
Log Message:
-----------
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into
server_refactor2
Commit: 751caca3bf39028b6138b895b65414f7885f075a
https://github.com/phpmyadmin/phpmyadmin/commit/751caca3bf39028b6138b895b65414f7885f075a
Author: xmujay <xmu...@gmail.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M libraries/display_export.lib.php
M tbl_select.php
M test/classes/PMA_TableSearch_test.php
M test/classes/PMA_Table_test.php
M test/classes/schema/Dia_Relation_Schema_test.php
M test/classes/schema/Eps_Relation_Schema_test.php
M test/classes/schema/Pdf_Relation_Schema_test.php
M test/classes/schema/Svg_Relation_Schema_test.php
Log Message:
-----------
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into
server_refactor2
Commit: 53a0d5afd13db1cb50c0a22c015100c90dcb3f87
https://github.com/phpmyadmin/phpmyadmin/commit/53a0d5afd13db1cb50c0a22c015100c90dcb3f87
Author: xmujay <xmu...@gmail.com>
Date: 2013-07-24 (Wed, 24 Jul 2013)
Changed paths:
A js/display_import_no_plugin.js
M libraries/display_import.lib.php
Log Message:
-----------
refactor display_import.lib.php
1. render html at once
2. split js code
Commit: 7cbc80d7495d3c3c7c3183c601dbd57a09fc490a
https://github.com/phpmyadmin/phpmyadmin/commit/7cbc80d7495d3c3c7c3183c601dbd57a09fc490a
Author: xmujay <xmu...@gmail.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M js/display_import_no_plugin.js
M libraries/display_import.lib.php
Log Message:
-----------
refactor the js
Commit: e8fc1adf6bbe753bb74f1b78da62ea50f29fe835
https://github.com/phpmyadmin/phpmyadmin/commit/e8fc1adf6bbe753bb74f1b78da62ea50f29fe835
Author: xmujay <xmu...@gmail.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ChangeLog
M db_qbe.php
M import_status.php
M js/chart.js
M js/server_status_monitor.js
M js/sql.js
M js/tbl_zoom_plot_jqplot.js
M libraries/Advisor.class.php
M libraries/advisory_rules.txt
M libraries/core.lib.php
M libraries/operations.lib.php
M libraries/select_lang.lib.php
M libraries/sql.lib.php
M libraries/sqlparser.lib.php
M libraries/sysinfo.lib.php
M po/gl.po
A po/vls.po
M sql.php
M tbl_row_action.php
M tbl_select.php
M tbl_structure.php
M test/classes/PMA_TableSearch_test.php
M test/classes/PMA_Table_test.php
A test/libraries/PMA_SQL_parse_analyze_test.php
A test/libraries/PMA_display_export_test.php
A test/libraries/PMA_relation_cleanup_test.php
M test/libraries/PMA_relation_test.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into
server_refactor2
Commit: 5a4749f4e860780932fedc50e11295eecc8a53ba
https://github.com/phpmyadmin/phpmyadmin/commit/5a4749f4e860780932fedc50e11295eecc8a53ba
Author: xmujay <xmu...@gmail.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M js/display_import_no_plugin.js
M libraries/display_import.lib.php
Log Message:
-----------
fix the js error
Commit: 3f7526499ef660c99724ad228a3993fdc56b59c1
https://github.com/phpmyadmin/phpmyadmin/commit/3f7526499ef660c99724ad228a3993fdc56b59c1
Author: xmujay <xmu...@gmail.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M libraries/display_import.lib.php
Log Message:
-----------
js is not load correctly
Commit: cb7ad6bf3a7bd8fcb1442da6758fe3ff0b38db79
https://github.com/phpmyadmin/phpmyadmin/commit/cb7ad6bf3a7bd8fcb1442da6758fe3ff0b38db79
Author: xmujay <xmu...@gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M libraries/display_import.lib.php
M libraries/import.lib.php
Log Message:
-----------
fix the undefined error: $sql_data['valid_queries']
Commit: b49988b4b19ffccbc6e98126500cd7f62d0d9ec4
https://github.com/phpmyadmin/phpmyadmin/commit/b49988b4b19ffccbc6e98126500cd7f62d0d9ec4
Author: xmujay <xmu...@gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M db_import.php
M libraries/display_export.lib.php
A libraries/display_import.inc.php
M libraries/display_import.lib.php
M server_import.php
M tbl_import.php
Log Message:
-----------
1. rename display_import.lib.php to display_import.inc.php
2. split long code to functions
3. move function to display_import.lib.php
4. fix the included file: table, database, server
Commit: 3901ef3b64e8dc74221416e9d4f83fa3093f6767
https://github.com/phpmyadmin/phpmyadmin/commit/3901ef3b64e8dc74221416e9d4f83fa3093f6767
Author: xmujay <xmu...@gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M libraries/display_import.lib.php
Log Message:
-----------
fix the code style of display_import.lib.php
Commit: a2d5e961c70eda16048edd973d7e180931eeb307
https://github.com/phpmyadmin/phpmyadmin/commit/a2d5e961c70eda16048edd973d7e180931eeb307
Author: xmujay <xmu...@gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M libraries/display_import.inc.php
M libraries/display_import.lib.php
Log Message:
-----------
fix SESSION_KEY
Commit: 6fd638cfcc4b4fa588242bab5cd2728283c7d032
https://github.com/phpmyadmin/phpmyadmin/commit/6fd638cfcc4b4fa588242bab5cd2728283c7d032
Author: xmujay <xmu...@gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M libraries/display_import.inc.php
M libraries/display_import.lib.php
Log Message:
-----------
add "\n", so that the js won't be commented out
Commit: ede195c42bca4b39d4bbf35015663c192c0377e6
https://github.com/phpmyadmin/phpmyadmin/commit/ede195c42bca4b39d4bbf35015663c192c0377e6
Author: xmujay <xmu...@gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M ChangeLog
M libraries/DisplayResults.class.php
M libraries/Util.class.php
M libraries/relation.lib.php
M libraries/sql.lib.php
M pmd_display_field.php
M po/hr.po
M themes/.gitignore
Log Message:
-----------
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into
server_refactor2
Commit: a1c024737999da85231d86c63ed4b73cf81ef813
https://github.com/phpmyadmin/phpmyadmin/commit/a1c024737999da85231d86c63ed4b73cf81ef813
Author: xmujay <xmu...@gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M libraries/display_import.lib.php
Log Message:
-----------
1. fix table name after import table
2. using jquery getScript to load js file
Commit: 61dce79644a8a0082e76a272cd45f2f5e698f40c
https://github.com/phpmyadmin/phpmyadmin/commit/61dce79644a8a0082e76a272cd45f2f5e698f40c
Author: xmujay <xmu...@gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
R js/display_import_no_plugin.js
M libraries/display_import.lib.php
Log Message:
-----------
render javascript on display_import.lib.php or the out variable can't be used
Commit: 2660fb048166b42381d4f0b6ae627f8f1a987740
https://github.com/phpmyadmin/phpmyadmin/commit/2660fb048166b42381d4f0b6ae627f8f1a987740
Author: xmujay <xmu...@gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M libraries/display_import.lib.php
Log Message:
-----------
add comments to js
Commit: 36cef3b76d3cf6c92d437b961934a07420b27637
https://github.com/phpmyadmin/phpmyadmin/commit/36cef3b76d3cf6c92d437b961934a07420b27637
Author: xmujay <xmu...@gmail.com>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M ChangeLog
M browse_foreigners.php
M config.sample.inc.php
M doc/config.rst
M examples/config.manyhosts.inc.php
M examples/create_tables.sql
M examples/create_tables_drizzle.sql
M import.php
M js/messages.php
M js/navigation.js
R libraries/.htaccess
M libraries/Config.class.php
M libraries/DisplayResults.class.php
M libraries/Error.class.php
M libraries/Error_Handler.class.php
M libraries/List_Database.class.php
M libraries/PMA.php
M libraries/RecentTable.class.php
A libraries/String.class.php
A libraries/StringAbstractType.class.php
A libraries/StringByte.int.php
M libraries/StringCType.class.php
M libraries/StringMB.class.php
M libraries/StringNative.class.php
M libraries/StringNativeType.class.php
A libraries/StringType.int.php
M libraries/Util.class.php
M libraries/bookmark.lib.php
M libraries/common.inc.php
M libraries/config.default.php
M libraries/config.values.php
M libraries/config/Validator.class.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/engines/bdb.lib.php
M libraries/engines/berkeleydb.lib.php
M libraries/engines/binlog.lib.php
M libraries/engines/innobase.lib.php
M libraries/engines/innodb.lib.php
M libraries/engines/memory.lib.php
M libraries/engines/merge.lib.php
M libraries/engines/mrg_myisam.lib.php
M libraries/engines/myisam.lib.php
M libraries/engines/ndbcluster.lib.php
M libraries/engines/pbxt.lib.php
M libraries/navigation/Navigation.class.php
M libraries/navigation/NavigationHeader.class.php
M libraries/navigation/NavigationTree.class.php
M libraries/navigation/Nodes/Node.class.php
M libraries/navigation/Nodes/Node_Database.class.php
M libraries/navigation/Nodes/Node_Event.class.php
M libraries/navigation/Nodes/Node_Function.class.php
M libraries/navigation/Nodes/Node_Procedure.class.php
M libraries/navigation/Nodes/Node_Table.class.php
M libraries/navigation/Nodes/Node_View.class.php
M libraries/operations.lib.php
M libraries/plugins/auth/swekey/swekey.auth.lib.php
M
libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
M
libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php
M libraries/pmd_common.php
M libraries/relation.lib.php
M libraries/schema/Export_Relation_Schema.class.php
M libraries/schema/Pdf_Relation_Schema.class.php
M libraries/server_bin_log.lib.php
M libraries/server_status.lib.php
M libraries/sql.lib.php
M libraries/sqlparser.lib.php
A libraries/string.inc.php
R libraries/string.lib.php
M navigation.php
M pmd_pdf.php
M schema_export.php
M server_status.php
R setup/frames/.htaccess
R setup/lib/.htaccess
A test/classes/dbi/DBIMysql_test.php
A test/classes/dbi/DBIMysqli_test.php
M test/classes/plugin/import/ImportOds_test.php
M test/classes/plugin/transformations/Image_JPEG_Inline_test.php
M test/classes/plugin/transformations/Image_Link_test.php
M test/classes/plugin/transformations/Image_PNG_Inline_test.php
M test/classes/plugin/transformations/Text_Plain_Dateformat_test.php
M test/classes/plugin/transformations/Text_Plain_Download_test.php
M test/classes/plugin/transformations/Text_Plain_External_test.php
M test/classes/plugin/transformations/Text_Plain_Formatted_test.php
M test/classes/plugin/transformations/Text_Plain_Hex_test.php
M test/classes/plugin/transformations/Text_Plain_Imagelink_test.php
M test/classes/plugin/transformations/Text_Plain_Link_test.php
A test/classes/schema/User_Schema_test.php
R test/libraries/PMA_STR_sub_test.php
M test/libraries/PMA_StringCType_test.php
M test/libraries/PMA_StringMB_test.php
M test/libraries/PMA_StringNativeType_test.php
M test/libraries/PMA_StringNative_test.php
M test/libraries/PMA_relation_cleanup_test.php
M test/libraries/PMA_string_test.php
M themes/original/css/navigation.css.php
A themes/original/img/b_undo.png
M themes/original/img/sprites.png
M themes/original/sprites.lib.php
M themes/pmahomme/css/navigation.css.php
A themes/pmahomme/img/b_undo.png
M themes/pmahomme/img/sprites.png
M themes/pmahomme/sprites.lib.php
Log Message:
-----------
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into
server_refactor2
Commit: 96c1546b3df13b741ef37372d707bf557b120312
https://github.com/phpmyadmin/phpmyadmin/commit/96c1546b3df13b741ef37372d707bf557b120312
Author: xmujay <xmu...@gmail.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M libraries/display_import.lib.php
Log Message:
-----------
refresh navigation panel when upload finished
Commit: c406a0c1909d41569845879b652338cb06a2af30
https://github.com/phpmyadmin/phpmyadmin/commit/c406a0c1909d41569845879b652338cb06a2af30
Author: xmujay <xmu...@gmail.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M build.xml
M doc/config.rst
M import.php
A js/cross_framing_protection.js
M js/functions.js
M libraries/Header.class.php
M libraries/Scripts.class.php
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/import.lib.php
M libraries/server_privileges.lib.php
M libraries/string.inc.php
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/b...@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/ia.po
M po/id.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kk.po
M po/kn.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/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/s...@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/u...@latin.po
M po/vls.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into
server_refactor2
Commit: 776ba8c0f8abbcd61e2fea5598b4d85b04d43cdc
https://github.com/phpmyadmin/phpmyadmin/commit/776ba8c0f8abbcd61e2fea5598b4d85b04d43cdc
Author: xmujay <xmu...@gmail.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M libraries/display_import.lib.php
Log Message:
-----------
fix code style
Commit: 36a22d282b2c9f3bdc66b4ec48b47fd78b578b99
https://github.com/phpmyadmin/phpmyadmin/commit/36a22d282b2c9f3bdc66b4ec48b47fd78b578b99
Author: Marc Delisle <m...@infomarc.info>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M db_import.php
M libraries/display_export.lib.php
A libraries/display_import.inc.php
M libraries/display_import.lib.php
M libraries/import.lib.php
M server_import.php
M tbl_import.php
Log Message:
-----------
Merge pull request #542 from xmujay/server_refactor2
refactor server_import and related files
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/30c1ed99cb0b...36a22d282b2c
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
