Commit graph

3693 commits

Author SHA1 Message Date
Gina Häußge
f20fdfd4db Add octoprint.printer.factory hook 2016-06-21 15:57:28 +02:00
Gina Häußge
9c89d45c10 Use print_function import + added @MirceDan to AUTHORS.md 2016-06-15 10:52:49 +02:00
MirceaDan
65c1415d4b added () to print statements for python 3.x compatibility
some print already have () some did not , for consistency and
compatibility i added () to all prints.
(cherry picked from commit b601239)
2016-06-15 10:48:59 +02:00
Gina Häußge
8616bc13cb Made optional pass flag a parameter to viewmodel factory
Also some minor whitespace related stuff and some comments
2016-06-15 10:41:59 +02:00
Gina Häußge
9e2f24b767 Merge branch 'devel-ko-rewrite-optional' of https://github.com/BillyBlaze/OctoPrint into pr/BillyBlaze/devel-ko-rewrite-optional 2016-06-15 09:49:21 +02:00
Gina Häußge
467cda54a4 Don't display wizard if ACL is active and user not logged in
Fixes #1365
2016-06-09 14:05:09 +02:00
Gina Häußge
de78c14ae3 Merge branch 'maintenance' into devel
Conflicts:
	CHANGELOG.md
	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/loginstate.js
2016-06-09 12:56:07 +02:00
Gina Häußge
be711dd691 maintenance branch is now 1.2.13.dev 2016-06-09 12:16:27 +02:00
Gina Häußge
685ce16c85 Preparing release of 1.2.12 (part three)
Forgot to add the news category of the blog to the announcement
plugin and also updated the list of patrons again.
2016-06-09 09:31:36 +02:00
Gina Häußge
885b48911e Preparing release of 1.2.12 (part two)
Another update of the CHANGELOG after fixing a bug. Shifted release date
to tomorrow to leave more time for final tests that was now eaten up by the
last minute bug fix.

Also updated CONTRIBUTING file to explain new prerelease branch.
2016-06-08 16:48:39 +02:00
Gina Häußge
d7ef60b4d2 Slight change in function definition of reused functions (JS) 2016-06-08 16:33:08 +02:00
Gina Häußge
63cec660ca Solve a race condition that could cause 401 responses and a broken UI
Closes #1364. See ticket for details.
2016-06-08 16:21:25 +02:00
Gina Häußge
4c34cb84c7 Preparing release of 1.2.12 2016-06-08 13:09:04 +02:00
Gina Häußge
d3d4d4e407 Merge branch 'prerelease' into maintenance 2016-06-08 11:21:22 +02:00
Gina Häußge
e9f80c6616 Added new prerelease branch to versioneer config
Can be used in the future for tracking prereleases and testing
proper version updates without having to push to master directly.
2016-06-08 11:19:21 +02:00
Gina Häußge
5006b019af Add events for slicing profile manipulation
Events SlicingProfile(Added|Modified|Deleted). Initially thought to be necessary
to properly refresh available profiles in slicing dialog, not needed for that after
all but still left in and documented, might be useful for someone.
2016-06-06 18:12:32 +02:00
Gina Häußge
4f3e4f7f38 Force rescanning of available slicing profiles for slicer on update
Should make newly uploaded profiles available in the slicing dialog without
having to first deselect and then reselected the current slicer.
2016-06-06 16:20:47 +02:00
Gina Häußge
db66e4afea Merge branch 'maintenance' into devel 2016-06-02 12:05:08 +02:00
Gina Häußge
a0697f8bad Use movie prefix for timelapse notifications
Also added a missing lock.

Also part of the fix for #1320
2016-06-02 12:03:57 +02:00
Gina Häußge
2833372603 Allow deletion of *.mp4 timelapse files
That one was missing in a00faf2.

Fixes #1320
2016-06-02 11:11:06 +02:00
Gina Häußge
8ce1eafd5d Properly track unrendered timelapses that are being processed
UI removes action buttons for them and displays a spinner
indicating that the timelapse in question is either being
recorded or being rendered at the moment.

Should prevent users from accidentally trying to render an
incomplete timelapse.
2016-06-02 10:11:54 +02:00
Gina Häußge
21a4033f73 Don't concurrently delete unrendered timelapses
Could trigger lots of errors if an unrendered timelapse currently
being collected was deleted from a separate thread from right
under the collection thread.

Also only log errors while processing already deleted files
if debug logging is enabled.

Finally trigger MovieDone event AFTER deleting unrendered
files (otherwise just rendered timelapse might still be present
when list of timelapses is queried right after).

Should solve #1326
2016-06-02 10:05:44 +02:00
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