/OctoPi

Permalink
Commits on Dec 1, 2016

  1. Merge pull request #279 from guillaumemolter/patch-1 

    Adding note for MacOS users using Textedit
    committed on GitHub Dec 1, 2016
    e12ae01
Commits on Nov 30, 2016
  1. @guillaumemolter

    Adding note for MacOS users using Textedit 

    Related to #222
    guillaumemolter committed on GitHub Nov 30, 2016
    3125bcc
Commits on Nov 28, 2016

  1. Track python errors

    committed Nov 28, 2016
    02341c0
Commits on Nov 21, 2016

  1. Workaround pip 9.0.0 that breaks install of pyasn1 fixes #276

    committed Nov 21, 2016
    dc66324
Commits on Oct 23, 2016

  1. Merge branch 'devel' of https://github.com/guysoft/OctoPi into vagran… 

    …t_update
    committed Oct 23, 2016
    1b50010

  2. Merge pull request #265 from make-ing/devel 

    changed vagrant box to "wzurowski/vivid64". Update your vms!
    committed on GitHub Oct 23, 2016
    19cd632
Commits on Oct 22, 2016

  1. Merge branch 'devel' of https://github.com/make-ing/OctoPi into vagra… 

    …nt_update
    committed Oct 22, 2016
    1775eae
Commits on Oct 5, 2016
  1. @make-ing

    changed vagrant box to "wzurowski/vivid64" which has the guest additi… 

    …ons installed.
    make-ing committed Oct 5, 2016
    4facdad
Commits on Sep 30, 2016

  1. Merge branch 'devel' of https://github.com/guysoft/OctoPi into armbian

    committed Sep 30, 2016
    323c023

  2. Merge pull request #262 from make-ing/devel 

    fixed pybonjour download link
    committed on GitHub Sep 30, 2016
    9342377
  3. @make-ing

    fixed pybonjour download link

    make-ing committed Sep 30, 2016
    15a867b
Commits on Aug 25, 2016

  1. Merge branch 'devel' of https://github.com/guysoft/OctoPi into armbian

    committed Aug 25, 2016
    bfd4686
Commits on Aug 18, 2016

  1. Shift gnet.homelinux.com to gnethomelinux.com, bye bye DynDNS and the… 

    …ir crazy pricing
    committed Aug 18, 2016
    944714e
Commits on Aug 16, 2016

  1. Merge branch 'devel' of https://github.com/guysoft/OctoPi into armbian

    committed Aug 16, 2016
    abc4ce6
  2. @foosel

    Merge pull request #256 from Nurgak/patch-1 

    Corrected the IP address in the network settings instructions
    foosel committed on GitHub Aug 16, 2016
    9a5f03b
  3. @Nurgak

    Corrected the IP address 

    It might lend to confusion when the static IP address is set to 192.168.250.10 and then suggested that the system can be reached from 192.168.250.1, this is obviously a typo.
    Nurgak committed on GitHub Aug 16, 2016
    47c94a1
Commits on Aug 15, 2016

  1. Merge branch 'devel' of https://github.com/guysoft/OctoPi into armbian

    committed Aug 15, 2016
    90be41a
  2. @kennethjiang @foosel

    Allow configuring multiple wifi networks using wpa_supplicant (#250) 

    * use wpa_supplicant to configure wifi

* filename change octopi-network.txt -> octopi-ethernet.txt since it only configures ethernet now

* better format

* revert 22ec5ac 13e3fc1 ff3f351

* Only add /boot/octopi-wifi.txt, symlinked to /etc/wpa_supplicant/wpa_supplicant.conf, without breaking existing /boot/octopi-network.txt mechanism

* clear documentation for distinctions between octopi-network.txt and octopi-wifi.txt

* Change name /boot/octopi-wifi.txt -> /boot/octopi-wpa-supplicant.txt to avoid confusion
    kennethjiang committed with foosel Aug 15, 2016
    326bbdf
Commits on Jul 23, 2016

  1. Merge branch 'devel' of https://github.com/guysoft/OctoPi into armbian

    committed Jul 23, 2016
    958c1ba

  2. Fix syntax typo in last commit

    committed on GitHub Jul 23, 2016
    1954b8d

  3. Adding instruction how to build a variant from vagrant

    committed on GitHub Jul 23, 2016
    9686bc6

  4. Merge pull request #251 from foosel/fix/haproxy503 

    Better "service not running" error pages
    committed on GitHub Jul 23, 2016
    ca59d7d
  5. @foosel

    Better "service not running" error pages 

      * Better wording on existing "OctoPrint server not running" error page
  * New error page for "Webcam server not running"
  * configuration change in haproxy to show octoprint one only for
    503 in OctoPrint backend and webcam one only for 503 in webcam
    backend
    foosel committed Jul 23, 2016
    d5dd59e
Commits on Jul 15, 2016

  1. Merge branch 'devel' of https://github.com/guysoft/OctoPi into armbian

    committed Jul 15, 2016
    e973129

  2. Merge pull request #248 from foosel/doNotEditWebcamd 

    Added note to webcamd to use octopi.txt for config
    committed on GitHub Jul 15, 2016
    2fa71c6
  3. @foosel

    Added note to webcamd to use octopi.txt for config

    foosel committed Jul 15, 2016
    0d3072b
Commits on Jul 4, 2016

  1. Merge branch 'devel' of https://github.com/guysoft/OctoPi into armbian

    committed Jul 4, 2016
    67658b5

  2. Merge branch 'devel' of https://github.com/guysoft/OctoPi into devel

    committed Jul 4, 2016
    346640f
Commits on Jun 25, 2016

  1. Merge branch 'devel' of https://github.com/guysoft/OctoPi into armbian

    committed Jun 25, 2016
    2576d44

  2. Merge pull request #236 from alan707/patch-1 

    added git to the list of requirements
    committed on GitHub Jun 25, 2016
    f44a048
  3. @alan707

    added git to the list of requirements 

    included git to apt-get install list
    alan707 committed on GitHub Jun 25, 2016
    513f369
Commits on Jun 20, 2016

  1. Merge branch 'devel' of https://github.com/guysoft/OctoPi into armbian

    committed Jun 20, 2016
    9c639b4

  2. Merge pull request #235 from dcousens/patch-1 

    README: s/verious/various
    committed on GitHub Jun 20, 2016
    7623193
  3. @dcousens

    README: s/verious/various

    dcousens committed on GitHub Jun 20, 2016
    5b77f34
Commits on Jun 3, 2016

  1. Add armbian support, make OctoPi scripts support custom number for ro… 

    …ot partition
    committed Jun 3, 2016
    11f1435