Commit graph

80 commits

Author SHA1 Message Date
Gina Häußge
8ff0096eb6 Fix & Docs: Plugins may only have one mixin implementation
Multiple mixins are allowed of course. Allowing multiple implementations lead to too many problems due to plugin names for referring to the APIs of SimpleApiPlugins or the assets of AssetPlugins.

 Hence __plugin_implementations__ has been deprecated in favor of __plugin_implementation__. The plugin subsystem will automatically copy the first implementation from __plugin_implementations__ to __plugin_implementation__ and log a deprecation warning.

 Adjusted documentation accordingly. Also added docs for helpers.
2015-03-30 16:50:06 +02:00
Gina Häußge
7bf1627625 Merge branch 'master' into devel
Conflicts:
	CHANGELOG.md
	docs/api/datamodel.rst
	docs/api/index.rst
	docs/conf.py
	src/octoprint/static/js/app/viewmodels/files.js
	src/octoprint/static/js/app/viewmodels/printerstate.js
	src/octoprint/util/gcodeInterpreter.py
2015-03-23 10:58:51 +01:00
Gina Häußge
7affce2f64 Forgot to fix the Commit link 2015-03-23 10:49:35 +01:00
Gina Häußge
809c452285 Preparing release of 1.1.2 2015-03-23 10:43:42 +01:00
Gina Häußge
aa0e7a6dd3 Fixed `/api/printer` which wasn't adapter yet to new internal offset data model 2015-03-18 15:54:06 +01:00
Gina Häußge
7b9e3efea1 Removed /dev/ttyAMA* from serial ports added by default to connection list
Added additional ports configuration to settings to make it easier for people who actually need that port in the selection to add it back.
2015-03-18 12:08:21 +01:00
Gina Häußge
6c8a39607b A couple more change log entries 2015-03-16 12:44:20 +01:00
Gina Häußge
cf05b571ac Merge branch 'master' into devel
Conflicts:
	docs/api/printer.rst
	src/octoprint/server/api/printer.py
2015-03-09 09:31:39 +01:00
Gina Häußge
ad68b05f7d Fix: docs for printer resource now match implementation 2015-03-09 09:29:17 +01:00
Gina Häußge
d665cc9538 Fixed refreshing of timelapse file list upon finished rendering of a new one 2015-03-05 11:37:56 +01:00
Gina Häußge
af0cad90a8 Made drag-n-drop better usable on high resolutions
Now stop complaining.

Closes #187
2015-03-03 16:39:27 +01:00
Gina Häußge
6cf84a0bc4 Added a lot of changelog entries 2015-03-03 10:52:41 +01:00
Gina Häußge
0a92b340ac Refactoring in octoprint.util
* Renamed a couple of camelCased methods to snake_case
  * Moved to better location what didn't make sense in the common util module
2015-02-27 10:28:16 +01:00
Gina Häußge
0bf9be8be9 Added change log entry 2015-02-24 19:27:20 +01:00
Gina Häußge
e9623fdc36 Improved behaviour of terminal window
* Disabling autoscrolling now also stops cutting of the log while it's enabled, effectively preventing log lines from being modified at all
  * Applying filters displays "[...]" where lines where removed
  * Added a link to scroll to the end of the terminal log (useful for when autoscroll is disabled)
  * Added a link to select all current contents of the terminal log for easy copy-pasting
  * Added a display of how many lines are displayed, how many are filtered and how many are available in total

Closes #735
2015-02-24 14:14:52 +01:00
Gina Häußge
a6e5ea268b Fixed timelapse postroll settings
* Changing Timelapse post roll activates save button
* Timelapse post roll is loaded properly from config
(cherry picked from commit e1d7573)
2015-02-24 11:09:17 +01:00
Gina Häußge
4abcf1054b Added controls for changing feed and flow rate factors to Controls tab
Closes #362
2015-02-22 21:20:56 +01:00
Gina Häußge
4829c21db7 Merge branch 'master' into devel 2015-02-22 16:03:08 +01:00
Gina Häußge
d974ab0979 Forgot a changelog entry (again)
(cherry picked from commit 2111a06)
2015-02-22 15:38:44 +01:00
Gina Häußge
2111a06ce3 Forgot a changelog entry (again) 2015-02-22 15:37:37 +01:00
Gina Häußge
eb4156c02e Directly update color coding for success/failure in file list after finishing a print job 2015-02-10 10:55:47 +01:00
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