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

1923 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
18952c57ff Added automatic migration of old event subscription format to the new one 
(cherry picked from commit e7088ef)
 2014-08-31 22:54:16 +02:00
Gina Häußge
4296b49570 Some first entries into the release notes list for the next release (WIP) 2014-08-31 22:52:18 +02:00
Gina Häußge
95f084fb36 i18n: Forgot to include compiled javascript i18n resources for Romanian 2014-08-31 22:03:00 +02:00
Gina Häußge
0b237a2469 i18n: Added Romanian translation 2014-08-31 22:02:23 +02:00
Gina Häußge
8c34a4fd0a Improved support of translation related things in setup.py 
Allow specifying a locale for refreshing only that translation from
extracted messages, new command for just extracting messages.
 2014-08-31 21:59:40 +02:00
Gina Häußge
f970594c28 Merge branch 'translation' of https://github.com/guysoft/OctoPrint into devel 2014-08-31 21:44:18 +02:00
Gina Häußge
02c8a1703a Merge branch 'master' into devel 2014-08-31 21:41:54 +02:00
Gina Häußge
590d2f2661 Added docs-specific requirements.txt for the docs to build on readthedocs.org 2014-08-31 21:40:03 +02:00
guysoft
425f6f7c0b Add Hebrew compiled translation 2014-08-31 18:51:11 +03:00
guysoft
c229dc1548 Adding Hebrew strings to translation 2014-08-31 18:46:48 +03:00
Gina Häußge
e4cc84b771 Merge branch 'master' into devel 
Conflicts:
	docs/index.rst
	setup.py
	src/octoprint/server/__init__.py
	src/octoprint/server/api/__init__.py
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/gcodeviewer/js/renderer.js
	src/octoprint/static/js/app/viewmodels/printerstate.js
	src/octoprint/static/less/octoprint.less
	src/octoprint/templates/index.jinja2
 2014-08-31 15:28:07 +02:00
Gina Häußge
9b3569be50 Added release notes for 1.1.0 and documentation of OctoPrint's events and the version resource 2014-08-31 15:17:32 +02:00
guysoft
a8e9c5aaf2 Initial creation of Hebrew translation 2014-08-31 13:28:16 +03:00
Gina Häußge
661302f698 Merge branch 'staging' 2014-08-30 10:14:18 +02:00
Gina Häußge
854387b2d0 Changed default path to OctoPrint executable 
When installed via python setup.py install, it defaults to /usr/local/bin/octoprint, not /usr/bin/octoprint
(cherry picked from commit 7a305b5)
 2014-08-30 10:12:13 +02:00
Gina Häußge
7a305b5a5c Changed default path to OctoPrint executable 
When installed via python setup.py install, it defaults to /usr/local/bin/octoprint, not /usr/bin/octoprint
 2014-08-30 10:09:29 +02:00
Gina Häußge
9f463707ee Merge remote-tracking branch 'origin/master' 2014-08-30 10:08:52 +02:00
Gina Häußge
e1bcbae975 Changed default path to OctoPrint executable 
When installed via python setup.py install, it defaults to /usr/local/bin/octoprint, not /usr/bin/octoprint
 2014-08-30 10:08:40 +02:00
Gina Häußge
e77efde503 Make key removal from session more solid 
Do not die a horrible death if the key you are attempting to remove from the session upon logout doesn't exist. Attempt at
fixing #556
 2014-08-29 09:26:57 +02:00
Gina Häußge
4583128c02 i18n: First version of french translation 2014-08-28 19:23:10 +02:00
Gina Häußge
35b1232b0a Fixed hen-egg problem in setup.py 
setup.py tried to use babel imports before the necessary requirements
were fetched. Now only tries to import that stuff if
babel_{refresh|compile|new} is called instead of importing it
in the file header.
 2014-08-28 15:59:57 +02:00
Gina Häußge
bc8fe527f7 Updated german translation to include "Connection" too 2014-08-28 15:54:32 +02:00
Gina Häußge
2943343003 Forgot to make "Connection" translatable, fixed 2014-08-28 15:50:42 +02:00
Gina Häußge
4e061ef385 i18n: Made the string "OctoPrint" translatable too to allow for different writing systems 2014-08-27 20:11:45 +02:00
Gina Häußge
571cf9c5d9 Added .tx directory for transifex client to source control 2014-08-27 19:42:28 +02:00
Gina Häußge
22bde81712 i18n: Removed a test string I had forgotten to remove earlier and also realised that I hadn't pushed the most recent version yet 2014-08-27 19:41:06 +02:00
Gina Häußge
a9736b96c0 po2json is only needed in development environments, so don't try to always import it 2014-08-27 15:13:19 +02:00
Gina Häußge
0adbef9696 Updated german translation 2014-08-27 14:49:39 +02:00
Gina Häußge
53e52c841b First version of OctoPrint with i18n/l10n support 
Also included is a translation for (informal) german.

New languages can be added with "python setup.py babel_new --locale=<language code>" which will create the corresponding .po file from the existing .pot file under "src/octoprint/translations/<language code>". Translations can be refreshed from strings in source with "python setup.py babel_refresh". Existing translations can be compiled into usable translation files (.mo for python and .js for Javascript) via "python setup.py babel_compile".

 You'll need to install the development dependencies for all of this to work, just issue "pip install -r requirements-dev.txt"

 Note: numbers are not yet correctly formatted for their respective locale (e.g. "2.5mm" instead of "2,5mm" in german).
 2014-08-27 14:46:46 +02:00
Gina Häußge
b78bb9e970 Make watched folder configurable via UI 2014-08-19 15:55:52 +02:00
Gina Häußge
d6959f64c3 Merge remote-tracking branch 'origin/staging' into staging 2014-08-14 16:56:53 +02:00
Aaron Bieber
c5dbc71db3 add serial types for OpenBSD 
(cherry picked from commit a439dc4)
 2014-08-14 16:55:00 +02:00
Gina Häußge
fbd9440711 Merge pull request #551 from qbit/devel 
add serial types for OpenBSD
 2014-08-14 16:37:36 +02:00
Aaron Bieber
a439dc4cd8 add serial types for OpenBSD 2014-08-14 08:23:22 -06:00
Gina Häußge
fe3a47f2d5 Resolved issue with tornado 4.0.1 (incompatibility between existing and custom http1connection implementation) 
Compare #544 and #546. Pinned tornado version to 4.0.1 (since the change in this commit is not backwards compatible), dependency update is mandatory.
 2014-08-13 20:07:02 +02:00
Gina Häußge
9509c8027b Pinned tornado to 4.0.0 
4.0.1 is currently causing issues with OctoPrint, this is a quick fix for that until I have the opportunity to investigate this further.

Workaround for second issue in #544
 2014-08-13 18:16:51 +02:00
Gina Häußge
519429cebb Correctly check for null values and don't try to access non existing keys 
Fixes #544
 2014-08-13 09:46:52 +02:00
Gina Häußge
4aee779385 Added two file headers 2014-08-12 15:35:56 +02:00
Gina Häußge
7903119cb4 Removed unused code 2014-08-12 15:29:04 +02:00
Gina Häußge
ef1f96f382 Moved development requirements to a different file 
We don't need nose, mock and sphinx + dependencies on pure runtime installations
 2014-08-12 15:10:30 +02:00
Gina Häußge
af9a6a8a6e Don't overwrite query string of webcam URI 
If there's a query already present, just append the timestamp to it with a & in between instead of creating a new query.
(cherry picked from commit 51c77be)
 2014-08-12 09:54:25 +02:00
Gina Häußge
dffa00dc5e If a tool did not extrude anything, skip it in the filament usage summary 
Also targets #539
 2014-08-11 18:26:33 +02:00
Gina Häußge
6c5b32d92b New option to set default extrusion length in Control panel 
Adds a new config key printerParameters.defaultExtrusionLength which can be configured via the settings dialog in the Printer section and then gets used to set the placeholder value on the extrusion/retraction control and as fallback if the user entered no value when clicking the Extrude/Retract button.

Closes #513
 2014-08-11 17:37:26 +02:00
Gina Häußge
7d5c55fc95 Added sanity check for extruder selection in gcode files 
Any T command targeting a number higher than the value specified in the settings for gcodeAnalysis.maxExtruders (defaults to 10) will be ignored and trigger a warning in the log file.

Fix for #539
 2014-08-11 15:21:50 +02:00
Gina Häußge
017654852d We want the year in the docs to always be current 
(cherry picked from commit f7f7d5c)
 2014-08-08 17:14:50 +02:00
Gina Häußge
9e2e616e1b Let's see if fetching the version from the octoprint module works on rtd... 
(cherry picked from commit 85fc2b2)
 2014-08-08 17:14:46 +02:00
Gina Häußge
0d5d28e4a6 Submit login form upon enter in password field, switch to password field upon enter in username field 
(cherry picked from commit ff22ab0)
 2014-08-08 17:13:53 +02:00
Gina Häußge
90e50db189 Also update the metadata correctly when an analysis finishes 
Closes #476 for good
(cherry picked from commit 65624ed)
 2014-08-08 17:13:41 +02:00
Gina Häußge
e9a7cad202 Made the navbar static instead of fixed to improve usability on mobile devices 
This is just a hack really, the proper approach would be to finally move to a real responsive design, but this should prove as a valid workaround until that is realized.

Closes #257 for now.
(cherry picked from commit 02212bd)
 2014-08-08 17:12:01 +02:00
Gina Häußge
60cf0b1099 Made the navbar static instead of fixed to improve usability on mobile devices 
This is just a hack really, the proper approach would be to finally move to a real responsive design, but this should prove as a valid workaround until that is realized.

Closes #257 for now.
(cherry picked from commit 02212bd)
 2014-08-08 17:10:42 +02:00