Commit graph

3665 commits

Author SHA1 Message Date
Gina Häußge
7d52aa4be2 Merge branch 'maintenance' into devel
Conflicts:
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/viewmodels/timelapse.js
2016-06-01 13:29:56 +02:00
Gina Häußge
51a1953d99 Move timelapse event processing to timelapse viewmodel 2016-06-01 13:24:29 +02:00
Gina Häußge
30b6211157 Whitelist .g extensions on sd file upload
That way uploading something like auto0.g will not
cause a rename to auto0.gco anymore.

Closes #1314
2016-06-01 12:29:42 +02:00
Gina Häußge
36ec9c4741 Do not sort events in the event queue alphabetically
This should never have been a PriorityQueue, or at the very least it should
never have the data itself in a sortable structure.

Thanks to processing speed of the event queue that seldomly showed,
only in cases where two events entered the queue almost simultanously,
e.g. when starting to render a timelapse movie and immediately failing.

Should solve #1343
2016-06-01 10:29:47 +02:00
Gina Häußge
e4c7ccecef Merge remote-tracking branch 'origin/devel' into devel 2016-05-31 13:33:28 +02:00
Gina Häußge
06a66ac1df Merge branch 'fix/brokenEditUserDialog' into devel 2016-05-31 13:32:46 +02:00
Gina Häußge
1581ebbead Fix error when trying to confirm the edit-user-dialog
Closes #1357
2016-05-31 13:32:14 +02:00
Mark Walker
d39850889d Merge branch 'fix/printVolumeCheck' into devel 2016-05-26 01:11:45 +00:00
Mark Walker
938251d755 Fix condition on print volume check
This should address #1354
2016-05-26 00:42:20 +00:00
Gina Häußge
a50f9f068b Merge pull request #1347 from dougcalobrisi/fix-slicing-api-doc-1
Corrects example URL in Slicing API Doc
2016-05-23 12:05:09 +02:00
Doug Calobrisi
ebb93d9d2f Corrects example URL in Slicing API Doc
This fixes a simple typo in the API doc for fetching slicing profiles. The previous example had /profiles appended to it, whereas it should just be /api/slicing to fetch a list of all slicers and profiles.
2016-05-20 10:28:44 -04:00
Gina Häußge
a8927d08ab Merge branch 'maintenance' into devel 2016-05-20 11:04:55 +02:00
Gina Häußge
436ebd7c18 Add help text re units for disk space thresholds
Closes #1338
2016-05-20 11:04:42 +02:00
Gina Häußge
82a580f5d5 Add help text re units for gcode size thresholds
Closes #1338
2016-05-20 10:58:18 +02:00
Gina Häußge
833bf07ded Merge branch 'fix/noProgressReportOn0' into devel
Conflicts:
	src/octoprint/__init__.py
2016-05-20 10:27:20 +02:00
Gina Häußge
801d60388a Also report 0% print progress to plugins
Fixes #1344
2016-05-20 10:24:47 +02:00
Gina Häußge
821fa4299b Let's go all in and use keyword parameters
Way less error prone than positional arguments!
2016-05-19 18:35:02 +02:00
Gina Häußge
b018a56e4c Merge branch 'maintenance-pid_cleanup' of https://github.com/kevans91/OctoPrint into fix/1324 2016-05-19 18:32:46 +02:00
Gina Häußge
5a5d29b1a9 Added some PRs to the Changelog 2016-05-19 18:30:33 +02:00
Gina Häußge
888fb2669c Added @javierma to AUTHORS.md 2016-05-19 18:21:02 +02:00
Gina Häußge
7a43f34d46 Make Slice Dialog pop up again on STL upload 2016-05-19 18:14:53 +02:00
Gina Häußge
e560809f70 Merge branch 'dev/printExceedsBed' into devel 2016-05-19 18:14:19 +02:00
Gina Häußge
2680d135ee Small changes before merging of PR
* Do not trigger notifications within additional data generation,
    that would trigger a LOT of notifications just on page load. Instead
    adjusted to only display notification if a problematic file gets
    selected for printing (and select & print gets downgraded to just
    select in such a case too)
  * Made some left-over english-only strings translatable
  * Added Model Size display to additional data in file list (if we have
    it, why not show it :))
  * Slight rewording of notification.
  * Fixed a merge error.
2016-05-19 18:14:08 +02:00
Gina Häußge
6d1774bec2 Merge branch 'fix/adminNeededForConnecting' into devel 2016-05-19 10:46:34 +02:00
Gina Häußge
b1e75a1033 Make connection dialog visible for users again
Should actually not have been limited to admins-only, that was an accident
during switching to 1.2.0 implementation.

Once #1110 is tackled, this should be something configurable based on the role
as well.
2016-05-19 10:42:27 +02:00
Kyle Evans
86fbbefb6e Complete backport of pid cleanup fix for #1324 2016-05-15 09:16:53 -05:00
Javier Martínez Arrieta
92279fb3a0 Squashed commit of the following:
commit cd6688be2691997feb1c76ca785e096779ac51db
Author: Javierma87 <javier.martinez.arrieta@alumnos.upm.es>
Date:   Thu May 12 15:13:23 2016 +0200

    Removed previousE

commit 413655f7051012b26406be013db9b4b3697404bc
Author: Javierma87 <javier.martinez.arrieta@alumnos.upm.es>
Date:   Thu May 12 12:36:54 2016 +0200

    Changed to detect in case of two extruders

commit b0cfa28eaff7648e9fa1b809122205f5c6a56899
Author: Javierma87 <javier.martinez.arrieta@alumnos.upm.es>
Date:   Mon Apr 11 18:11:54 2016 +0200

    Identation issues solved and code improved

commit 95b6eba2ad034d48c1b56576a2c665b4bb3abf72
Author: Javierma87 <javier.martinez.arrieta@alumnos.upm.es>
Date:   Mon Apr 4 18:48:47 2016 +0200

    Changed message shown to user using sprintf and improved 'if' checks

commit 3baf9d7fc0b05a336e17a3920fd5d267423959b3
Author: Javierma87 <javier.martinez.arrieta@alumnos.upm.es>
Date:   Tue Mar 8 17:46:40 2016 +0000

    Analysis now done in frontend, taking also into account centre origin

commit e742e74475dbacdb54517528e79533fbad8fa188
Author: Javier Martínez Arrieta <martinezarrietajavier@gmail.com>
Date:   Sat Mar 5 21:37:02 2016 +0100

    Update analysis.py

commit 29a821c2f40daa0fe15807d0c12435eef6a63b4f
Author: Javierma87 <javier.martinez.arrieta@alumnos.upm.es>
Date:   Mon Feb 29 19:11:59 2016 +0000

    Removed unrelated folders and files for pull request

commit 0edbcf3d3cbe3b6bb3e93c8a65fd7e6cbf8c7c45
Author: Javierma87 <javier.martinez.arrieta@alumnos.upm.es>
Date:   Sat Feb 27 10:54:47 2016 +0000

    Completed requirements and solutions for Slic3r integration and added requirements for scheduled printing

commit a92b7e3adeedbdc1a8f084aca0be248bb713e7c2
Author: Javierma87 <javier.martinez.arrieta@alumnos.upm.es>
Date:   Mon Feb 22 11:06:22 2016 +0000

    Changed requirements and solution file for Slic3r integration

commit 201b5723d9a537262d490a568ce32cbacb872dc9
Author: Javierma87 <javier.martinez.arrieta@alumnos.upm.es>
Date:   Thu Feb 18 12:15:54 2016 +0000

    Solved problem with character '}' at static/js/viewmodels/file.js

commit d89319c2a57d0aecaf96a3d91f58f9585e00fc25
Author: Javierma87 <javier.martinez.arrieta@alumnos.upm.es>
Date:   Wed Feb 17 21:04:44 2016 +0000

    Completed requirementes to add Slic3r as a plugin

commit 9e07a3b7c014fd77720746624c6e8433610b2e81
Merge: caf4e84 6945394
Author: Javierma87 <javier.martinez.arrieta@alumnos.upm.es>
Date:   Wed Feb 17 10:03:56 2016 +0000

    Added functionality to warn in case object exceeds printing area

commit caf4e84ab278455bf969c5630f5d8be11fec0d03
Author: Javierma87 <javier.martinez.arrieta@alumnos.upm.es>
Date:   Thu Feb 11 18:32:36 2016 +0000

    Added docs-tfg and implemented functionality of warning in case object is bigger than printer area
2016-05-12 15:41:12 +02:00
Gina Häußge
2074aae940 Merge branch 'maintenance' into devel
Conflicts:
	AUTHORS.md
	src/octoprint/daemon.py
	src/octoprint/server/__init__.py
2016-05-12 11:01:36 +02:00
Gina Häußge
2c0fa7c1d1 Added @kevans91 to AUTHORS.md
(cherry picked from commit 425fa8e)
2016-05-12 10:52:25 +02:00
Kyle Evans
8263c6072a Make Server class octoprint_daemon-aware, make sure terminated() gets invoked on it upon SIGTERM and update respective test
(cherry picked from commit 75f8fac)
2016-05-12 10:44:27 +02:00
Gina Häußge
425fa8e639 Added @kevans91 to AUTHORS.md 2016-05-12 10:17:15 +02:00
Gina Häußge
0d9739095e Merge branch 'devel-pid_cleanup2' of https://github.com/kevans91/OctoPrint into pr/kevans91/devel-pid_cleanup2 2016-05-12 10:11:45 +02:00
Gina Häußge
6297f8ae8e Merge branch 'fix/sockJsThreading' into devel 2016-05-10 09:49:03 +02:00
Gina Häußge
91b5fc6b0d Force synchronization of sockjs message sending 2016-05-10 09:48:20 +02:00
Kyle Evans
75f8facb05 Make Server class octoprint_daemon-aware, make sure terminated() gets invoked on it upon SIGTERM and update respective test 2016-05-09 09:40:50 -05:00
Gina Häußge
9e2a1f81a1 Added @philphilphil to AUTHORS.md 2016-05-09 15:51:42 +02:00
Gina Häußge
1225a2501d Fix a stupid mistake in the german translation 2016-05-09 15:27:17 +02:00
Gina Häußge
797d24e01d Small whitespace corrections 2016-05-09 15:09:57 +02:00
Gina Häußge
4e0d9e8d8e Merge branch 'dev/gcodeLayerButton' of https://github.com/agarwali/OctoPrint into pr/agarwali/dev/gcodeLayerButton
Conflicts:
	AUTHORS.md
2016-05-09 12:56:42 +02:00
Gina Häußge
7a69096a83 Merge branch 'gcodeVisualizerFileSizeThreshold' of https://github.com/philphilphil/OctoPrint into pr/philphilphil/gcodeVisualizerFileSizeThreshold
Conflicts:
	src/octoprint/settings.py
2016-05-09 12:47:06 +02:00
Gina Häußge
628443d44b Fix a merge error 2016-05-09 12:33:26 +02:00
Gina Häußge
2fc393f02e Fixed settings for fahrenheit appearance option 2016-05-09 11:40:39 +02:00
Gina Häußge
5ff16bcbf4 Merge branch 'dev/fahrenheit' of https://github.com/therealbstern/OctoPrint into pr/therealbstern/dev/fahrenheit
Conflicts:
	AUTHORS.md
2016-05-09 11:33:57 +02:00
Gina Häußge
3322714a8a Merge branch 'maintenance' into devel
Conflicts:
	CHANGELOG.md
2016-05-09 10:29:20 +02:00
Gina Häußge
34c068b964 maintenance branch is now 1.2.12.dev 2016-05-09 10:12:46 +02:00
Gina Häußge
e79703ba6e Preparing release of 1.2.11 2016-05-04 13:36:06 +02:00
Gina Häußge
fb1fd37482 Updated list of supporters for May 2016-05-04 13:29:06 +02:00
Gina Häußge
4830d60269 Announcements: Ensure validity of channel keys, made refreshable 2016-05-04 13:28:28 +02:00
Gina Häußge
76959e06c9 Updated german translation 2016-05-04 09:57:25 +02:00
Gina Häußge
5a8c3654c4 We leave the About dialog untranslated for now 2016-05-04 09:51:50 +02:00