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

3153 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nicanor Romero Venier
a9c38cb779 Small bug fix that prevented deleting profiles 2015-10-22 17:02:42 +02:00
Gina Häußge
2c5f2f0bf8 Merge branch 'fix/sdcardFilename' into devel 2015-10-22 13:55:27 +02:00
Gina Häußge
57bf457d97 Fix: current filename in job data should never be prefixed with / 
That was a tiny detail missing in 8bef18c2a8 that
caused issues with detecting which file was currently selected on the printer's
SD card (for "do not delete that" checks on the API).
 2015-10-22 13:42:57 +02:00
Gina Häußge
5fc8e228b8 Travis: Let's see if we can't get the git depth upped a bit 2015-10-22 13:20:11 +02:00
Gina Häußge
bec0013a90 Travis: Migrate from legacy infrastructure 
http://docs.travis-ci.com/user/migrating-from-legacy/
 2015-10-22 12:40:51 +02:00
Gina Häußge
2f86a6acce Fixed some missing exception capturing 2015-10-22 12:35:23 +02:00
Gina Häußge
02c3bf8115 Fixed existing doctests, added some new ones, enabled doctests in nosetests 2015-10-22 12:34:53 +02:00
Gina Häußge
279f4014a6 Merge branch 'dev/improvedPluginSettingsSaving' into devel 2015-10-22 11:08:44 +02:00
Gina Häußge
53a62ab44e Added Unit Tests for BlueprintPlugin mixin 2015-10-22 11:07:55 +02:00
Gina Häußge
bcd0f34fc3 Unit tests and some fixes for improved plugin settings processing 2015-10-20 17:57:05 +02:00
Gina Häußge
ffcbdba858 Use get_all_data instead of get([], ...) construct 2015-10-20 15:41:44 +02:00
Gina Häußge
fca7b2ebae Merge branch 'maintenance' into devel 
Conflicts:
	.versioneer-lookup
	CHANGELOG.md
 2015-10-20 14:55:46 +02:00
Gina Häußge
adf39cdf21 maintenance branch is now 1.2.8-dev 2015-10-20 14:54:16 +02:00
Gina Häußge
6c622f7c43 Fixed indentation of change log 2015-10-20 12:24:23 +02:00
Gina Häußge
d34790e74e Unit tests for octoprint.util.RepeatedTimer 
(cherry picked from commit 7362067)
 2015-10-20 12:07:31 +02:00
Gina Häußge
aa5099340e Two new callbacks for RepeatedTimer when cancelled or condition untrue 
(cherry picked from commit 9b9ecfe)
 2015-10-20 12:07:24 +02:00
Gina Häußge
693633bd1d RepeatedTimer now supports callback when timer stops 
(cherry picked from commit 3c5a976)
 2015-10-20 12:05:12 +02:00
Gina Häußge
758062133c Updated changelog for 1.2.7 2015-10-20 11:55:34 +02:00
Gina Häußge
7ea1578bda Fix: Persist all data different from default, not just current changes 
We need to merge with our current data since we only might get partial data
from our caller.
 2015-10-20 10:35:47 +02:00
Gina Häußge
d70fe32750 Make sure only difference to default config is persisted for plugins 
This change should make sure that only those settings actually make it into config.yaml
per plugin that do differ from the default settings. Up until now the full dictionary as received
e.g. from the REST API was saved, regardless whether it contained (only) default values or not.
That led to a lot of "null" entries in the config.yaml file, which for one looked horrible and also
led to problems when a plugin actually wanted to change its default values.

With this commit, two things are done. One, upon saving a configuration the default
implementation of the save routine in the settings plugin now first diffs the new data against
the defaults and only saves what is different. Two, upon server startup a cleanup method is
now called on settings plugins whose default implementation fetches the current data stored
in config.yaml, diffs that against the defaults and only writes back the diff result. If that is empty
the entry is completely deleted from config.yaml.
 2015-10-19 20:17:17 +02:00
Gina Häußge
66fbd1fc6a Fix: Also provide custom control parameters to custom GCODE scripts 
Closes #1085
 2015-10-19 13:45:40 +02:00
Gina Häußge
4cfc74c344 Fix: Each divider action needs a custom action id 
Closes #1084
 2015-10-19 13:24:16 +02:00
Gina Häußge
c55fea666d Updated required versions of psutil and netifaces 
Also see #1090
 2015-10-19 09:33:48 +02:00
Salandora
20676926e6 Fix a typo that broke custom control parameters 2015-10-12 13:54:52 +02:00
Salandora
1bf46d655d Fix SD disabled error 2015-10-12 10:20:32 +02:00
Gina Häußge
12403444c4 Merge branch 'fix/swuReloadDialog' into devel 2015-10-08 17:09:18 +02:00
Gina Häußge
c932e496fa SWU: Show reload dialog after update 
The notification and the (forced) dialog afterwards were way too
redundant.
 2015-10-08 17:08:36 +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