7e015e6e18
Merge branch 'devel' into events
2013-06-19 20:39:01 +02:00
f9beb28b1d
Merge branch 'master' into devel
2013-06-19 20:38:38 +02:00
c24a66c361
Fixed signature for user view model. Closes #157
2013-06-19 20:36:50 +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
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
Gina Häußge