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

3444 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
6f0bfb38d7 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/static/css/octoprint.css
 2016-02-03 09:16:20 +01:00
Gina Häußge
73a587b3e4 Added missing entries to AUTHORS.md 2016-02-03 09:04:27 +01:00
Gina Häußge
fac4aad05f Merge branch 'master' of https://github.com/2ndalpha/OctoPrint into pr/2ndalpha/master 2016-02-03 08:58:59 +01:00
Gina Häußge
c53c263805 Merge branch 'fix/includeReleasenotesInUpdateNotifications' into maintenance 
Conflicts:
	src/octoprint/plugins/softwareupdate/__init__.py
	src/octoprint/static/css/octoprint.css
 2016-02-02 20:23:02 +01:00
Gina Häußge
0223a11923 Merge branch 'fix/betterTimelapseRendering' into devel 
Conflicts:
	src/octoprint/server/api/timelapse.py
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/viewmodels/timelapse.js
 2016-02-02 18:37:35 +01:00
Gina Häußge
4e31ccf4c5 Big overhaul of timelapse handling 
* persistent notification on ongoing timelapse render job (#485)
  * non-colliding timelapse snapshot name generation to not delete
     existing snapshots when new print starts and timelapse has not
     yet been rendered, also only delete snapshots if timelapse rendered (#318)
  * list of unrendered timelapses, with option to delete files
    or to render timelapse
 2016-02-02 18:03:56 +01:00
Siim Raud
c4e2a8982f Fixed formating 2016-02-02 00:40:52 +02:00
Siim Raud
42dafd7565 Fixed parsing of "retraction_combing" 2016-02-02 00:35:52 +02:00
Gina Häußge
5bab9f5bf9 Removed a doubled setting 2016-02-01 19:52:19 +01:00
Gina Häußge
adb77654f6 Merge branch 'fix/optionToIgnoreFirmwareErrors' into devel 
Conflicts:
	src/octoprint/server/api/settings.py
	src/octoprint/settings.py
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/templates/dialogs/settings/serialconnection.jinja2
 2016-02-01 18:07:13 +01:00
Gina Häußge
6ce82ceb00 Merge branch 'fix/optionToIgnoreFirmwareErrors' into maintenance 2016-02-01 18:02:29 +01:00
Gina Häußge
6583691e85 Added setting to only cancel ongoing print on firmware error 
Also added error popup in such a case so the error will be known even
if the terminal tab scrolled past it.
 2016-02-01 18:02:21 +01:00
Gina Häußge
2f44f10eb0 Merge branch 'fix/knockout3.4' into maintenance 2016-02-01 16:56:13 +01:00
Gina Häußge
0e817d43cc Added option to ignore any errors reported by the firmware 
Use this carefully. An error reported by your firmware usually hints
at something being off about your printer (e.g. thermistor troubles)
or the firmware not being fully compatible to OctoPrint since
it doesn't recognize a lot of commands.

If you print with this option enabled, it will still fail if you firmware goes
into lockdown, but now it will keep trying to send data to your printer.

That might cause issues. So best not use that option, only if you absolutely
have no other way to get some misbehaving printer to work with
OctoPrint.
 2016-02-01 16:55:13 +01:00
Gina Häußge
9066c54d8d Fixed a typo, fixed a wrongly fixed typo 2016-01-29 09:09:04 +01:00
Gina Häußge
780794c466 Merge branch 'development' of https://github.com/bwgan/OctoPrint into pr/bwgan/development 
Conflicts:
	src/octoprint/daemon.py
 2016-01-29 09:04:58 +01:00
bwgan
f8c0df4e78 Typo and spelling fixes 
Fixes various spelling issues and typos.
 2016-01-28 18:59:38 +00:00
Gina Häußge
1e5cc9b086 Merge branch 'fix/knockout3.4' into devel 
Conflicts:
	src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
	src/octoprint/static/js/app/viewmodels/files.js
	src/octoprint/static/js/app/viewmodels/firstrun.js
	src/octoprint/static/js/app/viewmodels/loginstate.js
 2016-01-27 17:37:31 +01:00
Gina Häußge
7f1394a8d6 Migrated ko.computed to ko.pureComputed where it made sense 2016-01-27 17:33:03 +01:00
Gina Häußge
caaf1d229c Updated Knockout dependency to version 3.4.0 
Closes #939
 2016-01-27 17:32:40 +01:00
Gina Häußge
45e159742e Merge branch 'fix/terminalLoad' into devel 
Conflicts:
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/main.js
 2016-01-27 12:37:03 +01:00
Gina Häußge
36ae6dd6b9 Added adaptive rate limiting to client 
The client now tries to detect if it's fast enough to process the
state updates usually send every 500ms, and if not notifies the
server to throttle the rate (e.g. to 1/1s, 1/1.5s etc).

Additionally, since the terminal tab of the client turned out to
be quite CPU intense when line number calculation, filtering etc
is enabled, the terminal tab now also falls back into a bit less
fancy mode if it detects its being processed too slow and optionally
even disables logging completely during printing (where a lot
of log messages need to be processed in a minimum amount of
time).

That way the UI should stay responsive even on very low powered
clients (e.g. chromium on a Pi), while printing.
 2016-01-27 12:04:17 +01:00
Gina Häußge
6945394fc2 Merge branch 'fix/disablePrintButtonWithoutFile' into devel 2016-01-25 16:29:29 +01:00
Gina Häußge
bcd7bb4d20 Don't enable Print button if no job is selected 
Fixes #1007
 2016-01-25 16:28:52 +01:00
Gina Häußge
b63e372e7e Merge remote-tracking branch 'origin/devel' into devel 2016-01-25 15:08:30 +01:00
Gina Häußge
9d924be5f9 Merge branch 'fix/uploadWhileOffline' into devel 
Conflicts:
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/viewmodels/files.js
 2016-01-25 15:05:50 +01:00
Gina Häußge
8151e617cc Merge branch 'maintenance' of github.com:foosel/OctoPrint into maintenance 2016-01-25 14:41:52 +01:00
Gina Häußge
1e429606e1 Only trigger drag overlay for files, not texts 2016-01-25 14:39:48 +01:00
Gina Häußge
7fbfaadc21 Do not read no return value as "False" return value for onServerDisconnect 2016-01-25 13:51:46 +01:00
Gina Häußge
814355e281 Do not show drag-n-drop overlay if server is offline 
Fixes #1196
 2016-01-25 13:51:10 +01:00
Gina Häußge
c720cc3a4a Added note to not misuse (feature) requests for support questions 2016-01-21 10:58:00 +01:00
Gina Häußge
3d34411025 Merge branch 'fix/disableSettingsSaveWhileBusy' into devel 
Conflicts:
	src/octoprint/static/js/app/viewmodels/settings.js
 2016-01-19 11:52:25 +01:00
Gina Häußge
660de61997 Merge remote-tracking branch 'origin/maintenance' into maintenance 2016-01-19 11:51:15 +01:00
Gina Häußge
f4b3206d49 Disable the settings dialog's save button while sending or receiving 2016-01-19 11:19:51 +01:00
Gina Häußge
4abfa6c3b3 Updated installation instructions 2016-01-13 17:12:41 +01:00
Gina Häußge
3b35d921d1 Merge branch 'fix/resetSettingsScrollPosition' into devel 2016-01-12 13:30:34 +01:00
Gina Häußge
2a059cf0cb Reset scroll position and selected tab in settings dialog 
Also added means to open settings dialog navigating directly to a specific tab
 2016-01-12 13:30:10 +01:00
Gina Häußge
4e84d62741 Reset scroll position and selected tab in about dialog 2016-01-12 11:00:35 +01:00
Gina Häußge
04bb262187 Fixed an issue with resolving various files as templates in source installs 
Missing _data prefix
 2016-01-12 10:59:48 +01:00
Gina Häußge
c44920c0f7 Updated used third party libraries & licenses 2016-01-11 16:46:36 +01:00
Gina Häußge
e4828450c9 Merge branch 'fix/slugifyFilenames' into devel 
Conflicts:
	setup.py
 2016-01-11 16:43:38 +01:00
Gina Häußge
7743372ee4 Slugify file names on local storage 
Just stripping anything non-ASCII leads to errors with UTF-8 only
filenames.

Closes #1181
 2016-01-11 16:42:05 +01:00
Gina Häußge
682dd902e6 Merge branch 'fix/refreshFilesButton' into devel 2016-01-11 15:42:06 +01:00
Gina Häußge
59027d349f Added button to refresh file list 
Also added tooltips for all three file list buttons
 2016-01-11 15:41:38 +01:00
Gina Häußge
e034e7c7e2 Merge branch 'fix/m114CustomControlExample' into devel 2016-01-05 11:49:33 +01:00
Gina Häußge
9fd8b09e34 Fixed custom control M114 example to also match negative coordinates 2016-01-05 11:48:55 +01:00
Gina Häußge
62a25767a3 Merge branch 'maintenance' into devel 2016-01-05 11:43:20 +01:00
Gina Häußge
450e24bbc2 Added missing AUTHORS.md entry 2016-01-05 11:42:38 +01:00
Gina Häußge
c020c7afe0 Merge branch 'master' of https://github.com/richjoyce/OctoPrint into pr/richjoyce/settings_remove_fix 2016-01-05 11:40:18 +01:00
Gina Häußge
5cdf45d218 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/static/js/app/viewmodels/loginstate.js
 2016-01-05 11:38:05 +01:00