Commit graph

5767 commits

Author SHA1 Message Date
larsbrubaker
9b202feb37 Putting Selection List into QueueData
Compiling but not worknig
2016-12-04 12:06:51 -08:00
larsbrubaker
65e487dbc3 partial refactor to queue 2016-12-04 12:06:09 -08:00
larsbrubaker
95fec91905 Latest agg 2016-12-04 12:05:05 -08:00
Lars Brubaker
500f0f3ddb Merge pull request #1686 from larsbrubaker/master
Made the macro and gcode edit windows edit faster
2016-12-03 12:55:12 -08:00
larsbrubaker
1c9af30332 Made the macro and gcode edit windows edit faster 2016-12-03 12:48:19 -08:00
Lars Brubaker
b64fc1d5c2 Merge pull request #1685 from larsbrubaker/master
Got the new mocros menu working well
2016-12-03 12:25:33 -08:00
Lars Brubaker
db51ae76fa Merge branch 'master' into master 2016-12-03 12:15:08 -08:00
Lars Brubaker
d76c085a4f Merge pull request #1680 from gregory-diaz/master
Removed failing experimental "stress" test
2016-12-03 12:15:03 -08:00
Lars Brubaker
98594899df Merge branch 'master' into master 2016-12-03 12:09:50 -08:00
larsbrubaker
78439d34ab Got the new mocros menu working well 2016-12-03 12:08:39 -08:00
Lars Brubaker
ca98cd44ce Merge pull request #1682 from larsbrubaker/master
Fixing up automation tests
2016-12-02 18:09:48 -08:00
Lars Brubaker
2e93d43ccd Fixing up automation tests 2016-12-02 18:06:29 -08:00
johnlewin
a34b97ff44 Merge pull request #1681 from larsbrubaker/master
Made it so that we can run tests in software mode.
2016-12-02 16:55:35 -08:00
Lars Brubaker
21b45ec761 Made it so that we can run tests in software mode. 2016-12-02 16:49:18 -08:00
Greg
9763016567 Removed failing experimental "stress" test 2016-12-02 16:34:44 -08:00
johnlewin
fc7b576784 Merge pull request #1679 from larsbrubaker/master
Make AddAndSelectPrinter more stable
2016-12-02 16:23:54 -08:00
Lars Brubaker
23061f51cb Make AddAndSelectPrinter more stable 2016-12-02 15:44:12 -08:00
johnlewin
330d828f97 Merge pull request #1678 from larsbrubaker/master
Make pause work correctly with always printing
2016-12-02 14:09:21 -08:00
johnlewin
01aef489c4 Merge branch 'master' into master 2016-12-02 14:05:37 -08:00
johnlewin
a5e2b3ff11 Merge pull request #1677 from gregory-diaz/master
Fix ExportItemsFromDownloads.ExportAsGcode
2016-12-02 14:04:36 -08:00
Lars Brubaker
2ba531c384 Merge branch 'master' into master 2016-12-02 13:55:58 -08:00
Lars Brubaker
0c08c6c5ce Make pause work correctly with always printing 2016-12-02 13:51:58 -08:00
Greg
f0980c5031 Moved test from MatterControlAutomationTests to CloudServicesTests so that it works 2016-12-02 12:41:13 -08:00
Greg
8003114063 Fix ExportItemsFromDownloads.ExportAsGcode
MatterHackers/MCCentral#878
2016-12-02 11:38:13 -08:00
johnlewin
ce4bb874d1 Merge pull request #1676 from larsbrubaker/master
Reverted new command line code
2016-12-02 11:09:07 -08:00
Lars Brubaker
ae2bf7a8f7 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-12-02 10:53:50 -08:00
Lars Brubaker
2d0aa84c7d Reverted new command line code
Set test to use orthographic thumbnails
2016-12-02 10:52:33 -08:00
johnlewin
2ce34cb41d Merge pull request #1672 from larsbrubaker/master
New translation strings
2016-12-02 09:38:18 -08:00
Lars Brubaker
bfd5a63330 New translation strings 2016-12-01 19:12:03 -08:00
Lars Brubaker
2652ea978c Merge pull request #1628 from rytz/master
minor help text changes.
2016-12-01 18:32:50 -08:00
Lars Brubaker
d5ef77ef4c Merge branch 'master' into master 2016-12-01 18:28:26 -08:00
Lars Brubaker
17c78fc8e4 Merge pull request #1669 from unlimitedbacon/master
Moved networking and sailfish options to Connection page
2016-12-01 18:28:17 -08:00
Lars Brubaker
7a64ca382b Merge branch 'master' into master 2016-12-01 18:24:02 -08:00
Lars Brubaker
6449ccc5cb Merge branch 'master' into master 2016-12-01 18:23:52 -08:00
Lars Brubaker
634f77daa1 Merge pull request #1671 from larsbrubaker/master
Make it possible to pass command line arguments in test.
2016-12-01 18:23:26 -08:00
Lars Brubaker
19354a2a85 Merge branch 'master' into master 2016-12-01 18:22:48 -08:00
Lars Brubaker
7662e45586 Make it possible to pass command line arguments in test.
Made a new argument to do thumbnails as orthographic
Significantly speeds up tests
2016-12-01 18:03:40 -08:00
rytz
9396673523 help text changes 2016-12-01 16:20:26 -08:00
Lars Brubaker
4b21c9c573 Merge branch 'master' into master 2016-12-01 16:14:06 -08:00
Lars Brubaker
b1b807d674 Merge pull request #1670 from jlewin/master
Modify ClickByName automation helper to throw if not found
2016-12-01 16:13:56 -08:00
rytz
142a147494 minor help text changes. 2016-12-01 15:51:26 -08:00
John Lewin
4c7cb5deba Fix issue with MatterControlRuns test when no printers exist 2016-12-01 15:44:13 -08:00
John Lewin
408fc580f4 Remove duplicate semicolons 2016-12-01 15:14:53 -08:00
John Lewin
d4196b7b64 Fix failing QueueThumbnailWidgetOpensPartPreview test 2016-12-01 15:02:49 -08:00
John Lewin
0cabc4af74 Modify ClickByName automation helper to throw if not found 2016-12-01 13:25:17 -08:00
Tyler Anderson
09e067133b Moved networking and sailfish options to Connection page 2016-12-01 13:11:21 -08:00
johnlewin
a1e5750bb7 Merge pull request #1668 from larsbrubaker/master
Hook virtual functions rather than delegate for Enter and Leave bounds.
2016-12-01 12:16:02 -08:00
Lars Brubaker
5ebe0967c6 Hook virtual functions rather than delegate for Enter and Leave bounds. 2016-12-01 11:49:10 -08:00
Lars Brubaker
2c95837391 Merge pull request #1666 from larsbrubaker/master
Made it so that only canceling the printe causes it to be marked as c…
2016-12-01 11:48:46 -08:00
Lars Brubaker
fb1f5ff730 Made it so that only canceling the printe causes it to be marked as canceled
Disconnect and reconnect do not 'cancel' the print
Closing MC does not 'cancel' the print
2016-12-01 10:59:03 -08:00