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

更新到源最新 #715

Closed
wants to merge 15 commits into from
Closed

更新到源最新 #715

wants to merge 15 commits into from

Commits on May 17, 2016

  1. Merge pull request #1 from airbnb/master 

    update from master
    @bnpysse
    bnpysse committed May 17, 2016
    Configuration menu
    Copy the full SHA
    58ad2e2 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2016

  1. Merge remote-tracking branch 'airbnb/master' 

    # 请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支
# 合并到主题分支。
#
# 以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。
    @bnpysse
    bnpysse committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    de2d91b View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2016

  1. 添加部分翻译内容

    @bnpysse
    bnpysse committed Jun 11, 2016
    Configuration menu
    Copy the full SHA
    298a6ce View commit details
    Browse the repository at this point in the history

  2. 合并源代码

    @bnpysse
    bnpysse committed Jun 11, 2016
    Configuration menu
    Copy the full SHA
    563a826 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2016

  1. merged upstream

    @bnpysse
    bnpysse committed Jun 13, 2016
    Configuration menu
    Copy the full SHA
    f91133e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master'

    @bnpysse
    bnpysse committed Jun 13, 2016
    Configuration menu
    Copy the full SHA
    094e715 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2016

  1. change blank lines of views.py

    @bnpysse
    bnpysse committed Jun 14, 2016
    Configuration menu
    Copy the full SHA
    8b92c99 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master'

    @bnpysse
    bnpysse committed Jun 14, 2016
    Configuration menu
    Copy the full SHA
    1db3062 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2016

  1. Merge remote-tracking branch 'upstream/master' 

    merge to 0.9.1
    @bnpysse
    bnpysse committed Jun 16, 2016
    Configuration menu
    Copy the full SHA
    ba15fa5 View commit details
    Browse the repository at this point in the history

  2. 更新到0.9.1

    @bnpysse
    bnpysse committed Jun 16, 2016
    Configuration menu
    Copy the full SHA
    f169691 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2016

  1. Merge remote-tracking branch 'upstream/master' 

    # Conflicts:
#	babel/messages.pot
#	caravel/assets/visualizations/nvd3_vis.js
#	caravel/translations/es/LC_MESSAGES/messages.po
#	caravel/translations/fr/LC_MESSAGES/messages.po
#	caravel/translations/it/LC_MESSAGES/messages.po
    @bnpysse
    bnpysse committed Jun 21, 2016
    Configuration menu
    Copy the full SHA
    72cf023 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master'

    @bnpysse
    bnpysse committed Jun 21, 2016
    Configuration menu
    Copy the full SHA
    b57b311 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2016

  1. Merge remote-tracking branch 'upstream/master'

    @bnpysse
    bnpysse committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    b69f034 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2016

  1. Merge remote-tracking branch 'upstream/master'

    @bnpysse
    bnpysse committed Jun 26, 2016
    Configuration menu
    Copy the full SHA
    0789f2b View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2016

  1. 合并源仓库代码

    @bnpysse
    bnpysse committed Jul 3, 2016
    Configuration menu
    Copy the full SHA
    fead489 View commit details
    Browse the repository at this point in the history