pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1675 commits 20 branches 22 tags 141 MiB
Commit graph

1675 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
83790fcd64 Do not truncate error reported from printer in UI 
Closes #706
 2015-01-19 16:42:09 +01:00
Gina Häußge
6dd2dcee16 GCODE viewer: Even better version of initial bed centering, backported from c858c8f75b 
See #719
 2015-01-19 16:34:40 +01:00
Gina Häußge
a91a354fa9 Fixed a bug causing the GCODE viewer to be zoomed in outside of the print bed due to missing initial move 
Possible fix for #719
 2015-01-19 16:26:52 +01:00
Gina Häußge
4bf3d698e3 Fixed some changelog entries and added commit history to unreleased 1.1.2 2015-01-19 15:52:20 +01:00
Gina Häußge
868dc6d7a9 Increased default communication and connection timeouts 2015-01-12 17:34:08 +01:00
Gina Häußge
1ddb187518 Fixed changelog entry for last commit, was added to wrong section 2015-01-12 17:25:02 +01:00
Gina Häußge
b7badcbf02 Fix error where API state is requested and printer is offline 
(cherry picked from commit 619fe9a)
 2015-01-12 16:55:38 +01:00
C-o-r-E
684d12e60e Fix error where API state is requested and printer is offline 
(cherry picked from commit 619fe9a)
 2015-01-12 16:53:17 +01:00
Gina Häußge
87ddcac2fc Don't user server.host but server.forwardedHost as fallback for generated external URLs 
Closes #698
 2014-12-30 10:20:50 +01:00
Gina Häußge
e3383fe4c1 Generated URLs now take X-Forwarded-Host header sent by proxies into account for included host and port 2014-12-29 20:48:33 +01:00
Gina Häußge
292856e1bd Fixed relative URL to sockjs endpoint, wasn't yet using the proper base url 2014-12-29 20:45:54 +01:00
Gina Häußge
6307b765e3 Only decrement the image counter if it is set and larger than 0 
Backported from devel
 2014-12-28 00:19:55 +01:00
Gina Häußge
a30e41f0b4 Timelapses: Do not try to use image counter if still set to None and synchronize decrementing of image counter via mutex as well 
Possible fixes for #693, the latter maybe also for #690
 2014-12-28 00:12:19 +01:00
Gina Häußge
51341f6722 Added removal of pyc files (and their parent folders if they are empty after that) to the python setup.py clean command 
(cherry picked from commit 9e014eb)
 2014-12-28 00:00:57 +01:00
Gina Häußge
fb15751703 Decrease image counter if an image could not be captured from webcam 
Should keep rendering of timelapse from breaking if only a couple of images couldn't be captured due to whatever reason. Suggested by @midopple in #344
(cherry picked from commit bf9d5ef)
 2014-12-27 23:55:23 +01:00
Gina Häußge
a0105bcb2f Better error handling for capture issues during timelapsing 
Should help debugging issue #425 and any future problems in that area.
(cherry picked from commit 1a7a468)
 2014-12-27 23:52:38 +01:00
Gina Häußge
d2910de121 Added entry to change log 2014-12-09 22:24:53 +01:00
Gina Häußge
c5be9908c5 Don't hiccup on slic3r filament_diameter comments generated for multi extruder setups 2014-12-09 22:20:55 +01:00
Gina Häußge
c35b7a66b0 Encoding has to be specified before any other line of code 2014-11-10 09:21:05 +01:00
Gina Häußge
9692b709aa Merge branch 'Wallacoloo-master' 2014-11-04 10:08:07 +01:00
Gina Häußge
5acb04c180 Fixed a couple of more missing branch fields and added Changelog entry 2014-11-04 10:07:46 +01:00
Colin Wallace
87234bda05 Fix missing branch field in DEFAULT dict 
Should fix an error raised on line 951 (SHORT_VERSION_PY % DEFAULT) during Octoprint setup when there's no version info. More info here: https://groups.google.com/forum/#!topic/deltabot/8udyUsJ1c9M
 2014-11-03 05:50:09 +00:00
Gina Häußge
644329c0b8 Preparing release of 1.1.1 2014-10-27 09:48:54 +01:00
Gina Häußge
ce67e28f96 Generate the salt used for hashing user passwords individually for each server instance 2014-10-27 09:37:39 +01:00
Gina Häußge
b4699825d6 Generate the key used for session hashing individually for each server instance 
(cherry picked from commit 118a4f7)
 2014-10-23 15:38:43 +02:00
Gina Häußge
2d76aa029a Updated contribution guidelines 
We sadly still need to be more clear that tickets need to adhere to certain standards to be manageable...
 2014-10-17 13:04:35 +02:00
Gina Häußge
8864884c67 Forgot changelog entry again 2014-10-16 23:50:38 +02:00
Gina Häußge
a332b71463 Properly initialize settings dir 
Since config.yaml gets now saved on server startup before settings basedir gets initialized by other means (e.g. first access of base folder for uploads), it was not created yet when the config.yaml was tried to be saved upon first start up, causing an error at server startup.

Closes #604
 2014-10-16 23:49:26 +02:00
Gina Häußge
62a51bb061 Added changelog entry 2014-10-01 15:55:57 +02:00
Gina Häußge
01ab61b8b1 Enable event subscriptions by default 2014-10-01 15:54:42 +02:00
Gina Häußge
d49cd209e1 Enable API by default and automatically generate API key on first server startup 2014-09-29 22:20:18 +02:00
Gina Häußge
d60ab8cd9e Update CHANGELOG.md 2014-09-24 22:55:23 +02:00
Gina Häußge
ce9c9bea6a Also allow downloading .g files via Tornado 
Regex so far only matched .gcode and .gco, files ending just in .g are expected for upload as well though, so this needed to be adjusted
 2014-09-18 09:36:33 +02:00
Gina Häußge
858d87a732 Forgot entry in changelog 2014-09-13 21:58:41 +02:00
Gina Häußge
ea28900913 Properly unset job data when instructed so by callers 
Closes #580
 2014-09-13 21:49:26 +02:00
Gina Häußge
6171c76199 Renamed RELEASE-NOTES.md to CHANGELOG.md, added note regarding new version format 2014-09-03 11:30:00 +02:00
Gina Häußge
45c1958d83 Versioneer now also returns and persists the branch from which OctoPrint was installed 
Changed version output accordingly to now display "{version} ({branch} branch)" if branch information is available (which should be the case if installation was performed from git).
(cherry picked from commit a48b5de)
 2014-09-03 10:56:39 +02:00
Gina Häußge
e51d9439c5 Modified versioneer to allow specification of manual versions based on branches 
You can now define a lookup file explicitely mapping virtual version tags to branches via regular expressions and a reference commit from which the commit distance will be calculated.

Format of the file is

  <branch-regex> <tag> <reference commit>

The file is processed from top to bottom, the first matching line wins. If <tag> or <reference commit> are left out, the lookup table does not apply to the matched branches and the regular versioneer resolution (via git describe) takes place.

Current configuration makes "master", "staging" and any branch starting with "fix/" make use the default behaviour, all other branches (so basically all development branches) are defined as "1.2.0-dev"
(cherry picked from commit 212f40c)
 2014-09-03 10:53:54 +02:00
Gina Häußge
18952c57ff Added automatic migration of old event subscription format to the new one 
(cherry picked from commit e7088ef)
 2014-08-31 22:54:16 +02:00
Gina Häußge
590d2f2661 Added docs-specific requirements.txt for the docs to build on readthedocs.org 2014-08-31 21:40:03 +02:00
Gina Häußge
9b3569be50 Added release notes for 1.1.0 and documentation of OctoPrint's events and the version resource 2014-08-31 15:17:32 +02:00
Gina Häußge
661302f698 Merge branch 'staging' 2014-08-30 10:14:18 +02:00
Gina Häußge
7a305b5a5c Changed default path to OctoPrint executable 
When installed via python setup.py install, it defaults to /usr/local/bin/octoprint, not /usr/bin/octoprint
 2014-08-30 10:09:29 +02:00
Gina Häußge
9f463707ee Merge remote-tracking branch 'origin/master' 2014-08-30 10:08:52 +02:00
Gina Häußge
e1bcbae975 Changed default path to OctoPrint executable 
When installed via python setup.py install, it defaults to /usr/local/bin/octoprint, not /usr/bin/octoprint
 2014-08-30 10:08:40 +02:00
Gina Häußge
d6959f64c3 Merge remote-tracking branch 'origin/staging' into staging 2014-08-14 16:56:53 +02:00
Aaron Bieber
c5dbc71db3 add serial types for OpenBSD 
(cherry picked from commit a439dc4)
 2014-08-14 16:55:00 +02:00
Gina Häußge
017654852d We want the year in the docs to always be current 
(cherry picked from commit f7f7d5c)
 2014-08-08 17:14:50 +02:00
Gina Häußge
9e2e616e1b Let's see if fetching the version from the octoprint module works on rtd... 
(cherry picked from commit 85fc2b2)
 2014-08-08 17:14:46 +02:00
Gina Häußge
0d5d28e4a6 Submit login form upon enter in password field, switch to password field upon enter in username field 
(cherry picked from commit ff22ab0)
 2014-08-08 17:13:53 +02:00