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: OctoPrint/OctoPrint
base: 4469a2d84ad4
Choose a base ref
...
head repository: OctoPrint/OctoPrint
compare: f2b2496e58bb
Choose a head ref
  • 13 commits
  • 13 files changed
  • 2 contributors

Commits on Nov 26, 2019

  1. 🐛 Let functools.wraps do its job 

    Closes #3348
    @foosel
    foosel committed Nov 26, 2019
    Copy the full SHA
    1deb247 View commit details
    Browse the repository at this point in the history

  2. 🐛 Don't try to write None values into upload body 

    Closes #3349
    @foosel
    foosel committed Nov 26, 2019
    Copy the full SHA
    471dab9 View commit details
    Browse the repository at this point in the history

  3. 💚 Fix unit tests by fixing mocked functions 

    Closes #3348
    @foosel
    foosel committed Nov 26, 2019
    Copy the full SHA
    2801da5 View commit details
    Browse the repository at this point in the history

  4. 🐛 appkeys: generate string api keys 

    Instead of binaries.

Closes #3350
    @foosel
    foosel committed Nov 26, 2019
    Copy the full SHA
    bbefeee View commit details
    Browse the repository at this point in the history

  5. 🐛 appkeys: Fix a deprecation warning

    @foosel
    foosel committed Nov 26, 2019
    Copy the full SHA
    038e1b9 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2019

  1. 🐛 timelapse: fix accessed event payload field 

    Closes #3354
    @foosel
    foosel committed Nov 28, 2019
    Copy the full SHA
    59e3966 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2019

  1. 🐛 Fix autologin 

    Closes #3357
    @foosel
    foosel committed Nov 29, 2019
    Copy the full SHA
    00d0396 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2019

  1. 🐛 Don't logout always-logged-in AdminUser 

    If ACL is disabled it doesn't make sense to log it out and it's causing
issues further down the line due to different handling.

Fixes #3361
    @foosel
    foosel committed Dec 2, 2019
    Copy the full SHA
    80e8e33 View commit details
    Browse the repository at this point in the history

  2. 🐛 Fix wrong escape 

    Closes #3362
    @foosel
    foosel committed Dec 2, 2019
    Copy the full SHA
    f72b9db View commit details
    Browse the repository at this point in the history

  3. 🐛 Only proceed if children is set AND truthy 

    Closes #3363
    @foosel
    foosel committed Dec 2, 2019
    Copy the full SHA
    4f25ed5 View commit details
    Browse the repository at this point in the history

  4. 🐛 Make sure data is set 

    Closes #3364
    @foosel
    foosel committed Dec 2, 2019
    Copy the full SHA
    e235fc2 View commit details
    Browse the repository at this point in the history

  5. 🔖 Preparing release of 1.4.0rc2

    @foosel
    foosel committed Dec 2, 2019
    Copy the full SHA
    e603b98 View commit details
    Browse the repository at this point in the history

  6. 🔖 staging/devel is now 1.4.0rc3.dev

    @foosel
    foosel committed Dec 2, 2019
    Copy the full SHA
    f2b2496 View commit details
    Browse the repository at this point in the history