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

3149 commits

This branch
This branch
All branches
Author SHA1 Message Date
Salandora
95bcccb84c Renaming and Refactoring 2015-10-12 10:00:26 +02:00
Salandora
0dacfcdf8d Fixed Slicing. 
Normal behaviour is sliced gcode will be placed in same folder as the stl.
 2015-10-09 21:50:34 +02:00
Salandora
ca0463b4c0 Merge branch 'dev/folderSupport' of github.com:foosel/OctoPrint into dev/folderSupport 
Conflicts:
	src/octoprint/static/js/app/client/files.js
 2015-10-09 19:54:51 +02:00
Salandora
3458f9af43 Refactorings based on Commit comments 2015-10-09 19:51:36 +02:00
Salandora
7671831707 Added copy, move and createFolder to clientlib 2015-10-09 02:39:21 +02:00
Salandora
d719e3cdbf Added copy and move API commands 2015-10-09 02:38:40 +02:00
Salandora
c3ddbd0b1b Added create and remove folder API commands 2015-10-09 02:37:42 +02:00
Salandora
fd0456ed26 Some small fixes and cosmetic adjustments 2015-10-09 02:26:33 +02:00
Salandora
070fd4a47f Merge branch 'devel' of github.com:foosel/OctoPrint into dev/folderSupport 2015-10-08 15:29:36 +02:00
Salandora
7f78b331fa Added possibility to send a cookie back by the LargeResponseHandler 2015-10-08 15:29:14 +02:00
Salandora
9429456c5f Fixed some small mistakes 2015-10-08 15:26:58 +02:00
Salandora
05d8b0ac07 Removed Move and Rename functions again 2015-10-08 15:26:00 +02:00
Salandora
b5ff8defde Added a missing function 2015-10-08 15:24:22 +02:00
Gina Häußge
3767f83fe2 Slight timing changes in wizard finishing process 
We now wait until the settings have been saved before we close the dialog.
That should hopefully reduce chances of an asynchronous "Oh no, the settings
were updated" message showing up just when finishing the dialog.
 2015-10-08 15:23:19 +02:00
Gina Häußge
dd4bec3329 Fix: Do not cache templates if wizards are active 
Otherwise wizards will be reshown until the cache is forcefully
cleared.
 2015-10-08 13:49:57 +02:00
Gina Häußge
d3b7a77da7 Fix: Core wizard API didn't yet understand json-only requests 2015-10-08 12:22:22 +02:00
Gina Häußge
e5217813bd Merge branch 'fix/sdcardTimelapseWarning' into devel 
Conflicts:
	src/octoprint/server/views.py
	src/octoprint/templates/initscript.jinja2
 2015-10-08 10:25:18 +02:00
Gina Häußge
bbbdb3dde6 Note that z-based timelapses don't work when printing from SD 2015-10-08 10:22:09 +02:00
Gina Häußge
b9460b4890 Merge branch 'fix/uiEscaping' into maintenance 2015-10-08 09:52:08 +02:00
Gina Häußge
251ec9d823 Added changelog entry for #632 and adjusted Fan On 2015-10-08 09:26:34 +02:00
Gina Häußge
db05632677 Updated compiled CSS file 2015-10-07 18:58:42 +02:00
Gina Häußge
b7973e4256 Merge branch 'fix/gcodeViewerUpdateOnFileUpdate' into devel 2015-10-07 18:54:21 +02:00
Gina Häußge
947f4c89cc Fixed a win-only issue causing the gcode view not to reload on file modification 2015-10-07 18:52:18 +02:00
Gina Häußge
5f982ec6c8 Merge branch 'fix/atomicWrites' into maintenance 2015-10-07 17:53:43 +02:00
Gina Häußge
355bf784c0 Merge branch 'fix/contentTypeForDownloads' into devel 2015-10-07 17:50:26 +02:00
Gina Häußge
dcf2e51b21 Moved filemanager method tests to test_filemanager.py 2015-10-07 17:50:08 +02:00
Gina Häußge
cb8167a25a Merge branch 'fix/atomicWrites' into devel 2015-10-07 17:45:20 +02:00
Gina Häußge
85e6ae8e82 Fixed a unit test that broke by switching to atomic_write 2015-10-07 17:45:07 +02:00
Gina Häußge
4017f96ed5 Merge branch 'fix/contentTypeForDownloads' into devel 2015-10-07 17:22:21 +02:00
Gina Häußge
859ea0d0e4 Added mime type guessing for downloads to Tornado 2015-10-07 17:19:18 +02:00
Gina Häußge
236f87ca23 Merge remote-tracking branch 'origin/devel' into devel 2015-10-07 12:29:11 +02:00
Gina Häußge
b458759159 Merge branch 'fix/wrongEtagForDownloads' into devel 2015-10-07 12:25:52 +02:00
Gina Häußge
9cf21aa036 Also set caching headers for downloads to discourage client-side caching 
At least if necessary (added new boolean flag to the constructor of
LargeResponseHandler for that). While at it also rename UrlForwardHandler
to UrlProxyHandler (it does not forward, it proxies) and make it aware of
ETag and Expires headers.
 2015-10-07 12:25:25 +02:00
Mark Walker
3aa4c8f6c6 Add S255 parameter to M106 for "Fan On" 
Bit of a debate with some gcode purists. RepRapPro demands an S
parameter.  Adding S255 should be backward compatible with the firmwares
that recognize M106 as full on. As with other issues, it'd be nice to
have something more to go on here than the reprap wiki and firmware
source code.
 2015-10-06 14:07:08 -07:00
Gina Häußge
60ce959909 Merge branch 'fix/atomicWrites' into devel 2015-10-06 18:41:04 +02:00
Gina Häußge
78d8c18a82 Merge branch 'fix/wrongEtagForDownloads' into devel 2015-10-06 18:40:55 +02:00
Gina Häußge
637adc3095 Fix: LargeResponseHandler was wrongly caching ETag value 
ETag values returned with download responses were cached internally within
the LargeResponseHandler class, with the file's path as key. That let to
problems once the content changed and hence the ETag value actually
becoming invalid. Since the path however stayed the same, the same ETag
value for the modified file was assumed and a 304 Not Modified response
was generated.

This patch changes the behaviour of LargeResponseHandler to use
the last modified date of the file as the ETag value and alternatively allowing
an etag generator function to be provided as constructor parameter as well
to use for calculating (or disabling) the ETag header dependant on the
situation.
 2015-10-06 18:19:53 +02:00
Gina Häußge
548f976d35 Some more defensive escaping for various settings in the UI 
Entering HTML fragments into the webcam stream URL could cause
issues, anything injected via Jinja should now be escaped properly.
 2015-10-06 13:41:54 +02:00
Gina Häußge
a6c21c4985 Merge branch 'fix/utf8BomResilience' into devel 
Conflicts:
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/util/comm.py
 2015-10-05 19:58:01 +02:00
Gina Häußge
45c92cb1f4 Fix: Open GCODE files als utf-8, replacing encoding errors 
Also detect files that contain a BOM and strip it.
Internal handling of GCODE file contents switched to unicode.

 Should take care of #1077
 2015-10-05 19:43:40 +02:00
Gina Häußge
f83d5aa89f Fix: Use atomic writes for all save processes 
That includes uploaded files, profiles, caching files, settings and user
directories.
 2015-10-05 18:07:43 +02:00
Nicanor Romero Venier
c050f6a467 Merge branch 'dev/dynamicMaxTemp' into devel 2015-10-05 16:04:08 +02:00
Salandora
2530e9b710 Fixed merge and moved some functions into library 2015-10-04 02:42:18 +02:00
Salandora
59cb448913 Merge remote-tracking branch 'remotes/upstream/devel' into dev/folderSupport 
Conflicts:
	src/octoprint/static/js/app/viewmodels/files.js
 2015-10-03 12:33:11 +02:00
Gina Häußge
abf073340f Fixed reporting of duration needed for capturing timelapse postroll 
Needs to be calculated differently for time based and z-triggered. Capture interval
was not taken properly into account.
(cherry picked from commit 9284ff4)
 2015-10-02 18:22:44 +02:00
Gina Häußge
918ffa2557 Refactored timelapse core 
Capturing is now queue based, rendering will not start until all images have been captured,
and timed postroll does not depend on system time anymore.

Also refactored some of the names to be python naming compliant while at it.
(cherry picked from commit 4f5dc70)
 2015-10-02 18:18:31 +02:00
Gina Häußge
e9074e127e Added a couple of changelog entries 2015-10-02 18:13:40 +02:00
Gina Häußge
9284ff4086 Fixed reporting of duration needed for capturing timelapse postroll 
Needs to be calculated differently for time based and z-triggered. Capture interval
was not taken properly into account.
 2015-10-02 15:14:05 +02:00
Gina Häußge
5644b5dc01 clientlib: Fixed some refactoring errors still referring to exports var 
Closes #1079
 2015-10-02 14:26:51 +02:00
Gina Häußge
a28198edef Timelapse API couldn't yet cope with JSON requests 2015-10-02 13:16:58 +02:00