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: 601451a3f159
Choose a base ref
...
head repository: OctoPrint/OctoPrint
compare: c6b4eee437ce
Choose a head ref
  • 7 commits
  • 8 files changed
  • 1 contributor

Commits on Feb 4, 2019

  1. 📝 Fix a formatting issue 

    No events are about to be removed in 1.4.0, only the payload fields
marked as deprecated. And for some reason ReST doesn't appear to allow
including that piece of information within the `deprecated` directive,
so now we have a slightly different way of expressing it...
    @foosel
    foosel committed Feb 4, 2019
    Copy the full SHA
    cc0b63c View commit details
    Browse the repository at this point in the history

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

    @foosel
    foosel committed Feb 4, 2019
    Copy the full SHA
    61431c0 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2019

  1. Merge branch 'master' into maintenance

    @foosel
    foosel committed Feb 8, 2019
    Copy the full SHA
    697af69 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2019

  1. 💬 discourse.octoprint.org => community.octoprint.org

    @foosel
    foosel committed Feb 11, 2019
    Copy the full SHA
    b744c34 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into maintenance

    @foosel
    foosel committed Feb 11, 2019
    Copy the full SHA
    de6da3f View commit details
    Browse the repository at this point in the history

  3. 🐛 paused action must not trigger *any* local processing 

    That includes sending M400 and M114 to capture the pause position.

See MarlinFirmware/Marlin#13039
    @foosel
    foosel committed Feb 11, 2019
    Copy the full SHA
    e67f72c View commit details
    Browse the repository at this point in the history

  4. 🐛 treat pausing as paused for resume handling 

    See MarlinFirmware/Marlin#13039 and #2955
    @foosel
    foosel committed Feb 11, 2019
    Copy the full SHA
    c6b4eee View commit details
    Browse the repository at this point in the history