Commit graph

3055 commits

Author SHA1 Message Date
make-ing
a61245a8b4 a lot of changes in _monitor trying to reduce computational effort 2015-10-01 16:54:59 +02:00
make-ing
3f61ebc29e removed debugging output handling 2015-10-01 11:53:20 +02:00
Teja
9f1c277777 Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam 2015-10-01 10:55:08 +02:00
Teja
9aeacfee77 commented out lots of 3d printing stuff. 2015-10-01 10:54:43 +02:00
make-ing
4f00f2768c fixed if else bug in specialcommand handling 2015-09-28 11:36:32 +02:00
make-ing
a1c40c7a41 added setstatusfrequency special command 2015-09-25 11:50:41 +02:00
make-ing
a0b43adc61 change command test to only lowercase 2015-09-25 10:03:26 +02:00
make-ing
b5a80db874 Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam 2015-09-24 14:05:32 +02:00
make-ing
198f40e2d7 added /toggleStatusReport command 2015-09-24 14:05:11 +02:00
Teja
beaa41c2c1 Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam 2015-09-24 12:20:12 +02:00
Teja
8eb3fd3029 support for /debug commands 2015-09-24 12:19:46 +02:00
make-ing
156ac00f52 img id bug fix 2015-09-24 11:31:57 +02:00
make-ing
2f387c55cc fixed wrong class bug 2015-09-24 10:56:07 +02:00
make-ing
c75bd69eb4 added horizontal and vertical ui label 2015-09-24 10:30:40 +02:00
make-ing
ea20be6601 changed position output to float 2015-09-23 18:53:00 +02:00
make-ing
c5aa726155 fixed position update bug and display horizontal and vertical bug 2015-09-23 16:42:49 +02:00
make-ing
563a85ac7e paranthesis bug fix 2015-09-23 15:25:23 +02:00
make-ing
a9da7b8b20 string to int bug fix 2015-09-23 14:51:39 +02:00
make-ing
2b3ebaf14d fixed null bug 2015-09-23 14:37:34 +02:00
make-ing
e3f44df478 Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam 2015-09-23 14:08:24 +02:00
make-ing
53ad230461 changed from eventManager to callback.on_comm_pos_update 2015-09-23 14:08:00 +02:00
make-ing
6fd68e0df0 changed detail information image display from percent to horizontal and vertical mm 2015-09-23 13:26:30 +02:00
Teja
8f144accf4 added todo comments 2015-09-23 11:45:23 +02:00
make-ing
906fd54c41 debug bug fix :) 2015-09-21 16:36:24 +02:00
make-ing
fbe2b56170 laser position halt debuging 2015-09-21 16:09:03 +02:00
make-ing
3516e8a8e7 Merge branch 'stable-1.2.2' into mrbeam 2015-09-18 12:23:31 +02:00
make-ing
6298863098 solved firefox bug; maybe needs better solution 2015-09-18 12:19:43 +02:00
make-ing
2c76ae4ebd fixed scale calculation bug 2015-09-17 15:22:27 +02:00
make-ing
1e187ddae2 fixed missing 2015-09-17 15:12:55 +02:00
make-ing
28c365a780 fixed wrong scale display bug 2015-09-17 15:01:13 +02:00
make-ing
c1355e4581 changed octoprint branch back to stable-1.2.2 and changed cache_ttl to 12 hours (12*60) 2015-09-15 15:49:12 +02:00
make-ing
5bbae83367 changed restart to octoprint type 2015-09-15 15:35:07 +02:00
make-ing
9c837b1266 changed restart type to environment 2015-09-15 14:50:30 +02:00
make-ing
3bf5540675 coma bug fix and back to None update type 2015-09-15 14:31:12 +02:00
make-ing
b71f0a7cee changed rastart value of svgtogcode to octoprint 2015-09-15 14:23:03 +02:00
make-ing
2f4e18fceb added restart value None to svgtogcode update 2015-09-15 14:07:21 +02:00
make-ing
27b755326a changed defualt value of current form None to Unknown 2015-09-15 12:23:57 +02:00
make-ing
823b7be3f8 added default value for current to None 2015-09-15 12:13:21 +02:00
make-ing
e4a141d7e7 deleted unnesacery lines 2015-09-14 17:53:49 +02:00
make-ing
cecc9bb633 changed from update_folder to checkoutfolder for github_commit type 2015-09-14 16:00:55 +02:00
make-ing
650006b5db deleted restartCommand and rebootCommand 2015-09-14 15:11:15 +02:00
make-ing
3d68517cd7 added octoprintUnconfigured and octoprintUnreleased ko.observable() 2015-09-14 15:03:32 +02:00
Gina Häußge
d7485d288e cherry picked from 93763a5563 foosel/OctoPrint 2015-09-14 14:52:15 +02:00
Gina Häußge
fc63f95385 Also provide branch info to UI/on socket
(cherry picked from commit cc8dcef)
2015-09-14 13:05:25 +02:00
Gina Häußge
d0fadb1b6f atomic_write context to save configs first to temp file, then move
Should prevent corruption of files
(cherry picked from commit c6d0290)
2015-09-14 12:17:17 +02:00
make-ing
10dc7e4976 changed dafault update branch to grblautoupdate for testing 2015-09-14 11:58:27 +02:00
Gina Häußge
cacc6524a1 cherry-pick 13d7d5f2f6 from foosel/OctoPrint 2015-09-14 11:13:19 +02:00
make-ing
2a2696ff9a added new update script git-pull.py to update_script setting 2015-09-11 14:55:57 +02:00
make-ing
65bff81d35 added ne update script git-pull (copied from update-octoprint.py) 2015-09-11 14:52:58 +02:00
make-ing
912bb4ab1f changed update_script 2015-09-11 13:33:27 +02:00