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
34a860efda
Added confirmation dialog and different logo for print job restart
...
Closes #98
2013-04-10 16:37:12 +02:00
Gina Häußge
46173bc35e
Merge branch 'webcamMove' into devel
2013-04-07 22:15:15 +02:00
Gina Häußge
3174559072
Moved webcam view to Control tab
2013-04-07 22:15:04 +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
e70071f6c1
Removed waitForWait again (that didn't make much sense to begin with...)
2013-04-01 17:31:02 +02:00
Gina Häußge
9618407aed
Merge branch 'devel' into repetier
...
Conflicts:
octoprint/server.py
2013-04-01 17:25:08 +02:00
Gina Häußge
d20aae6474
Added homepage to footer
2013-04-01 17:23:56 +02:00
Gina Häußge
edea3789b2
Made Webcam omnipresent
2013-04-01 17:20:25 +02:00
Gina Häußge
c01b49fbc7
Forgot to commit Font Awesome
2013-03-30 18:29:13 +01:00
Gina Häußge
cfdfad1c06
Changed color and font-size of footer
2013-03-30 18:28:24 +01:00
Gina Häußge
b5b023a29c
Merge remote-tracking branch 'splitbrain/footer' into devel
2013-03-30 18:22:33 +01: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
Gina Häußge
f050567a1c
User thread lock instead of boolean to ensure only one concurrent sending thread, introduced wait flag for repetier printers
2013-03-29 22:17:44 +01:00
daftscience
48a2fd71a7
More reliable initialization of communication with repetier
2013-03-26 07:25:16 +00: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
Dale Price
71f3dbbdcc
add tooltips to file controls
2013-03-25 23:55:53 -05:00
Tom
9b2d166c6c
Prevents manual commands from interupting other commands
2013-03-25 14:01:48 -04:00
Andreas Gohr
9314e83665
added footer
...
makes it faster, to refer to the OctoPrint site when problems occur.
2013-03-24 16:11:54 +01: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
1477fb31fb
Merge branch 'devel'
2013-03-17 16:42:48 +01:00
Gina Häußge
192952c03f
Logging statements for timelapse creation
2013-03-17 16:31:20 +01:00
Gina Häußge
456ded3f36
Fixed off by one error in resend loop
2013-03-17 13:53:38 +01:00
Gina Häußge
ad1cbca22a
Added known error messages for checksum mismatches or expected line issues from Repetier to recognized "auto-correction" errors, made code around all that a bit more readable.
2013-03-17 10:58:34 +01:00
Gina Häußge
d6a83d174f
Overhauled resend handling to also work with alwaysSendChecksum feature. Also introduced new feature flag resetLineNumbersWithPrefixedN to make M110 commands send the target line number as part of their N prefix (Repetier), not as a separate N parameter (Marlin & co)
2013-03-16 18:25:39 +01:00
daftscience
5e22b4b096
Reset currentLine when changing state to printing
...
This keeps gcodePos and current line in sync when changing status to "Printing"
2013-03-16 05:30:02 -03:00
Gina Häußge
45419422d7
Merge branch 'devel' into repetier
2013-03-16 02:26:00 +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
8ef580cfd9
Two changes to try to achieve repetier firmware compatibility
...
- Read a "wait" as an empty line in order to send keep alive temperature updates
- Added option to add a checksum to all commands. Needed to add current line tracking for this, let's hope that we'll never get out of synch here...
2013-03-16 01:57:05 +01:00
Gina Häußge
7e595b27ed
Bugfix: configfile parameter was not properly used for settings in all cases
2013-03-16 01:48:28 +01:00
Gina Häußge
e08783c8bf
Merge remote-tracking branch 'daprice/master' into devel
2013-03-16 00:28:37 +01:00
Dale Price
088253e564
work around a bug in iOS 6 where ajax requests get cached and only work once
2013-03-14 20:55:02 -05:00
Dale Price
d564176c9c
fix localStorage bug by not trying (and failing) to make it a multidimensional array; use JSON to store array of filters in localStorage
2013-03-13 03:01:18 -05:00
Gina Häußge
4b8260b933
Fixed some indentation
2013-03-11 21:46:05 +01:00
Gina Häußge
e2798de727
Merge branch 'daftscience-master' into devel
2013-03-11 21:15:27 +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
Tom
f10e10f5b3
Converts commands uppercase
2013-03-11 10:39:03 -04:00
Tom
2904bd62d7
Enter key sends command
...
Sending a command also clears the field.
2013-03-11 10:38:41 -04: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
09adb8dfda
Fixed TimedTimelapse
...
Interval parameter gets now accessed correctly
2013-03-11 09:38:36 +01:00
Gina Häußge
1ebc0c0ce9
Temporary workaround for the gcode viewer options not cooperating until those are integrated a bit more.
...
Targets #35 .
2013-03-10 22:06:08 +01:00
Gina Häußge
53d6ee2484
Added credits to daemon.py
2013-03-10 21:08:14 +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
a261896186
Fixed using wrong item collection for timelapse files, lead to always displaying all files, not just the ones of the current page.
2013-03-09 12:58:15 +01: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
3b50fdcf3f
Switched column sizes for gcode and timelapse file tables to pixel values.
2013-03-08 23:25:04 +01:00
Gina Häußge
70f5ea3f7f
Fixed configuration of snapshot url
2013-03-08 23:24:30 +01:00
Gina Häußge
133831e08e
Fixed buggy column styles for gcode and timelapse file tables
2013-03-08 21:47:51 +01:00
Gina Häußge
f1dc0a629a
Fixed state information for gcode file upload. Now offers some status text that gives feedback whether file is still uploading to the server or being saved to disk on the server.
2013-03-08 21:05:53 +01:00
Gina Häußge
95d6c18183
Use contrast function for calculating text color in navbar
2013-03-08 20:36:18 +01:00
Richard Mitchell
26c6c0fb5f
Missing semi-colon causing problems
2013-03-08 06:34:31 +00:00
Gina Häußge
6eb8991035
Migrated ui.css to LESS (just some small touch ups compared to plain css version, nothing fancy)
2013-03-07 22:19:33 +01:00
Gina Häußge
59ffa94cde
Playing around with less...
2013-03-06 23:38:31 +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
dae1c0367a
Merge branch 'daprice-sorting_persistence' into devel
...
Conflicts:
octoprint/static/js/ui.js
2013-03-03 19:38:26 +01:00
Gina Häußge
98a7c3d8b8
New option to sort gcode files by size, reverted former utc "fix" (doesn't work anymore, works without the fix, I have no idea...), added adjusted modernizr, delete metadata from old gcode file version when adding a new one
2013-03-03 19:37:52 +01:00
Gina Häußge
9b3fc0c65e
Set default instance name to empty string
2013-03-03 16:57:35 +01:00
Dale Price
eecb19ecf6
store file sorting options in the browser's LocalStorage
2013-03-02 22:56:58 -06:00
Gina Häußge
c1f2866a94
Moved totalExtrusion calculation into existing branches, added calculation of currentE for relative extruders (in case GCODE switches back to absolute)
2013-03-02 13:39:44 +01:00
Gina Häußge
766e9f0e7f
Show custom title first in head in case of small tabs
2013-03-02 13:38:30 +01:00
Gina Häußge
63888f5e2e
Merge branch 'AxTheB-devel' into devel
2013-03-02 13:29:08 +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
Gina Häußge
bd28c73bc5
Merge branch 'richard-jm/appearance' into devel
2013-03-02 12:20:24 +01:00
Richard Mitchell
260606601d
Title and limited color control via settings
2013-03-02 10:56:32 +00:00
Richard Mitchell
943d734993
That was easy enough to continue temp monitoring whilst paused
2013-03-01 22:19:58 +00:00
Richard Mitchell
b2408c92a5
Didn't add the restart button after all
2013-03-01 21:57:13 +00:00
Richard Mitchell
324601dfed
Did clever stuff at first for restart but replacing the appearance of start is all that is needed I believe
2013-03-01 21:52:15 +00:00
Václav 'Ax' Hůla
d667a0ff56
Fix filament measurement for relative extruders
2013-03-01 17:55:25 +01:00
Gina Häußge
727b4659cb
Bugfix: added getter for interval attribute on TimedTimelapse, went missing since a refactoring a couple of weeks back.
2013-02-28 09:46:26 +01:00
Gina Häußge
c015a67a70
Fixed some whitespace
2013-02-23 23:55:26 +01:00
Gina Häußge
899d618efe
Couple of fixes while merging...
2013-02-23 22:46:29 +01:00
Richard Mitchell
e828d4e7b7
New settings split off
2013-02-23 19:37:38 +00:00
Richard Mitchell
0e6fd2bde2
Merge remote-tracking branch 'upstream/devel' into devel
2013-02-23 18:40:28 +00:00
Richard Mitchell
e79aede3f4
Bug in bootstrap forcing use of knockout click binding - actually works better
2013-02-23 18:38:18 +00:00
Richard Mitchell
aa2108e9c3
Change to ° required binding to html
2013-02-23 18:02:14 +00:00
Richard Mitchell
8a3df3d4e7
Easier than I thought to add/remove temperature profiles
2013-02-23 17:59:27 +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
42838f8b58
Fixed the navigate to top of page on e.g. Set ABS issue
...
Also replaced to HTML ° for degrees symobol
2013-02-23 10:11:42 +00:00
Richard Mitchell
4c35adb347
Separated settings into separate template to improve ease of maintenance.
...
Reduced word witdth and added add-ons for units.
2013-02-23 10:01:52 +00: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
1c9854b6c1
Merge branch 'master' into devel
2013-02-17 22:31:11 +01: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
Dale Price
e4f06ba0d0
Revert "Add tooltips to explain some icon-only controls"
...
This reverts commit 96fb0c2ce1
2013-02-17 00:18:30 -06:00
Dale Price
96fb0c2ce1
Add tooltips to explain some icon-only controls
2013-02-17 00:08:16 -06:00
Dale Price
0266bcd593
optimize image file size on iOS web clip icons
2013-02-16 23:32:31 -06:00
Dale Price
48f0af2e7a
Add iOS web clip icons
2013-02-16 23:28:23 -06: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
Gina Häußge
b64662c460
Merge remote-tracking branch 'origin/devel' into devel
2013-02-16 11:49:20 +01:00
Richard Mitchell
9127cf01a0
float buttons to left to eliminate whitespace
2013-02-13 20:04:09 +00:00
