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
Ishwar Agarwal
5937c0cc39
merged conflicts
2016-04-13 15:36:23 +00:00
Ishwar Agarwal
4f793de999
Replaced jquery with ko functions e.g. the button clicks and enabling button. Fixed an error in last commit: renamed a function that was already being used, self.changeLayer to self.shiftLayer.
2016-04-13 15:18:34 +00:00
eykrevooh
09559c5bbc
Renamed the self.incrementLayer to self.changeLayer in all four instances
2016-04-11 23:13:00 -04:00
eykrevooh
a514096622
Fixed the button names wrapping them in {{_(...)}} so that they can be translated
2016-04-11 22:47:02 -04:00
Philipp Baum
9316105224
Added setting to change GCode-visualizer file size threshold to ui #1145
2016-04-11 19:57:08 +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
agarwali
173c544a5e
Forgot to add names to Authors.md
2016-04-07 23:49:33 -04:00
agarwali
e5a8d4ad94
Added buttons to change layer in the gcodeviewer canvas, and fixed bug for layer up and down key-binding. It is now disabled when no file is uploaded
2016-04-07 23:28:41 -04: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
Ben Stern
e2d2a6f5a4
Support Fahrenheit display.
2016-03-24 20:46:42 -04: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
Gina Häußge
d8ea8efd68
Added @Alex9779 to AUTHORS.md
2016-03-18 15:36:59 +01:00
Gina Häußge
cbb44ffce8
Small whitespace fix & position change of help text
2016-03-18 15:31:44 +01:00
Gina Häußge
d31b85b6e3
Use dict constructor instead of {} + update
...
Way cleaner look and more consistent.
2016-03-18 15:25:27 +01:00
Gina Häußge
1f4f698046
Minor logic change to simplify code
2016-03-18 15:24:59 +01:00
Gina Häußge
4d12f3ece9
Merge branch 'zChangeTimelapseWithRetractionZHop' of https://github.com/Alex9779/OctoPrint into pr/Alex9779/zChangeTimelapseWithRetractionZHop
...
Conflicts:
src/octoprint/server/api/timelapse.py
src/octoprint/static/css/octoprint.css
src/octoprint/static/js/app/viewmodels/timelapse.js
src/octoprint/timelapse.py
2016-03-18 15:09:38 +01:00
Gina Häußge
b54e1b44a4
Added checksum checking to virtual printer
2016-03-18 15:00:03 +01:00
Gina Häußge
1a4c06d6f6
Added flag to trigger ok for resend requests
...
That's necessary to keep communications going in case of a resend request
for firmwares that do not send an ok after a resend request.
2016-03-18 14:59:13 +01:00
Gina Häußge
7bdc4418fd
Merge branch 'maintenance' into devel
...
Conflicts:
CHANGELOG.md
docs/configuration/config_yaml.rst
src/octoprint/plugins/virtual_printer/virtual.py
src/octoprint/server/__init__.py
src/octoprint/settings.py
src/octoprint/static/js/app/dataupdater.js
src/octoprint/static/js/app/viewmodels/settings.js
src/octoprint/templates/dialogs/settings/serialconnection.jinja2
src/octoprint/util/comm.py
2016-03-16 11:24:52 +01:00
Gina Häußge
a229cbfd49
maintenance branch is now 1.2.11.dev
2016-03-16 10:55:08 +01:00
Gina Häußge
692166f067
Preparing release of 1.2.10
2016-03-16 09:38:58 +01:00
Gina Häußge
69dca5b58c
Updated german translation
2016-03-16 09:22:10 +01:00
