ecfdb37f93
Adding classes according to flipX, flipY settings and flipping using css
2013-06-19 02:39:49 +02:00
e8913e3141
Adding settings for webcam flipX and flipY
2013-06-19 00:42:43 +02:00
0e294ef8fd
Merge branch 'devel' into events
2013-06-18 21:44:30 +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
236e26979f
Switched Timelapses to using Eventbus instead of direct connection
2013-06-16 21:50:50 +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
edff311351
Merge branch 'master' into devel
2013-06-09 18:18:57 +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
add073a6cb
Add black color setting
2013-06-08 19:05:09 -05: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
7662023223
Improve appearance of text-shadow when dark navbar colors are used; adjust color of carets in navbar menus according to the navbar color
2013-06-06 20:11:35 -05:00
57932ff78c
Check for localStorage with Modernizr before attempting to use it. Solves foosel/OctoPrint#91
2013-06-06 00:23:30 -05:00
1441a7dbd8
Added missing image resource
2013-06-03 22:25:23 +02: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
08229598e6
Merge branch 'repetier' into devel
2013-05-23 22:45:21 +02:00
45fef79e3d
Use M26 to reset SD position to 0 when cancelling and restarting a print, preprocess gcode before sending to printer
2013-05-21 23:30:29 +02:00
eeddf0ae1a
Reset SD file data when disconnecting or when losing/regaining connection to the backend
2013-05-21 23:08: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
039a17d923
First try at SD card support
2013-05-20 19:18:03 +02:00
c1760c9940
A very simple API endpoint for loading and printing files direct. This is by default turned off and it "allowed" via the settings
...
From within Slic3r adding a post-processing script .bat containing
c:\curl\curl "http://192.168.0.7:5000/api/load?apikey=D96FA6A216CB44F78705D4506689D0EC&print=true " -F file=@%*
2013-05-18 17:47:31 +00:00
fc56744705
Fixed URL for setting timelapse configuration.
...
Closes #110
2013-05-01 20:17:30 +02:00
d721e5edc2
Merge branch 'devel' into repetier
...
Conflicts:
octoprint/util/comm.py
2013-04-16 15:14:18 +02:00
628ffb5600
Do not convert command to send to upper case after checksum was calculated
...
Removed for the time being until I have a better idea on how allow stuff like "g28 x0 y0" to be autoconverted to "G28 X0 Y0" but autoconvert something like "m117 Some case sensitive text" only to "M117 Some case sensitive text"
Should fix #103
2013-04-16 14:45:25 +02:00
552048efbe
Fixed Modernizr queries by gcode renderer
2013-04-14 13:42:30 +02:00
7e82214d75
Added missing files
2013-04-14 13:15:54 +02: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
244ff25e2f
Fixed settings for gcode file list
2013-04-13 22:20:41 +02:00
3e5a6d3679
Furhter work on user management
2013-04-13 22:20:41 +02:00
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
874a7421e9
Login and logout working for the first time
2013-04-13 21:45:20 +02:00
150d6cb53d
First work on login and user management
2013-04-13 21:42:53 +02:00
34a860efda
Added confirmation dialog and different logo for print job restart
...
Closes #98
2013-04-10 16:37:12 +02:00
3174559072
Moved webcam view to Control tab
2013-04-07 22:15:04 +02:00
e70071f6c1
Removed waitForWait again (that didn't make much sense to begin with...)
2013-04-01 17:31:02 +02:00
9618407aed
Merge branch 'devel' into repetier
...
Conflicts:
octoprint/server.py
2013-04-01 17:25:08 +02:00
c01b49fbc7
Forgot to commit Font Awesome
2013-03-30 18:29:13 +01:00
cfdfad1c06
Changed color and font-size of footer
2013-03-30 18:28:24 +01:00
b5b023a29c
Merge remote-tracking branch 'splitbrain/footer' into devel
2013-03-30 18:22:33 +01:00
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
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
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
9314e83665
added footer
...
makes it faster, to refer to the OctoPrint site when problems occur.
2013-03-24 16:11:54 +01:00
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
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
e08783c8bf
Merge remote-tracking branch 'daprice/master' into devel
2013-03-16 00:28:37 +01:00
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
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
4b8260b933
Fixed some indentation
2013-03-11 21:46:05 +01:00
e2798de727
Merge branch 'daftscience-master' into devel
2013-03-11 21:15:27 +01:00
2904bd62d7
Enter key sends command
...
Sending a command also clears the field.
2013-03-11 10:38:41 -04:00
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
07d4a8fd4f
Added (optional!) watermark addition to generated timelapse movies.
2013-03-09 00:23:52 +01:00
3b50fdcf3f
Switched column sizes for gcode and timelapse file tables to pixel values.
2013-03-08 23:25:04 +01:00
133831e08e
Fixed buggy column styles for gcode and timelapse file tables
2013-03-08 21:47:51 +01:00
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
95d6c18183
Use contrast function for calculating text color in navbar
2013-03-08 20:36:18 +01:00
26c6c0fb5f
Missing semi-colon causing problems
2013-03-08 06:34:31 +00:00
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
59ffa94cde
Playing around with less...
2013-03-06 23:38:31 +01:00
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
dae1c0367a
Merge branch 'daprice-sorting_persistence' into devel
...
Conflicts:
octoprint/static/js/ui.js
2013-03-03 19:38:26 +01:00
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
9b3fc0c65e
Set default instance name to empty string
2013-03-03 16:57:35 +01:00
eecb19ecf6
store file sorting options in the browser's LocalStorage
2013-03-02 22:56:58 -06:00
766e9f0e7f
Show custom title first in head in case of small tabs
2013-03-02 13:38:30 +01:00
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
260606601d
Title and limited color control via settings
2013-03-02 10:56:32 +00:00
b2408c92a5
Didn't add the restart button after all
2013-03-01 21:57:13 +00:00
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
899d618efe
Couple of fixes while merging...
2013-02-23 22:46:29 +01:00
0e6fd2bde2
Merge remote-tracking branch 'upstream/devel' into devel
2013-02-23 18:40:28 +00:00
e79aede3f4
Bug in bootstrap forcing use of knockout click binding - actually works better
2013-02-23 18:38:18 +00:00
8a3df3d4e7
Easier than I thought to add/remove temperature profiles
2013-02-23 17:59:27 +00:00
9ba88a7d1a
New temperature profile settings and hooked into ui. WIP: add and remove profiles
2013-02-23 17:47:01 +00:00
2e766a7eca
Added custom controls with multiple commands
...
Closes #48
2013-02-23 18:08:59 +01:00
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
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
1c9854b6c1
Merge branch 'master' into devel
2013-02-17 22:31:11 +01:00
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
0266bcd593
optimize image file size on iOS web clip icons
2013-02-16 23:32:31 -06:00
48f0af2e7a
Add iOS web clip icons
2013-02-16 23:28:23 -06:00
22e5f656fe
Sort out the spacing and alignment on jog controls
2013-02-10 21:12:38 +00:00
bd68e0ae54
Added sorting and filtering options for gcode files.
...
Closes #21
2013-02-10 21:48:24 +01:00
4035ebcec5
Various control for jogging, speed reduced
2013-02-10 16:00:47 +00:00
142d07be21
Equalized the size of the button with the input control
2013-02-10 09:34:53 +00:00
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
f09d57bef9
Started work on adding extrusion control
2013-02-09 23:20:41 +01:00
7fb354a256
Added controls I want (motors off, fans on/off) - they perhaps should be custom
2013-02-09 12:07:31 +00:00
878bee784a
Modified the appearance of the jogging controls with a view to adding finer control
2013-02-09 11:22:09 +00:00
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
3de0d1b1e5
Fixed file deletion for gcode files
2013-02-04 21:41:02 +01:00
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
peteruithoven