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

3640 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
cbb692de30 Forgot to rename SPONSORS.md in .gitignore 2016-05-02 17:41:03 +02:00
Gina Häußge
cc7dcbf6b6 Added support link to README 2016-05-02 17:38:50 +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