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
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
Gina Häußge
f050b4e5cb
Merge remote-tracking branch 'origin/maintenance' into maintenance
2016-04-19 14:57:46 +02:00
BillyBlaze
fdbb24f467
Merge branch 'maintenance' into devel
2016-04-09 21:48:54 +00:00
BillyBlaze
5a3e9e7aba
Fix wrong css data-binding
2016-04-09 21:46:32 +00:00
Salandora
a2672f3fcc
Merge branch 'maintenance' into devel
2016-04-02 15:46:48 +02:00
Salandora
8f0b7dd6d1
Fix timelapse postroll
...
Images got captured with wrong filename
Additionally fixed some refactoring mistakes
2016-04-02 15:41:27 +02:00
Gina Häußge
45a79b1939
Fixed a bunch of issues with the software update wizard
2016-03-30 15:45:13 +02:00
Gina Häußge
aecedfa57f
Wizard for software update plugin
2016-03-30 11:28:41 +02:00
Gina Häußge
c7da95e91a
Added wizard for setup of server commands
2016-03-30 11:28:40 +02:00
Mark Walker
bd68bbaa05
Merge branch 'maintenance' into devel
...
Conflicts:
src/octoprint/static/js/app/viewmodels/files.js
src/octoprint/static/js/app/viewmodels/settings.js
src/octoprint/templates/dialogs/settings/serialconnection.jinja2
2016-03-29 10:35:47 -07:00
Mark Walker
183ca3291b
If no SD card support, remove SD file filter
...
When SD card support is disabled on the server, remove any client side
filtering to just SD files since there aren't any and there won't be UI
turn remove the filter either. Should address #1300
2016-03-28 12:59:08 -07:00
Salandora
146c4b4165
Added the ability to control the layer slider of the gcodeViewer with the keyboard (Up Arrow, Down Arrow, Page Up, Page Down) as requested in Issue #1149
2016-03-26 16:54:29 +01:00
Gina Häußge
77bc2e5a0a
Docs for UiPlugin caching methods
2016-03-24 17:14:58 +01:00
Gina Häußge
48b984c150
Added trademark note to about dialog
2016-03-24 16:44:22 +01:00
Gina Häußge
ee185230a4
Refactored plugin docs + improved docs on sortables
2016-03-24 16:42:41 +01:00
Gina Häußge
6d95a5849b
Add docs for hook ordering
2016-03-24 09:38:52 +01:00
Gina Häußge
621d991788
Better error reporting in update script & CLI
2016-03-23 13:07:04 +01:00
Gina Häußge
084263d811
Stay compatible to Click 5.x
...
There could be some odd circumstances in development environments
leading to an older Click version being installed during an update restart,
so since it doesn't hurt as much to stay backwards compatible here, just
be it.
2016-03-23 12:35:24 +01:00
Gina Häußge
a462f1ce3d
Fix command line argument parsing with Click 6.x
...
On win32 systems, Click 6.x uses win32 library functions to retrieve
the command line arguments in order to not have their encoding
destroyed. That clashes with rewriting of sys.argv like e.g. the PyCharm
debugger is doing it, causing the debugger parameters to be passed
on to the click parser.
Added a workaround that detects if sys.argv and the os specific
argument list don't have the same length and truncates the os specific
list if that is the case, in order to not pass on arguments from the os
that where already cut off from sys.argv by something else.
2016-03-23 12:05:45 +01:00
Gina Häußge
1d3dfffc67
Some documentation fixes
2016-03-23 10:40:36 +01:00
Gina Häußge
05ce46ccc4
Update click and cookiecutter dependencies
2016-03-23 10:40:09 +01:00
Gina Häußge
ca0fd2397e
Fix a bunch of issues with the update script
...
* was still only reading one line per 500ms, now reads
all available lines from stdout and stderr
* patch was written with too many newlines
* git reset was missing --hard parameter for forced versions
* proper unicode handling
* added git clean for code base reset
* make sure path to python executable doesn't have left-over
quotes on windows
2016-03-23 10:39:20 +01:00
Mark Walker
c433e32e6c
Include extra extruder start/end.gcode in import
...
Prior to this change, start2.gcode, end2.gcode, start3.gcode,
end3.gcode, etc. were ignored due to the index coming before the period.
Fixes #1289
2016-03-22 22:16:26 -07:00
