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

3909 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
95a449530e Force view via request headers instead of temporary flag 
The flag approach is not thread safe.
 2016-08-18 15:56:27 +02:00
Gina Häußge
d92df9c698 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/server/util/flask.py
	src/octoprint/server/views.py
	src/octoprint/settings.py
 2016-08-18 15:48:31 +02:00
Gina Häußge
60c46a3fc4 Fixed use of preemptive cache exceptions in "unless" implementation 2016-08-18 14:05:12 +02:00
Gina Häußge
8782f77577 Slightly modified logging for cached.gif 2016-08-18 14:01:25 +02:00
Gina Häußge
08f9529c6d Merge remote-tracking branch 'origin/maintenance' into maintenance 2016-08-18 13:58:38 +02:00
Gina Häußge
6499bd160f Only wait for preemptive cache if it's enabled for path & view 2016-08-18 13:56:46 +02:00
Gina Häußge
f43381ce30 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/filemanager/__init__.py
 2016-08-18 12:28:13 +02:00
Gina Häußge
599098a589 Have intermediary reload only after preliminary caching 2016-08-18 12:27:30 +02:00
Gina Häußge
aa57277ff8 Only report files as enqueued for analysis which actually are 2016-08-18 08:39:19 +02:00
Gina Häußge
7cc3403a41 Info logging for preemptively caching plugins 2016-08-18 08:34:43 +02:00
Gina Häußge
74a94469b6 Fix an issue with global_get from 3rd party plugins 2016-08-17 14:50:53 +02:00
Gina Häußge
00923427cb Really do force a plugin view during preemptive caching 
We don't need to check if the plugin will handle the UI, we just force
it to handle it.
 2016-08-16 14:04:45 +02:00
Gina Häußge
79c95aa3b4 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/filemanager/storage.py
	src/octoprint/templates/sidebar/state.jinja2
 2016-08-16 09:34:49 +02:00
Gina Häußge
217e54d81c Make sure we are still in printing state before sending next line 
We might just have "eaten" a line used for triggering a pause (e.g. an M0)
and thus might not be eligible to send the next line from the streamed file
anymore.

Solves #1448
 2016-08-16 09:29:29 +02:00
Gina Häußge
b05beb27b5 Don't sanitize . or .. folder names 2016-08-15 16:13:35 +02:00
Gina Häußge
d81ec15f43 Improvements in fuzzy print time algorithm 
Also use new fuzzy print time in gcode viewer to have some consistency.
 2016-08-15 15:42:06 +02:00
Gina Häußge
39372a9475 Also sanitize leading . 
That way hidden files that are uploaded will be "de-hidden".

Note that NO "de-hiding" of existing files will take place!
 2016-08-15 14:19:36 +02:00
Gina Häußge
e8cac14c2f Make sure uploads folder only has sanitized entries 
Should make sure stuff doesn't break when people perform manual
file operations on the uploads folder (e.g. uploading files
that don't match the sanitization scheme).

Should solve #1434
 2016-08-15 14:19:35 +02:00
Gina Häußge
5bef0926a6 Add [ and ] to valid chars in filenames 
See #1434
 2016-08-15 14:19:34 +02:00
Gina Häußge
7772fdc7bf Tooltips for state panel 2016-08-15 14:19:33 +02:00
Gina Häußge
cd736c44df Improved fuzzy print time display 2016-08-15 14:19:32 +02:00
Gina Häußge
11bdc176a0 Fix minute comparison for dumb estimate fallback 
Probably solves the core reason that caused #1428 to be
reported in the first place, totally inaccurate early linear
approximations (when nothing better is available) making
it to the user.

It should now display "Calcuting..." until the approximation
stabilizes OR the configured max percentage or max time without
an estimate are reached.
 2016-08-15 14:17:27 +02:00
Gina Häußge
edf83e4984 Merge branch 'vanilla_devel' of https://github.com/mrbeam/OctoPrint into pr/mrbeam/vanilla_devel 
Conflicts:
	src/octoprint/static/less/octoprint.less
 2016-08-15 09:40:21 +02:00
Teja
963bb77d89 added transform without vendor prefix. Didn't work in Chromium 52.x anymore. 2016-08-04 09:58:07 +02:00
Gina Häußge
039412183c Merge branch 'maintenance' into devel 
Conflicts:
	CHANGELOG.md
 2016-07-30 09:57:31 +02:00
Gina Häußge
fe97a8d6bd maintenance is now 1.2.16.dev 2016-07-30 09:56:49 +02:00
Gina Häußge
afdb98a92f Postponing the release of 1.2.15 until tomorrow 2016-07-29 21:50:45 +02:00
Gina Häußge
7b48270239 Preparing release of 1.2.15 2016-07-29 16:30:55 +02:00
Gina Häußge
90340487f7 Merge branch 'fix/revertTimeoutAdjustment' into maintenance 2016-07-29 08:54:11 +02:00
Gina Häußge
1f19fd1e1d Partially revert 937487037 
This commit might be at the root of the problems reported
in #1423
 2016-07-29 07:45:03 +02:00
Gina Häußge
9b13eb8a6c Support serial hook handlers to not return written bytes 2016-07-29 00:13:03 +02:00
Gina Häußge
444a36d0f0 state_string must always be initialized 
See #1425
 2016-07-28 23:24:29 +02:00
Gina Häußge
e6d88a124d Merge branch 'maintenance' into devel 2016-07-28 15:21:06 +02:00
Gina Häußge
7c5cc8d256 Make sure we have at least two timestamps in lastmodified calculation 
Otherwise our max(*timestamps) call might fail
 2016-07-28 15:19:34 +02:00
Gina Häußge
aae01fe81b Merge branch 'maintenance' into devel 
Conflicts:
	CHANGELOG.md
	docs/api/fileops.rst
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/server/api/files.py
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/main.js
	src/octoprint/static/js/app/viewmodels/files.js
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/templates/sidebar/state.jinja2
	src/octoprint/util/comm.py
 2016-07-28 15:00:23 +02:00
Gina Häußge
e76a3ea54f maintenance is now 1.2.15.dev 2016-07-28 14:30:21 +02:00
Gina Häußge
14969e5508 Preparing release of 1.2.14 2016-07-28 12:15:22 +02:00
Gina Häußge
f671006582 Use circle instead of info symbol for print time left quality indicator 2016-07-28 11:37:27 +02:00
Gina Häußge
bd352f4658 Make sure to clear_to_send in timeout handling for active resends 2016-07-28 11:30:23 +02:00
Gina Häußge
046536dd70 If a line is filtered while printing, read next line to continue sending 
We want to make sure that while printing we always continue sending something,
either from the command queue or the printed file.
 2016-07-28 11:18:57 +02:00
Gina Häußge
f9cb29ac91 A bunch of documentation fixes and updates 2016-07-28 09:43:41 +02:00
Gina Häußge
fad2e8f1b8 Visual distinction of state panel UI clusters 2016-07-27 18:38:40 +02:00
Gina Häußge
f2ecb96c83 Add indicator of origin of print time left estimate to UI 2016-07-27 18:38:17 +02:00
Gina Häußge
0a81e8b161 Use centered text in progress bars 
* print progress shows percentage
  * upload progress shows what it always showed, but fully centered
  * GCODE viewer progress shows what it always showed, but fully centered
 2016-07-27 15:05:16 +02:00
Gina Häußge
eb822c83a3 Add LESS/CSS for (centered) text in progress bars & knockout helper 2016-07-27 15:04:07 +02:00
Gina Häußge
ec8427cbb8 Fix a bug causing the "Streaming ..." text to vanish on transfer to SD 2016-07-27 14:46:00 +02:00
Gina Häußge
3585eb05a2 Fix a tiny typo 2016-07-27 10:13:11 +02:00
Gina Häußge
1fd776153c Another attempt at saner print time estimation 
Seriously though, this topic is driving me nuts...

  * track origin of print time left estimate
  * less draconian threshold for estimation helper for all prints, not just
    sd prints
  * sanity check estimated/statistical total print time, if not sane force "dumb"
    estimate
  * force "dumb" estimate if no other estimate is available after set percentage or
    print time
 2016-07-26 18:06:21 +02:00
Gina Häußge
75012472a2 Revert "Synchronize access to selected file" 
This reverts commit b5e19f0676.
 2016-07-26 11:18:10 +02:00
Gina Häußge
55d5df7f14 Report CLOSED/CLOSED_WITH_ERROR states as "Offline" 
Provide error string for the latter case in state as well.
 2016-07-22 10:51:38 +02:00