Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor server_import and related files #542

Merged
merged 20 commits into from Jul 29, 2013
Merged

refactor server_import and related files #542

merged 20 commits into from Jul 29, 2013

Commits on Jul 21, 2013

  1. Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin int… 

    …o server_refactor2
    @xmujay
    xmujay committed Jul 21, 2013
    Copy the full SHA
    417c51c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin int… 

    …o server_refactor2
    @xmujay
    xmujay committed Jul 21, 2013
    Copy the full SHA
    751caca View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2013

  1. refactor display_import.lib.php 

    1. render html at once
2. split js code
    @xmujay
    xmujay committed Jul 24, 2013
    Copy the full SHA
    53a0d5a View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2013

  1. refactor the js

    @xmujay
    xmujay committed Jul 25, 2013
    Copy the full SHA
    7cbc80d View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2013

  1. Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin int… 

    …o server_refactor2
    @xmujay
    xmujay committed Jul 26, 2013
    Copy the full SHA
    e8fc1ad View commit details
    Browse the repository at this point in the history

  2. fix the js error

    @xmujay
    xmujay committed Jul 26, 2013
    Copy the full SHA
    5a4749f View commit details
    Browse the repository at this point in the history

  3. js is not load correctly

    @xmujay
    xmujay committed Jul 26, 2013
    Copy the full SHA
    3f75264 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2013

  1. fix the undefined error: $sql_data['valid_queries']

    @xmujay
    xmujay committed Jul 27, 2013
    Copy the full SHA
    cb7ad6b View commit details
    Browse the repository at this point in the history

  2. 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
    @xmujay
    xmujay committed Jul 27, 2013
    Copy the full SHA
    b49988b View commit details
    Browse the repository at this point in the history

  3. fix the code style of display_import.lib.php

    @xmujay
    xmujay committed Jul 27, 2013
    Copy the full SHA
    3901ef3 View commit details
    Browse the repository at this point in the history

  4. fix SESSION_KEY

    @xmujay
    xmujay committed Jul 27, 2013
    Copy the full SHA
    a2d5e96 View commit details
    Browse the repository at this point in the history

  5. add "\n", so that the js won't be commented out

    @xmujay
    xmujay committed Jul 27, 2013
    Copy the full SHA
    6fd638c View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin int… 

    …o server_refactor2
    @xmujay
    xmujay committed Jul 27, 2013
    Copy the full SHA
    ede195c View commit details
    Browse the repository at this point in the history

  7. 1. fix table name after import table 

    2. using jquery getScript to load js file
    @xmujay
    xmujay committed Jul 27, 2013
    Copy the full SHA
    a1c0247 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2013

  1. render javascript on display_import.lib.php or the out variable can't… 

    … be used
    @xmujay
    xmujay committed Jul 28, 2013
    Copy the full SHA
    61dce79 View commit details
    Browse the repository at this point in the history

  2. add comments to js

    @xmujay
    xmujay committed Jul 28, 2013
    Copy the full SHA
    2660fb0 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2013

  1. Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin int… 

    …o server_refactor2
    @xmujay
    xmujay committed Jul 29, 2013
    Copy the full SHA
    36cef3b View commit details
    Browse the repository at this point in the history

  2. refresh navigation panel when upload finished

    @xmujay
    xmujay committed Jul 29, 2013
    Copy the full SHA
    96c1546 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin int… 

    …o server_refactor2
    @xmujay
    xmujay committed Jul 29, 2013
    Copy the full SHA
    c406a0c View commit details
    Browse the repository at this point in the history

  4. fix code style

    @xmujay
    xmujay committed Jul 29, 2013
    Copy the full SHA
    776ba8c View commit details
    Browse the repository at this point in the history