Commit graph

1799 commits

Author SHA1 Message Date
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
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
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
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
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
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
Gina Häußge
a9756c4c36 Announcements: no read_until -> take latest from feed 2016-05-03 17:36:43 +02:00
Gina Häußge
1b1148d0c6 Properly refresh analysis data on re-upload of a file 2016-05-03 12:23:39 +02:00
Gina Häußge
76b4a45495 Merge branch 'maintenance' into devel
Conflicts:
	THIRDPARTYLICENSES.md
	setup.py
	src/octoprint/server/__init__.py
	src/octoprint/server/views.py
	src/octoprint/settings.py
	src/octoprint/static/css/octoprint.css
2016-05-03 10:48:26 +02:00
Gina Häußge
9919de9a6c Added padding to announcement reader content pane 2016-05-03 10:22:23 +02:00
Gina Häußge
5091099f83 Added "About" link to settings dialog 2016-05-03 10:21:59 +02:00
Gina Häußge
7c6b9eac48 Added externalize_links filter for jinja2
Links from documents (like changelog, licenses etc) should
also be target blank & rel noopener/noreferrer
2016-05-03 09:59:37 +02:00
Gina Häußge
7a8e6b6b6d Use UTC for feed reader timestamps 2016-05-03 09:17:48 +02:00
Gina Häußge
50ae34dc4f Forgot the css file of the announcements plugin 2016-05-02 17:49:32 +02:00
Gina Häußge
8f621eca43 Merge branch 'improve/announcementPlugin' into maintenance 2016-05-02 17:38:21 +02:00
Gina Häußge
9e73f1563d Strip paragraphs from summaries for announcement notifications 2016-05-02 17:32:36 +02:00
Gina Häußge
3a570f8ab0 Added OctoPi + Spotlight feeds, article link, better reader design 2016-05-02 17:14:48 +02:00
Gina Häußge
62aee50701 rel="noopener noreferrer" for external links 2016-05-02 11:48:08 +02:00
Gina Häußge
789e9922d1 Some improvements in the about dialog
* Sponsors => Supporters
  * Links to individual About dialog tabs from start page
  * Slight rewording here and there
  * rel="noopener noreferrer" for external links
2016-05-02 11:25:05 +02:00
Gina Häußge
58fc67bd99 Fixed feed links in feed viewer 2016-05-02 11:02:53 +02:00
Gina Häußge
656b8c53d7 Fixed wrong fakeAck call
Thanks @markwal for spotting this.
2016-05-02 10:23:27 +02:00
Gina Häußge
d322c365ce Updated feeds 2016-05-02 10:12:18 +02:00
Gina Häußge
652158d17a WIP: Announcement plugin 2016-05-02 10:12:17 +02:00
Gina Häußge
73d981ed6b Show - instead of None in About dialog if plugin has no license set 2016-05-02 10:10:27 +02:00
BillyBlaze
dd73a23940 Merge branch 'maintenance' into devel
Conflicts:
	src/octoprint/static/js/app/viewmodels/loginstate.js
2016-04-30 10:42:57 +00:00
BillyBlaze
8e98e9c40c Allow an invalid session to logout from logedin state 2016-04-30 10:36:03 +00:00
BillyBlaze
37f754ca77 Merge branch 'maintenance' into devel
Conflicts:
	src/octoprint/templates/tabs/control.jinja2
2016-04-21 19:41:09 +00:00
BillyBlaze
119f727c8d Knockify the distance on the control tab 2016-04-21 19:39:28 +00:00
Gina Häußge
cfce3713fe Added an additional unless function to UiPlugin
Allows overriding adding a potentially invalid config to the
preemptive cache for a plugin.
2016-04-21 19:26:44 +02:00
Gina Häußge
54fe75fb4e Merge branch 'improve/aboutDialog' into devel
Conflicts:
	.gitignore
	THIRDPARTYLICENSES.md
	setup.py
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/server/__init__.py
	src/octoprint/server/util/flask.py
	src/octoprint/server/views.py
	src/octoprint/settings.py
	src/octoprint/templates/dialogs/about/about.jinja2
	src/octoprint/templates/index.jinja2
2016-04-21 12:10:03 +02:00
Gina Häußge
5e6a7ef605 Added sponsor list 2016-04-21 11:56:56 +02:00
Gina Häußge
a319e8c497 Added trademark note to about dialog
(cherry picked from commit 48b984c)
2016-04-19 16:42:04 +02:00
Gina Häußge
3cc1c012bb Reset scroll position and selected tab in about dialog
(cherry picked from commit 4e84d62)
2016-04-19 16:41:43 +02:00
Gina Häußge
e0b888b2d0 First throw at an "About" dialog
(cherry picked from commit f2c07e8)
2016-04-19 16:41:30 +02:00