Gina Häußge
46500cea7c
Implemented configurable terminal filters
2013-08-27 21:31:12 +02:00
Gina Häußge
757294d2e2
Merge branch 'devel' into customTerminalFilters
2013-08-26 17:46:36 +02:00
Gina Häußge
dd19b69441
Replaced socket.io with SockJS
2013-08-26 17:37:13 +02:00
Gina Häußge
ce7ccc136b
Properly handle failed uploads: display message, reset upload status
2013-08-25 15:03:27 +02:00
Gina Häußge
3e0abf1b20
New custom control type "feedback"
...
Like "feedback_command", but without the button
2013-08-21 20:33:55 +02:00
Gina Häußge
03c9c684bf
custom terminal filter WIP
2013-08-18 18:42:09 +02:00
Gina Häußge
94b8d6601d
Allow sending temperature updates with enter
...
Also some refactoring.
Closes #208 .
2013-08-11 22:25:47 +02:00
Gina Häußge
84ff4b6416
Refactored ui.js into single files, cleaned up js folder
...
TODO: minimizer for merging all files belonging to the actual app into one
2013-08-11 19:15:37 +02:00
Gina Häußge
f622e1e181
And a robots.txt for good measure...
2013-08-11 16:57:39 +02:00
Gina Häußge
b168ef7e74
Only enable "Keep Enabled" button if data entered into form is valid. Also changed the wording a bit here and there.
2013-08-10 23:39:07 +02:00
Gina Häußge
4cf041aaad
Enforces a new first-run setup wizard for access control to be run and forbids running OctoPrint as root unless a special command option is supplied
...
The dialog also informs about the risk of unauthorized strangers (mis)using the printer if an unsecured OctoPrint installation is made available on the internet.
2013-08-10 21:59:05 +02:00
Bryan Mayland
e7f5384427
Refresh gcode visualization if the selected file is modified
...
This passes the file modification time to the javascript side and if
they don't match then the file is re-downloaded and parsed. The mtime
is also used in the AJAX request as it prevents the browser from serving
the new request from cache.
2013-07-21 06:48:06 -04:00
Gina Häußge
31d86cd0a2
Added left space on filesystem holding the uploads folder to the gcode files list
...
Closes #186
2013-07-20 16:01:17 +02:00
Gina Häußge
22ea55746c
Overall better gcode file handling
...
See #182 and https://groups.google.com/forum/#!topic/octoprint/YnOzyToxfkI
2013-07-13 16:30:41 +02:00
Gina Häußge
8dcbb620bb
Highlight currently selected file, disable deletion and load/loadAndPrint for it
...
Fixed #182
2013-07-07 23:27:22 +02:00
Gina Häußge
7d85860195
Reset view to first page in file lists when filters are changed
2013-07-07 14:18:08 +02:00
Gina Häußge
6d3e3221b8
Added timeout settings for serial communiction, initial connection and baudrate detection
...
Closes #126
2013-07-04 21:26:53 +02:00
Gina Häußge
44f1f01001
Allow enabling of serial logging at runtime
2013-06-30 22:18:29 +02:00
Gina Häußge
f14acf8ba7
Fix height of terminal output to 340 px
2013-06-30 21:17:22 +02:00
Gina Häußge
119ee338f1
Client side filtering of M105 request/response and M27 request/response
...
Since it's client side, if you leave these on when not printing, the log will go completely blank over time due to filling up with M105s. Re-enabling M105s will immediately restore the whole log (although it won't hold much information value).
2013-06-30 21:10:09 +02:00
Gina Häußge
42f2398ac1
Only auto-connect if configured port is available at server startup. Also bugfixes.
2013-06-29 20:28:37 +02:00
Gina Häußge
8231e70b44
Added tab in settings for serial connection options
2013-06-29 20:20:27 +02:00
Gina Häußge
b0518a71a3
Also provide access to the auto-connect setting in the connection and the settings dialog
2013-06-29 19:57:46 +02:00
Gina Häußge
1caba2d634
Added git information to website
2013-06-29 13:41:39 +02:00
Gina Häußge
09ae8fcdc2
Always send M110 with the new line number (default 0)
...
Previously it worked since the first command of every print was forced to be an M110 and the line number at the beginning of each print was always forced back to 0 as well. Now it just uses the actual line number (increased on each sent of a checksumed/numbered line) and resets that when an M110 is encountered. What was missing was forcing the line number of the actual M110 command to the desired line number as well. Should be "more correct" than before now, and work.
2013-06-25 20:05:31 +02:00
Gina Häußge
bd61d45e27
Missed the settings when changing api -> allow to api -> enabled
2013-06-24 17:48:13 +02:00
Gina Häußge
c6e15a7d32
Merge branch 'richardjm-devel' into devel
...
Conflicts:
octoprint/server.py
octoprint/settings.py
octoprint/templates/index.jinja2
2013-06-23 16:09:31 +02:00
Gina Häußge
31045b4c25
Merge branch 'peteruithoven-master' into devel
...
Conflicts:
octoprint/timelapse.py
2013-06-23 14:58:58 +02:00
Bryan Mayland
329656837a
Renamed flipX, flipY to flipH, flipV, made update upon change instant, also made timelapse video reflect flipped webcam
2013-06-23 14:57:48 +02:00
Gina Häußge
79f2cd0e31
Merge branch 'devel' into events
...
Conflicts:
octoprint/util/comm.py
2013-06-22 15:08:53 +02:00
Bryan Mayland
6600eea1a2
Feedback commands now work
2013-06-21 23:19:15 +02:00
Gina Häußge
f041c6b4f3
First work on custom controls with printer feedback evaluation and presentation in the UI
2013-06-21 20:50:57 +02:00
Gina Häußge
7e015e6e18
Merge branch 'devel' into events
2013-06-19 20:39:01 +02:00
Gina Häußge
f9beb28b1d
Merge branch 'master' into devel
2013-06-19 20:38:38 +02:00
Gina Häußge
c24a66c361
Fixed signature for user view model. Closes #157
2013-06-19 20:36:50 +02:00
peteruithoven
ecfdb37f93
Adding classes according to flipX, flipY settings and flipping using css
2013-06-19 02:39:49 +02:00
peteruithoven
e8913e3141
Adding settings for webcam flipX and flipY
2013-06-19 00:42:43 +02:00
Gina Häußge
0e294ef8fd
Merge branch 'devel' into events
2013-06-18 21:44:30 +02:00
Gina Häußge
e96765bc39
Merge branch 'master' into devel
...
Conflicts:
octoprint/static/css/octoprint.less
2013-06-17 22:12:45 +02:00
Gina Häußge
bcf8d54ff3
Merge remote-tracking branch 'origin/master'
2013-06-17 22:10:48 +02:00
Gina Häußge
6876438783
Fix for #153 backported from events branch
2013-06-17 22:10:14 +02:00
Gina Häußge
33731464e5
Merge pull request #145 from daprice/master
...
Improve nav bar appearance when custom colors are used
2013-06-17 04:56:10 -07:00
algspd
d9fb3bb8f6
Added jquery.min.js locally to avoid depending on
...
internet connection on clients which may be
locally and offline
2013-06-17 00:11:17 +02:00
Gina Häußge
236e26979f
Switched Timelapses to using Eventbus instead of direct connection
2013-06-16 21:50:50 +02:00
Gina Häußge
8be1329a71
Merge branch 'devel' into gcodestreaming
...
Conflicts:
octoprint/printer.py
octoprint/static/js/ui.js
octoprint/templates/index.jinja2
octoprint/util/comm.py
2013-06-09 18:28:40 +02:00
Gina Häußge
edff311351
Merge branch 'master' into devel
2013-06-09 18:18:57 +02:00
Gina Häußge
9963c523c0
Do not display -1mm when printing from sd
2013-06-09 18:13:12 +02:00
Gina Häußge
003109d59e
Made gcode viewer capable of handling progress information
...
GCode viewer now updates its visualization (during printing) based on the current progress percentage, not based on the current line (which will not be available any more as part of the progress tuple with gcode streaming)
2013-06-09 14:00:15 +02:00
Dale Price
add073a6cb
Add black color setting
2013-06-08 19:05:09 -05:00
Dale Price
719c4fab57
Define brand image in CSS instead of an <img> tag to allow it to be styled; add high resolution tentacle brand image for retina/high-res displays; create non-clashing light version of tentacle brand image to be used when darker custom colors are chosen in settings
2013-06-08 18:43:17 -05:00