Commit graph

3088 commits

Author SHA1 Message Date
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
make-ing
2db9724004 changed update_script 2015-09-11 12:34:14 +02:00
make-ing
f094056590 changed update_script string 2015-09-11 12:27:47 +02:00
make-ing
30a5a45147 changed update_script to "cd {target}; git pull" 2015-09-11 11:45:05 +02:00
make-ing
4b29593877 changed empty update_script string to pwd 2015-09-11 11:28:13 +02:00
make-ing
aa918ad980 added update_script and restart key to default values 2015-09-11 11:18:56 +02:00
make-ing
2f04ef43d5 changed all plugin branches to stable-1.2.2 2015-09-11 11:00:25 +02:00
make-ing
304c0919a7 chaned defualt settings in update software 2015-09-10 11:52:17 +02:00
Gina Häußge
6132fe2da9 SWU: Don't use display versions for "current" in github_commit configs
(cherry picked from commit 58c6abc)
2015-09-10 11:41:42 +02:00
make-ing
17f7e1171d changed default settings for testing 2015-09-10 10:50:34 +02:00
make-ing
48cbe8eded added update plugin default values from old config.yml 2015-09-09 15:14:31 +02:00
make-ing
2cb5b0246c fixed grbl travel settup problem when switching to senior 2015-09-09 14:06:30 +02:00
make-ing
d37ce77460 fixed position update bug after grbl flashing 2015-09-09 12:45:24 +02:00
make-ing
bb964b3d75 added new grbl.hex and changed the grblVersionRequirement.yml accordingly 2015-09-08 17:54:06 +02:00
make-ing
1052141be4 changed default settings of serial port to /dev/MrBeam 2015-09-08 14:40:50 +02:00
make-ing
469f2cb3f1 removed debug messages after avrdude bug fix 2015-09-07 15:59:58 +02:00
make-ing
dabcca4297 try to fix grbl flashing problem on pi 2015-09-07 11:07:05 +02:00
make-ing
e5cc1361c6 fixed grbl version string bug; fixed grbl.hex not found flashing bug 2015-09-05 13:09:57 +02:00