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

ms #14

Open
wants to merge 21 commits into
base: dev
Choose a base branch
from
Open

ms #14

wants to merge 21 commits into from

Commits on Apr 6, 2016

  1. Merge pull request #11 from Uoor/dev 

    Dev
    @whatyouknow123
    whatyouknow123 committed Apr 6, 2016
    Configuration menu
    Copy the full SHA
    674db65 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2016

  1. Merge pull request #12 from Uoor/dev 

    Dev
    @whatyouknow123
    whatyouknow123 committed Apr 8, 2016
    Configuration menu
    Copy the full SHA
    d6e69cd View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2016

  1. Merge pull request Uoor#51 from Uoor/dev 

    password
    @Uoor
    Uoor committed Apr 18, 2016
    Configuration menu
    Copy the full SHA
    3d473f3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #12 from MDClub/dev 

    Dev
    @Uoor
    Uoor committed Apr 18, 2016
    Configuration menu
    Copy the full SHA
    00ba3f9 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2016

  1. Merge pull request #13 from Uoor/dev 

    Dev
    @whatyouknow123
    whatyouknow123 committed Apr 19, 2016
    Configuration menu
    Copy the full SHA
    721550f View commit details
    Browse the repository at this point in the history

  2. 修改了订房页面的bug和其他显示的一些小bug

    @whatyouknow123
    whatyouknow123 committed Apr 19, 2016
    Configuration menu
    Copy the full SHA
    c46e461 View commit details
    Browse the repository at this point in the history

  3. Merge pull request Uoor#52 from whatyouknow123/dev 

    修改订房页面的bug和其他页面显示的bug
    @whatyouknow123
    whatyouknow123 committed Apr 19, 2016
    Configuration menu
    Copy the full SHA
    a0b91b9 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2016

  1. 管理房间本身就是 调用class

    @Uoor
    Uoor committed Apr 21, 2016
    Configuration menu
    Copy the full SHA
    d7d5cc2 View commit details
    Browse the repository at this point in the history

  2. async jar 添加

    @Uoor
    Uoor committed Apr 21, 2016
    Configuration menu
    Copy the full SHA
    5038e8a View commit details
    Browse the repository at this point in the history

  3. aysnc jar v2

    @Uoor
    Uoor committed Apr 21, 2016
    Configuration menu
    Copy the full SHA
    721759e View commit details
    Browse the repository at this point in the history

  4. 更改选择房间bug，添加无可用房间验证

    @zstraw
    zstraw committed Apr 21, 2016
    Configuration menu
    Copy the full SHA
    e2e65e1 View commit details
    Browse the repository at this point in the history

  5. 字符乱码bug

    @Uoor
    Uoor committed Apr 21, 2016
    Configuration menu
    Copy the full SHA
    871e687 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/dev' into dev 

    # Conflicts:
#	WebRoot/WEB-INF/view/orderstep1.jsp
    @Uoor
    Uoor committed Apr 21, 2016
    Configuration menu
    Copy the full SHA
    234e7e7 View commit details
    Browse the repository at this point in the history

  7. 完善信息

    @Uoor
    Uoor committed Apr 21, 2016
    Configuration menu
    Copy the full SHA
    211608f View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2016

  1. readme

    @Uoor
    Uoor committed Apr 22, 2016
    Configuration menu
    Copy the full SHA
    4bb1fad View commit details
    Browse the repository at this point in the history

  2. 添加是否重复订房验证

    @zstraw
    zstraw committed Apr 22, 2016
    Configuration menu
    Copy the full SHA
    617cad5 View commit details
    Browse the repository at this point in the history

  3. Merge pull request Uoor#53 from Uoor/dev 

    Dev
    @Uoor
    Uoor committed Apr 22, 2016
    Configuration menu
    Copy the full SHA
    77f3dd4 View commit details
    Browse the repository at this point in the history

  4. Merge pull request Uoor#54 from Uoor/dev 

    Dev
    @Uoor
    Uoor committed Apr 22, 2016
    Configuration menu
    Copy the full SHA
    0bce52a View commit details
    Browse the repository at this point in the history

  5. Merge pull request #13 from Uoor/master 

    dev
    @Uoor
    Uoor committed Apr 22, 2016
    Configuration menu
    Copy the full SHA
    34aa6c3 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2016

  1. game over

    @Uoor
    Uoor committed Apr 24, 2016
    Configuration menu
    Copy the full SHA
    8114d5f View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2016

  1. Merge pull request #15 from Uoor/dev 

    game over
    @Uoor
    Uoor committed Apr 25, 2016
    Configuration menu
    Copy the full SHA
    eb1568d View commit details
    Browse the repository at this point in the history