8dcbb620bb
Highlight currently selected file, disable deletion and load/loadAndPrint for it
...
Fixed #182
2013-07-07 23:27:22 +02:00
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
b0518a71a3
Also provide access to the auto-connect setting in the connection and the settings dialog
2013-06-29 19:57:46 +02:00
1caba2d634
Added git information to website
2013-06-29 13:41:39 +02:00
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
31045b4c25
Merge branch 'peteruithoven-master' into devel
...
Conflicts:
octoprint/timelapse.py
2013-06-23 14:58:58 +02:00
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
6600eea1a2
Feedback commands now work
2013-06-21 23:19:15 +02:00
ecfdb37f93
Adding classes according to flipX, flipY settings and flipping using css
2013-06-19 02:39:49 +02:00
e96765bc39
Merge branch 'master' into devel
...
Conflicts:
octoprint/static/css/octoprint.less
2013-06-17 22:12:45 +02:00
bcf8d54ff3
Merge remote-tracking branch 'origin/master'
2013-06-17 22:10:48 +02:00
6876438783
Fix for #153 backported from events branch
2013-06-17 22:10:14 +02:00
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
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
4994d488cf
Use span instead of button for upload buttons, otherwise FF and IE hiccup...
...
(cherry picked from commit ee3bc84
2013-06-16 11:39:20 +02:00
ee3bc84242
Use span instead of button for upload buttons, otherwise FF and IE hiccup...
2013-06-16 11:38:52 +02:00
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
9963c523c0
Do not display -1mm when printing from sd
2013-06-09 18:13:12 +02:00
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
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
56cb1c294c
Changed to GCODE streaming instead of loading it all into memory -- no more loading times. Also better file handling.
2013-05-31 22:41:53 +02:00
b645073f1d
Added SD state evaluation and SD commands
2013-05-26 18:53:43 +02:00
16f5e54bd7
Merge branch 'devel' into sdcard
...
Conflicts:
octoprint/server.py
octoprint/settings.py
octoprint/static/js/ui.js
octoprint/util/comm.py
2013-05-23 22:53:34 +02:00
b048cc390b
Proper uploading incl. drag-n-drop for both local storage and SD card
2013-05-20 23:31:17 +02:00
783b3b8166
Merge branch 'master' into devel
2013-05-20 20:19:26 +02:00
039a17d923
First try at SD card support
2013-05-20 19:18:03 +02:00
e831ced2da
simple change so the url loads from http or https whichever is in use
2013-05-18 18:13:17 +00:00
3f79faf55b
Merge remote-tracking branch 'upstream/master' into devel
2013-05-18 06:32:04 +00:00
f7334ef65f
Fixed some merge bugs
2013-04-13 22:26:23 +02:00
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