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

59 commits

Author SHA1 Message Date
Gina Häußge
98ac877033 Merge branch 'master' into devel 
Conflicts:
	CHANGELOG.md
 2015-01-19 16:48:51 +01:00
Gina Häußge
5f835edf2e Changelog entries for #706 and #719 2015-01-19 16:48:03 +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
67a884fc9d Added a lot of changelog entries 2015-01-19 13:18:43 +01:00
Gina Häußge
6e315cff76 Changelog entry for #724 2015-01-19 12:37:31 +01:00
Gina Häußge
b28f511b92 Small addendum and changelog entry for #717 2015-01-16 21:49:01 +01:00
Gina Häußge
9452ba4c24 Fixed heated bed temperature setting during slicing with Cura 2015-01-16 19:58:46 +01:00
Gina Häußge
6880184cbb Increased default communication and connection timeouts 2015-01-13 11:09:42 +01:00
Gina Häußge
84122f9f54 Fixed changelog entry for last commit, was added to wrong section 2015-01-13 11:09:41 +01:00
Gina Häußge
c52d201808 Fix error where API state is requested and printer is offline 
(cherry picked from commit 619fe9a)
 2015-01-13 11:09:41 +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
Gina Häußge
4e4ad0be8b Fixed file sending to SD card 
Closes #709
 2015-01-12 16:00:37 +01:00
Gina Häußge
f238ef40ec Better error validation for printer profiles 
Data types loaded from disk were not properly ensured to match expected types and input validation also had deficits.

Should fix #714
 2015-01-12 15:07:14 +01:00
Gina Häußge
76f7a40b7f Added changelog entry for PR #610 2015-01-12 09:59:51 +01:00
Gina Häußge
749af60796 Merge branch 'master' into devel 
Conflicts:
	src/octoprint/server/util.py
	src/octoprint/settings.py
	src/octoprint/templates/index.jinja2
 2014-12-30 10:49:03 +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
eb2561175d Merge branch 'master' into devel 
Conflicts:
	setup.py
	src/octoprint/timelapse.py
 2014-12-28 00:18:49 +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
363b23d6e3 Better handling of errors while sending to (disconnected) clients on the websocket 2014-12-21 15:47:24 +01:00
Gina Häußge
52ad02a08a Updated the changelog with a lot of stuff that gone done the past weeks 2014-12-21 15:32:30 +01:00
Gina Häußge
f2562500a3 Print time estimation is now not displayed until it becomes somewhat stable 2014-12-12 23:38:57 +01:00
Gina Häußge
8dbde90a93 Merge branch 'master' into devel 2014-12-09 22:25:19 +01:00
Gina Häußge
d2910de121 Added entry to change log 2014-12-09 22:24:53 +01:00
Gina Häußge
9d66aea843 Documentation and changelog entries updated 2014-11-17 13:49:46 +01:00
Gina Häußge
5ec02e2f18 And some more changelog entries (some day I might actually catch up...) 2014-11-08 15:29:49 +01:00
Gina Häußge
9709b97adf GCODE viewer now doesn't stumble over completely extrusionless GCODE files 2014-11-08 15:27:03 +01:00
Gina Häußge
3be039b1a9 Added a couple of changelog entries for previous commits 2014-11-08 15:23:57 +01:00
Gina Häußge
e5299d96ad Added changelog entry for qr code 2014-11-08 15:15:49 +01:00
Gina Häußge
eacfcab187 Merge branch 'master' into devel 
Conflicts:
	CHANGELOG.md
 2014-11-04 10:43:11 +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
Gina Häußge
ff96e2e4d6 Also interpret lines starting with "!!" as errors from the firmware 
(see http://reprap.org/wiki/G-code#Replies_from_the_RepRap_machine_to_the_host_computer)
 2014-11-03 21:40:21 +01:00
Gina Häußge
ca6364e5d4 Correctly interpret Smoothieware temperature data for multiple extruders 
Fixes #633
 2014-10-31 14:08:52 +01:00
Gina Häußge
644329c0b8 Preparing release of 1.1.1 2014-10-27 09:48:54 +01:00
Gina Häußge
ff97fba0f0 Merge branch 'master' into devel 
Conflicts:
	src/octoprint/server/api/__init__.py
 2014-10-27 09:39:14 +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
a185685f0c Merge branch 'master' into devel 
Conflicts:
	src/octoprint/server/__init__.py
	src/octoprint/settings.py
 2014-10-23 16:21:39 +02: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
9a7733c9a3 Make "Slicing done" notification green 
Implements #558
 2014-10-22 09:45:42 +02:00
Gina Häußge
0ab5369635 Added changelog entry for bugfix 2014-10-21 18:47:56 +02:00
Gina Häußge
1acbbbaf6c Merge branch 'master' into devel 2014-10-16 23:51:00 +02:00
Gina Häußge
8864884c67 Forgot changelog entry again 2014-10-16 23:50:38 +02:00
Gina Häußge
cd973adedf Improved slicing and file management 
- File management is prepared to support folders (UI still lacking support)
- STL files are now first class citizens
  - can be managed via the file list (and filtered from it)
  - can be sliced on demand
- Slicing now happens via plugins
- Added Cura plugin
  - uses CuraEngine directly instead of full Cura installation
  - Cura profile importer for importing profiles from regular Cura installs via settings dialog
  - TODO: UI for editing profiles
- API for slicing and slicing profile management
 2014-10-06 17:34:07 +02:00
Gina Häußge
af94b770f9 Merge branch 'master' into devel 2014-10-01 15:57:04 +02:00
Gina Häußge
62a51bb061 Added changelog entry 2014-10-01 15:55:57 +02:00
Gina Häußge
7336ed6eff Merge branch 'master' into devel 
Conflicts:
	src/octoprint/settings.py
 2014-10-01 14:36:02 +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