Commit Graph

48 Commits (fc56744705d433439e2518f6d86913ec90f6f317)

Author SHA1 Message Date
Gina Häußge 9e9705f1ce Follow up to commit b9d467d
Forgot to change session key to new Flask-Principal attribute name, which caused issues on logout sometimes (but weirdly not always).

Closes #107
2013-04-26 22:26:19 +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 d7d8bba2e9 Fixed access to admin-only resources in case of disabled access control 2013-04-14 15:04:39 +02:00
Gina Häußge 19dc238f06 User management now working
Also reorganized javascripts a bit (as preparation for some refactoring coming up) and renamed templates from ".html" to ".jinja2".
2013-04-13 22:21:53 +02:00
Gina Häußge 3e5a6d3679 Furhter work on user management 2013-04-13 22:20:41 +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 1febcd671a "Writing" backend methods now protected (need logged in user (or dummy user if access control is disabled) to perform action), most "writing" frontend controls disabled if no logged in (or dummy) user returned from backend. 2013-04-13 22:19:17 +02:00
Gina Häußge b27e1ce15e User factory method for creating SocketConnection object for Tornadio2 2013-04-13 21:45:20 +02:00
Gina Häußge 874a7421e9 Login and logout working for the first time 2013-04-13 21:45:20 +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 656aeb0189 Fixed evaluation of boolean argument for loadAndPrint from UI
Closes #96.
2013-04-07 22:06:17 +02:00
Gina Häußge f70649b0d2 Removed a couple of redundancies for loadAndPrint button, actions are now disabled if they don't make sense 2013-03-30 18:21:49 +01:00
Dale Price 021f413c12 add "Load and Print" button which automatically starts printing when a gcode file is done loading.
Solves foosel/OctoPrint#91
2013-03-26 00:09:36 -05:00
Gina Häußge 178b2f36d7 Only log the terminal output to disk if the "--debug" commandline switch is given
Otherwise slowdowns might be caused on Raspberry Pi when dumping all printer communication to SD
2013-03-17 22:32:35 +01:00
Gina Häußge 8543d628b5 New serial log at ~/.octoprint/logs/serial.log
Logs the same content as the terminal tab and is restricted to 2MB in size (hopefully).

Closes #77
2013-03-16 02:24:33 +01:00
Gina Häußge 363f00775b New config options for daemonization, configfile location and basedir location
Using --daemon {start|stop|restart} OctoPrint can now be daemonized/controlled in daemon mode. Via --pidfile it's possible to set the pidfile to use, --configfile allows specification of the config.yaml to use, --basedir specifies the location of the basedir from which to base off the upload, timelapse and log folders. I also updated the README to include some config file settings which were previously undocumented.
2013-03-11 21:00:43 +01:00
Gina Häußge b23098a265 Fixed TimedTimelapse
Fixed access of interval attribute
2013-03-11 09:39:54 +01:00
Gina Häußge 1b1f118646 Merge branch 'richardjm-daemon' into daemon
Conflicts:
	octoprint/server.py
2013-03-10 19:11:16 +01:00
Gina Häußge ff1678ab30 Set shell=True in subprocess calls to allow usage of string commands (instead of lists separating command from arguments) 2013-03-10 17:17:50 +01:00
Gina Häußge eb3832b028 Implemented support for customizable system actions/commands, e.g. for shutting down/rebooting the system OctoPrint's running on from within the UI. 2013-03-10 17:04:05 +01:00
Richard Mitchell 07caef034b Improve comment reason 2013-03-10 13:40:53 +00:00
Richard Mitchell 37f3f771fb Incorrect indentation 2013-03-10 13:18:34 +00:00
Richard Mitchell 7226c1edae Lots of work to daemonise - logging still not working 2013-03-10 13:14:37 +00:00
Gina Häußge 1d2a2c873f Fixed settings for ffmpeg path 2013-03-09 00:29:07 +01:00
Gina Häußge 07d4a8fd4f Added (optional!) watermark addition to generated timelapse movies. 2013-03-09 00:23:52 +01:00
Gina Häußge 70f5ea3f7f Fixed configuration of snapshot url 2013-03-08 23:24:30 +01:00
Gina Häußge 1fbb73e448 Refactored pagination/sorting/filtering of gcode files into own configurable listHelper now used to provide pagination etc to both gcode and timelapse file list. 2013-03-06 23:27:16 +01:00
Gina Häußge e0b405054a Fixed some whitespace and reworked custom title to always include an "OctoPrint" prefix (gotta protect the "brand" here ;)) 2013-03-02 12:42:35 +01:00
Richard Mitchell 260606601d Title and limited color control via settings 2013-03-02 10:56:32 +00:00
Richard Mitchell 0e6fd2bde2 Merge remote-tracking branch 'upstream/devel' into devel 2013-02-23 18:40:28 +00:00
Richard Mitchell 9ba88a7d1a New temperature profile settings and hooked into ui. WIP: add and remove profiles 2013-02-23 17:47:01 +00:00
Gina Häußge 2e766a7eca Added custom controls with multiple commands
Closes #48
2013-02-23 18:08:59 +01:00
Richard Mitchell 9e351339a4 Added features for quick setting of temperatures for PLA and ABS - configured via new settings.
Not perfect, I'd like to show temperature to be set in UI.
On clicking it always moves to the top of the page.
The overflow and temp layout changes are to allow the drop down to display outside of the tab.

Is it worth having more temp boxes e.g. Nylon? - array like similar to move speeds?
2013-02-23 01:09:30 +00:00
Gina Häußge 1c4203b708 Added settings dialog for configuring OctoPrint
Warning: Many settings will need a restart of OctoPrint to take effect, adding corresponding notes is still a TODO. There's also no proper validation and error handling yet, so use at your own risk.
2013-02-17 22:30:34 +01:00
Gina Häußge cbae792dbe Added logging to file on top of to stdout, temperature parsing now can cope with negative temperature (shouldn't normally occur but seems to happen with buggy firmware), added option to wait for "start" response from printer firmware before switching to state "operational" (defaults to previous behaviour) 2013-02-17 17:47:06 +01:00
Gina Häußge f03056c1b2 Made settings module more flexible regarding variable path lengths to needed values, made speed for printer movement configurable 2013-02-16 20:28:09 +01:00
Richard Mitchell 4035ebcec5 Various control for jogging, speed reduced 2013-02-10 16:00:47 +00:00
Gina Häußge 8c9c2ecfee Added extrusion controls, kept motor and fan controls in general control area as suggested (recurring demand suggests that they definitely aren't something to be added by anyone individually via custom controls), made custom controls always position themselves below the general stuff. 2013-02-10 00:40:06 +01:00
Gina Häußge 5f55ebd90a GCode file list now automatically switches to page with newly uploaded file as soon as upload request comes back from backend as finished. Progress bar also gets emptied again then. Careful: might take a bit after the upload progress reaches 100% since the file still has to be written to disk in the backend (have to look into how to get this done in a streaming way), metadata analysis gets triggered after returning a response.
Different sorting options are still on my mental todo list ;)

Closes #34.
2013-02-04 22:24:32 +01:00
Gina Häußge 959feba9ca First version with gcode viewer integration.
Did some minor changes: renamed gcode tab, renamed gcode file download endpoint, added some margin for gcode viewer accordion. Not sure yet what to do about the gcode viewer controls/settings, until I figure this out they'll stay where they are now ,)
2013-02-03 22:01:11 +01:00
Gina Häußge ea52bbfb14 Merge branch 'gcodeViewer' into devel
Conflicts:
	octoprint/server.py
	octoprint/settings.py
	octoprint/static/js/ui.js
2013-02-03 21:38:00 +01:00
Gina Häußge 6fd0646128 Revamped gcode analysis.
Now UI and backend take data from saved metadata (if available). Metadata gets written after file upload and also on startup (for files that have not been added yet). Gcode analysis is interrupted if a printjob is started and resumed when it ends. Frontend is notified when new metadata comes available and UI triggers reload of gcode file list.  Also started on implementing proper logging.
2013-02-03 21:14:22 +01:00
Alex Ustyantsev e49669430b gCodeVisualizer can be enabled as a feature in config now (enabled by
default)
2013-02-03 12:04:41 +03:00
Alex Ustyantsev 7c00dd5594 Initial gCodeViewer (http://github.com/hudbrog/gCodeViewer) integration 2013-02-03 12:01:01 +03:00
Gina Häußge 49cd1ffbd6 Gcode filemanagement now lives in its own module. Upload triggers gcode analysis, result is stored into metadata file. Print jobs triggered and their results are saved as well. Adjusted UI to display gcode analysis result and last print date and (color coded) result if available. Also adjusted gcode file list to color code entries according to last print result. 2013-01-30 20:56:17 +01:00
Gina Häußge ee7a1f9615 Added custom controls via configuration file.
Closes #13
2013-01-27 18:28:11 +01:00
Gina Häußge 0552d43b16 Further work on custom controls and custom bitrate for timelapses 2013-01-27 11:12:28 +01:00
Gina Häußge 720f3b3eb6 Renamed from Printer WebUI to OctoPrint
The location of the config folder has changed. OctoPrint will try to migrate the configuration from its old location (~/.printerwebui, ...) to its new one (~/.octoprint, ...). For this to work the following conditions must be met: 1) the old config folder exists and is a directory 2) the new config folder does not exist at all. The migration functionality will be in the future.
2013-01-18 23:44:11 +01:00