Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: halfcrazy/firefly
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: python-cn/firefly
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 6 files changed
  • 4 contributors

Commits on Sep 12, 2015

  1. Don't use the latest version of flask-login 

    Because it is not backward compatible and will broken flask-security
    @mozillazg
    mozillazg committed Sep 12, 2015
    Configuration menu
    Copy the full SHA
    08efd80 View commit details
    Browse the repository at this point in the history

  2. Merge pull request python-cn#114 from mozillazg/fix-test 

    Don't use the latest version of flask-login
    @dongweiming
    dongweiming committed Sep 12, 2015
    Configuration menu
    Copy the full SHA
    b7e1ec1 View commit details
    Browse the repository at this point in the history

  3. add website, github, and location info to User Model

    @killpanda
    killpanda committed Sep 12, 2015
    Configuration menu
    Copy the full SHA
    e142d4f View commit details
    Browse the repository at this point in the history

  4. add user setting form and view class

    @killpanda
    killpanda committed Sep 12, 2015
    Configuration menu
    Copy the full SHA
    d6af0e7 View commit details
    Browse the repository at this point in the history

  5. add tmp template

    @killpanda
    killpanda committed Sep 12, 2015
    Configuration menu
    Copy the full SHA
    2d094bf View commit details
    Browse the repository at this point in the history

  6. add test case for user settings

    @killpanda
    killpanda committed Sep 12, 2015
    Configuration menu
    Copy the full SHA
    4312d38 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2015

  1. Merge pull request python-cn#113 from killpanda/add-fields 

    add website, github, and location info to User Model
    @halfcrazy
    halfcrazy committed Sep 13, 2015
    Configuration menu
    Copy the full SHA
    fb8082c View commit details
    Browse the repository at this point in the history
Loading