Commit graph

37 commits

Author SHA1 Message Date
Teja
a7acc7f7f4 Merge remote-tracking branch 'upstream/maintenance' into upstream_merge
Conflicts:
	requirements.txt
	src/octoprint/filemanager/__init__.py
	src/octoprint/plugins/cura/profile.py
	src/octoprint/plugins/cura/static/js/cura.js
	src/octoprint/plugins/cura/templates/cura_settings.jinja2
	src/octoprint/plugins/svgtogcode/__init__.py
	src/octoprint/printer/__init__.py
	src/octoprint/server/__init__.py
	src/octoprint/server/api/files.py
	src/octoprint/server/api/printer.py
	src/octoprint/server/api/settings.py
	src/octoprint/settings.py
	src/octoprint/static/js/app/main.js
	src/octoprint/static/js/app/viewmodels/appearance.js
	src/octoprint/static/js/app/viewmodels/connection.js
	src/octoprint/static/js/app/viewmodels/control.js
	src/octoprint/static/js/app/viewmodels/files.js
	src/octoprint/static/js/app/viewmodels/gcode.js
	src/octoprint/static/js/app/viewmodels/printerstate.js
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/static/js/app/viewmodels/terminal.js
	src/octoprint/templates/dialogs/settings.jinja2
	src/octoprint/templates/dialogs/settings/serialconnection.jinja2
	src/octoprint/templates/index.jinja2
	src/octoprint/templates/navbar/settings.jinja2
	src/octoprint/templates/stylesheets.jinja2
	src/octoprint/util/comm.py
2015-07-02 22:36:30 +02:00
Gina Häußge
b9102841b7 Removed accidentally committed line in requirements.txt 2015-03-12 19:19:42 +01:00
Gina Häußge
699f7b5278 More work on custom controls
Added a lot of documentation, more stream lining, should now work completely without having to define types but offer the same/more functionality than before. Backwards compatible too.
2015-03-12 17:23:55 +01:00
Gina Häußge
8744f436d3 We now depend on sarge >= 0.1.4 2015-02-11 09:58:52 +01:00
Gina Häußge
5a68d26d59 We now depend on sarge >= 0.1.4 2015-02-03 11:45:26 +01:00
Gina Häußge
19f9400b11 Read pkginfo data for plugins retrieved via entry_point and use that to populate author, version, name, description and url data in PluginInfo object
This data can still be overwritten from within the Plugin itself by setting the correponding __plugin_xyz__ variables, however it allows getting rid of some repetition if that data has already been specified in setup.py
2015-01-26 17:27:34 +01:00
Philipp Engel
221ea637be Merge remote-tracking branch 'upstream/devel' into mrbeam
Conflicts:
	src/octoprint/printer/__init__.py
	src/octoprint/server/__init__.py
	src/octoprint/settings.py
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/js/app/main.js
	src/octoprint/static/js/i18n/de.js
	src/octoprint/static/js/i18n/fr.js
	src/octoprint/static/js/i18n/he.js
	src/octoprint/static/js/i18n/nl.js
	src/octoprint/static/js/i18n/no.js
	src/octoprint/static/js/i18n/ro.js
	src/octoprint/templates/index.jinja2
	src/octoprint/templates/settings.jinja2
	src/octoprint/translations/de/LC_MESSAGES/messages.mo
	src/octoprint/translations/de/LC_MESSAGES/messages.po
	src/octoprint/translations/fr/LC_MESSAGES/messages.mo
	src/octoprint/translations/fr/LC_MESSAGES/messages.po
	src/octoprint/translations/he/LC_MESSAGES/messages.mo
	src/octoprint/translations/he/LC_MESSAGES/messages.po
	src/octoprint/translations/messages.pot
	src/octoprint/translations/nl/LC_MESSAGES/messages.mo
	src/octoprint/translations/nl/LC_MESSAGES/messages.po
	src/octoprint/translations/no/LC_MESSAGES/messages.mo
	src/octoprint/translations/no/LC_MESSAGES/messages.po
	src/octoprint/translations/ro/LC_MESSAGES/messages.mo
	src/octoprint/translations/ro/LC_MESSAGES/messages.po
	src/octoprint/util/comm.py
2015-01-09 18:11:40 +01:00
Philipp Engel
f1511c2076 bumped tornado to version 4.0.2 2014-12-16 18:45:52 +01:00
Philipp Engel
c8273e9e12 Revert "changed tornado dependency to local (RPi date fix)"
This reverts commit f812658714.
2014-12-16 18:41:43 +01:00
Philipp Engel
08b60784ea new try for fixed deps 2014-12-16 17:48:33 +01:00
Philipp Engel
f812658714 changed tornado dependency to local (RPi date fix) 2014-12-16 17:08:35 +01:00
Gina Häußge
468e4b6d55 Support for a new type of API key
In order to solve the initial handshake problem with apps, OctoPrint now supports so called app session keys which are basically API keys with a limited validity. Obtaining those keys is based on a handshake procedure backed by RSA signatures. OctoPrint needs to be aware of apps and their associated public keys (with the AppPlugin there exists a mechanism to add additional recognized apps by installing a plugin). Apps perform the handshake by first requesting a temporary key with very limited validity, then sending a message back to OctoPrint containing their id, version, the temporary key and a signature created with their private key over these three pieces of data. OctoPrint then tries to verify the signature and if successful unlocks the key to be used as a fully recognized API key.
2014-11-14 14:30:25 +01:00
Gina Häußge
084ca956fb Cache metadata in an LRU cache instead of fetching it from disk everytime 2014-10-20 16:49:53 +02:00
Gina Häußge
7db63b10e8 Use netifaces for ipaddress iteration 2014-09-07 01:11:11 +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
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
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
1ef9c617b3 Trying to get large file uploads to work 2014-08-02 10:24:41 +02:00
Gina Häußge
cbde819e07 Better error reporting for timelapse rendering and system commands, updated pnotify and added possibility to add a "more" section to notifications 2014-05-26 22:51:45 +02:00
Gina Häußge
4810aec10d Forgot to add new dependency on python watchdog 2014-05-19 17:55:52 +02:00
Gina Häußge
467d012bce Added sphinx dependencies to requirements 2013-12-15 18:48:52 +01:00
Gina Häußge
51ae782f02 Moved octoprint sources to "src" folder, adjusted setup.py and run script accordingly 2013-09-15 21:45:33 +02:00
Gina Häußge
4fbb8f1164 Added requirements for testing 2013-09-09 21:58:31 +02:00
Gina Häußge
dd19b69441 Replaced socket.io with SockJS 2013-08-26 17:37:13 +02:00
Gina Häußge
54175d2146 First throw at autologin capabilities 2013-08-18 18:33:21 +02:00
Gina Häußge
e90c1d9b28 Updated module versions 2013-06-18 21:41:12 +02:00
Gina Häußge
84caaeb119 Hotfix for recent Flask/Werkzeug versions breaking Flask-Login module 2013-06-15 16:58:18 +02:00
Gina Häußge
b9d467d23f Upgraded to most recent Flask-Principal version, since an attribute name was changed there which OctoPrint uses 2013-04-14 15:33:11 +02:00
Gina Häußge
93a73a0ad8 Added roles (user and admin) and according requirements 2013-04-13 22:19:17 +02:00
Gina Häußge
150d6cb53d First work on login and user management 2013-04-13 21:42:53 +02:00
Gina Häußge
9e964ea393 Switched config format from ini to yaml to allow more complex configuration options (in this case for custom controls) 2013-01-22 21:32:14 +01:00
Gina Häußge
d9f31fccfd Updated autodetection of server-down for socket.io and updated requirements 2013-01-18 23:44:07 +01:00
Gina Häußge
a85ea69fb0 Established settings mechanism
Allows reading and writing default serial port and baudrate (this also is available via the web interface) and setting the host and port on which the server should listen. Might allow persisting more options in the future.

The configuration file is stored in ~/.printerwebui/config.ini under Linux, in %APPDATA%/PrinterWebUI/config.ini under Windows and should be stored in ~/Library/Application Support/config.ini under MacOS X

Closes #1
2013-01-01 21:04:00 +01:00
Gina Häußge
a0cac835b5 Major reorganization to only include the communication stack from Cura. 2012-12-31 13:18:55 +01:00
Gina Huge
580ebedfa9 First parts of a webui for Cura 2012-12-25 11:55:00 +01:00
Ilya Kulakov
df08ba3ee6 Use Power as pip dependency, not git submodule. 2012-12-07 14:57:35 +07:00