nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5450 commits 1 branch 0 tags 103 MiB
Commit graph

5450 commits

This branch
This branch
All branches
Author SHA1 Message Date
johnlewin
dcdf11bfae Merge pull request #1562 from jlewin/1.6.0 
Include more scope in lock
 2016-10-31 13:46:55 -07:00
John Lewin
861e8d4f1a Include more scope in lock 2016-10-31 13:34:36 -07:00
Lars Brubaker
68d1081e4d Merge pull request #1559 from gregory-diaz/1.6.0 
Touch, Switching to display advanced mode not reloading screen
 2016-10-31 12:55:02 -07:00
Greg
3886ad9ba0 Touch, Switching to display advanced mode not reloading screen 
MatterHackers/MCCentral#701
 2016-10-31 12:31:45 -07:00
Lars Brubaker
3b188b7d4d Merge pull request #1556 from jlewin/1.6.0 
Track sync calling context
 2016-10-31 11:33:13 -07:00
John Lewin
99762f5063 Remove .Profiles setter 2016-10-31 10:51:25 -07:00
John Lewin
cced08d2d4 Track sync calling context 2016-10-31 10:51:24 -07:00
Lars Brubaker
7e467ef5ef Merge pull request #1555 from larsbrubaker/1.6.0 
Change wording to 'Restore Settings'
 2016-10-28 18:41:17 -07:00
Lars Brubaker
6509b8f287 Change wording to 'Restore Settings' 2016-10-28 16:32:00 -07:00
Lars Brubaker
c83eb4b2ea Merge pull request #1552 from larsbrubaker/1.6.0 
Fixed home icon being the wronge size on touch.
 2016-10-28 14:27:07 -07:00
Lars Brubaker
6d3a8535af Fixed home icon being the wronge size on touch. 2016-10-28 14:11:45 -07:00
Lars Brubaker
aedec42069 Merge pull request #1551 from jlewin/1.6.0 
Load OemProfiles from cache or fall back to StaticData if missing
 2016-10-28 13:57:50 -07:00
John Lewin
0e2dd646d7 Load OemProfiles from cache or fall back to StaticData if missing 2016-10-28 13:13:21 -07:00
Lars Brubaker
4156d39277 Merge pull request #1550 from larsbrubaker/1.6.0 
latest ms
 2016-10-28 09:41:20 -07:00
Lars Brubaker
7492509a75 latest ms 2016-10-28 09:29:52 -07:00
Lars Brubaker
72fe0cba36 Merge pull request #1549 from larsbrubaker/1.6.0 
Put in the ability to turn off Merge Overlapping Lines
 2016-10-28 07:39:52 -07:00
Lars Brubaker
34e8f3cdd7 Merge branch '1.6.0' into 1.6.0 2016-10-27 18:37:36 -07:00
Lars Brubaker
a22ef1d32b Put in the ability to turn off Merge Overlapping Lines 
Fixes a possible regression in slicing
 2016-10-27 18:36:02 -07:00
Lars Brubaker
f194175dbb Merge pull request #1547 from larsbrubaker/1.6.0 
Created new ReloadAllRequested event
 2016-10-27 13:48:57 -07:00
Lars Brubaker
1f00e57088 Created new ReloadAllRequested event 2016-10-27 13:43:34 -07:00
Lars Brubaker
1689326f32 Merge pull request #1544 from larsbrubaker/1.6.0 
Put a try catch around the load.
 2016-10-26 18:05:35 -07:00
Lars Brubaker
9a676e61a4 latest agg 2016-10-26 18:01:35 -07:00
Lars Brubaker
20ca7c53bd Merge branch '1.6.0' of https://github.com/MatterHackers/MatterControl into 1.6.0 2016-10-26 18:00:55 -07:00
Lars Brubaker
f2918b7232 Merge pull request #1543 from jlewin/1.6.0 
AutomationRunner revisions
 2016-10-26 17:47:15 -07:00
Lars Brubaker
431f5df863 Connection Wizard changes. 2016-10-26 17:36:56 -07:00
Lars Brubaker
a870b76d0d latest agg 2016-10-26 17:22:18 -07:00
Lars Brubaker
22355d58cb Put a try catch around the load. 2016-10-26 17:21:06 -07:00
John Lewin
56ef92ab91 Collapse PrepForTestRun(mode) into new CloseSignInAndPrinterSelect() 2016-10-26 09:03:46 -07:00
John Lewin
a592b86cd7 Remove five second per test delay when plugins are missing 2016-10-26 07:44:17 -07:00
John Lewin
b54b73db7f Ensure spawned emulator process is always killed via using/Dispose 
- LaunchAndConnectToPrinterEmulator -> TestRunner extension method
 2016-10-26 07:30:29 -07:00
johnlewin
3c1066b0aa Merge pull request #1541 from jlewin/1.6.0 
Convert NavigateToFolder to a TestRunner extension method
 2016-10-26 07:02:09 -07:00
John Lewin
a9aef3d096 Add missing changes to PartPreviewTests.cs 2016-10-26 06:58:20 -07:00
John Lewin
13067e1602 Convert NavigateToFolder to a TestRunner extension method 2016-10-26 06:49:50 -07:00
johnlewin
5de95e50af Merge pull request #1537 from jlewin/1.6.0 
Revise Agg automation
 2016-10-25 14:54:31 -07:00
John Lewin
0b3853ae11 Restore required RunInApplicationDomain attribute 2016-10-25 14:35:51 -07:00
John Lewin
017bde6882 Bring in revised HintPaths in Agg 2016-10-25 11:35:17 -07:00
John Lewin
c72c8d8fc6 Revise Agg automation 
- Remove per test classes
- Migrate RunInApplicationDomain attributes to TextFixture
- Convert from Action<AutomationRunner> to AutomationTest delegate
- Convert testRunner.AddTestResult to Assert.IsTrue
- Remove testRunner.AllTestPassed(n) - use Asserts
- Add return Task.FromResult(0) for non-async test method bodies
- Upgrade NUnit.ApplicationDomain to v10
 2016-10-25 07:38:48 -07:00
Lars Brubaker
44b3d9513f Merge pull request #1534 from larsbrubaker/1.6.0 
Make sure we always heat used extruders.
 2016-10-24 12:10:02 -07:00
Lars Brubaker
8a739f0058 Make sure we always heat used extruders. 2016-10-24 12:05:13 -07:00
Lars Brubaker
b72ca1728b Merge pull request #1533 from larsbrubaker/1.6.0 
latest ms
 2016-10-24 07:40:48 -07:00
larsbrubaker
016980a878 latest ms 2016-10-23 16:51:29 -07:00
Lars Brubaker
dc8b429ea4 Merge pull request #1532 from larsbrubaker/1.6.0 
Always call UserChanged when ChangeCloudSyncStatus
 2016-10-21 17:14:19 -07:00
Lars Brubaker
95fc69e7f8 Always call UserChanged when ChangeCloudSyncStatus 
Don't clear the LastSessionUserName
It should only be used in the name field of the login screen and nowhere else.
 2016-10-21 17:09:53 -07:00
johnlewin
f7352284f9 Merge pull request #1531 from jlewin/1.6.0 
Revise IsGuestProfile property, revert LastSessionUsername changes
 2016-10-21 16:20:35 -07:00
John Lewin
67b151aa2c Revise IsGuestProfile property, revert LastSessionUsername changes 2016-10-21 16:12:47 -07:00
johnlewin
3c18f10e55 Merge pull request #1529 from gregory-diaz/1.6.0 
Removed test code from 1.6
 2016-10-21 15:02:43 -07:00
johnlewin
725b1048d4 Merge branch '1.6.0' into 1.6.0 2016-10-21 14:55:08 -07:00
Lars Brubaker
ae7ee576d2 Merge pull request #1530 from larsbrubaker/1.6.0 
Make sure we don't block on a bad write to the sqlite database
 2016-10-21 14:54:52 -07:00
Lars Brubaker
e577391772 Make sure we don't block on a bad write to the sqlite database 2016-10-21 14:19:15 -07:00
Lars Brubaker
ebfcbcee3e Merge pull request #1528 from jlewin/1.6.0 
Refactor ProfileManager to prefer isolated instances
 2016-10-21 14:18:49 -07:00