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

5260 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lars Brubaker
9e4635891a latest agg 2016-10-04 17:55:29 -07:00
Lars Brubaker
231aadc554 Always set make and model on imported printers 
Made the import printer get non-colliding names
MatterHackers/MCCentral#417
MatterControl is unable to upload imported printers
 2016-10-04 17:54:57 -07:00
Lars Brubaker
cf09c15e2c Improvements to UI language 2016-10-04 16:39:07 -07:00
johnlewin
b0cc2ec74e Merge pull request #1461 from jlewin/master 
Attempt to delete Downloads subdirectory, suppress error on fail
 2016-10-04 16:37:43 -07:00
John Lewin
29a77104ab Attempt to delete Downloads subdirectory, suppress error on fail 
- Possible fix for Automation Tests 'file access' error
 2016-10-04 16:25:39 -07:00
johnlewin
7b98f1c7a1 Merge pull request #1460 from jlewin/master 
Decouple validation logic from save invocation
 2016-10-04 16:21:56 -07:00
John Lewin
c0d6780901 Decouple validation logic from save invocation 
- Rename AcquireNewProfile to CreateProfileAsync
- Return status result of CreateProfileAsync
- Abort processing on profile creation failures
- Localize error messsages
 2016-10-04 15:33:07 -07:00
johnlewin
29a9be5853 Merge pull request #1459 from jlewin/master 
Proactively invoke Sync process on printer changed events
 2016-10-04 13:51:53 -07:00
John Lewin
75be29a030 Proactively invoke Sync process on printer changed events 2016-10-04 13:21:44 -07:00
johnlewin
5d3ec5b900 Merge pull request #1458 from jlewin/master 
Emulator tests must shutdown spawned process
 2016-10-04 12:33:50 -07:00
John Lewin
29fadccacc Emulator tests must shutdown spawned process 2016-10-04 12:28:42 -07:00
johnlewin
a13985a90d Merge pull request #1457 from jlewin/master 
Upgrade to latest NUnit.ApplicationDomain package
 2016-10-04 11:26:46 -07:00
John Lewin
9709c757c9 Upgrade to latest NUnit.ApplicationDomain package 2016-10-04 10:53:22 -07:00
johnlewin
6eb14dc6ab Merge pull request #1456 from jlewin/master 
Fire ProfilesListChanged after SetMarkedForDelete
 2016-10-04 10:44:14 -07:00
John Lewin
1f8bb71172 Fire ProfilesListChanged after SetMarkedForDelete 
- Ensures the popup SystemWindow in TouchScreen mode gets refreshed
 2016-10-04 10:30:24 -07:00
Lars Brubaker
6c07cf0752 Merge pull request #1455 from larsbrubaker/master 
Making a single public api to canceling / stoping the print.
 2016-10-03 14:47:20 -07:00
Lars Brubaker
29777aa0b1 Making a single public api to canceling / stoping the print. 2016-10-03 14:34:16 -07:00
Lars Brubaker
7b9a05b646 Merge pull request #1454 from larsbrubaker/master 
Fixing string issues
 2016-10-03 14:30:11 -07:00
Lars Brubaker
a302d59d82 Fixing string issues 
MatterHackers/MCCentral#511
UI Tweaks
 2016-10-03 13:48:45 -07:00
Lars Brubaker
b29de3d9e8 Merge pull request #1453 from unlimitedbacon/helptext 
Revised help text for air gap
 2016-10-03 13:06:50 -07:00
Tyler Anderson
6d2c83b013 Revised help text for air gap 2016-10-03 12:08:15 -07:00
johnlewin
f0b24c844d Merge pull request #1444 from gregory-diaz/master 
Fix: Scroll bar disappears from Controls page in touchscreen mode
 2016-10-03 12:00:31 -07:00
Greg
6bc17166ec Merge branch 'master' of https://github.com/MatterHackers/MatterControl 
# Conflicts:
#	Submodules/agg-sharp
 2016-10-03 11:49:32 -07:00
Lars Brubaker
c0562c3aaa Merge pull request #1452 from larsbrubaker/master 
Change migrate to copy
 2016-10-03 10:26:32 -07:00
Lars Brubaker
2bc78a947f Ensure guest profile uses the correct path. 
Don't change between test and release as they don't have any actual logical difference for guest.
 2016-10-03 10:22:08 -07:00
Lars Brubaker
7b2062afbe latest agg 2016-10-03 09:59:56 -07:00
Lars Brubaker
bb17896181 Changing migrate to copy 2016-10-03 09:58:51 -07:00
johnlewin
33fb48edb1 Merge pull request #1450 from jlewin/master 
Revise test output formatting
 2016-09-30 17:59:50 -07:00
John Lewin
ec9d6c35da Revise test output formatting 
- Improve layout in NUnit console output
- Remove stacktrace workarounds for NUnit2
 2016-09-30 17:54:41 -07:00
johnlewin
b33b261098 Merge pull request #1449 from jlewin/master 
Clean up failing LibraryDownload tests
 2016-09-30 16:24:31 -07:00
John Lewin
9d57b6435e Clean up failing LibraryDownload tests 
- Move all tests into one class
- Only apply RunInApplicationDomain to test
- Add descriptions on AddTestResult calls to improve troubleshooting
 2016-09-30 16:04:16 -07:00
Greg
36ef069629 Added spacing to mm text on JogControls 
MatterHackers/MCCentral#511
 2016-09-30 15:21:58 -07:00
Greg
b9f401624c Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-09-29 17:38:18 -07:00
Lars Brubaker
2c4c5e3521 Merge pull request #1448 from jlewin/master 
Make user profiles directory specific to WebServices environment
 2016-09-29 17:04:43 -07:00
John Lewin
c81119f19c Make user profiles directory specific to WebServices environment 2016-09-29 16:55:16 -07:00
johnlewin
f3fc6469bd Merge pull request #1445 from jlewin/master 
Improve keyboard support for make/model selectors
 2016-09-29 16:52:18 -07:00
John Lewin
0fca1c0f44 Improve keyboard support for make/model selectors 
- Turn on TabStop for make/model DropLists
- Add focus indicator for make/model DropLists
 2016-09-29 16:46:19 -07:00
johnlewin
f518d09395 Merge pull request #1447 from larsbrubaker/master 
Make sure we can add a printer on android when signed out.
 2016-09-29 15:56:28 -07:00
Lars Brubaker
68ca0442f9 Make sure we can add a printer on android when signed out. 2016-09-29 15:51:08 -07:00
johnlewin
b4c839eb0a Merge pull request #1446 from larsbrubaker/master 
Making the request to reload all wait until there is a draw
 2016-09-29 15:16:37 -07:00
Lars Brubaker
16b8ea983a Making the request to reload all wait until there is a draw 
This is to try and speed up priter creation on Android.
 2016-09-29 14:47:21 -07:00
Lars Brubaker
0d08acf3b2 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-09-29 13:56:55 -07:00
Greg
88ec6c6283 Fix: Scroll bar disappears from Controls page in touchscreen mode 
MatterHackers/MatterControl#1369
 2016-09-29 13:42:31 -07:00
johnlewin
329be79732 Merge pull request #1442 from jlewin/master 
Revise ClientToken use for multi-instanced MatterControl
 2016-09-29 12:16:26 -07:00
John Lewin
87316dadff Revise ClientToken use for multi-instanced MatterControl 
- Add public const EnvironmentName for Services environment
- Remove GetSessionUsername method
- Remove ClearCachedCredentials
- Pull in AuthData type
- Add system to store and use ClientTokens
- Add using statements for common namespaces
 2016-09-29 11:47:06 -07:00
johnlewin
ecaf146d77 Merge pull request #1441 from larsbrubaker/master 
Changed the way eeprom window lays out
 2016-09-29 11:04:07 -07:00
Lars Brubaker
dea576337d Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-09-29 10:48:53 -07:00
Lars Brubaker
60df6ea292 Changed the way eeprom window lays out 
Make sure we don't close the Database until after we Call OnApplicationClosed
MatterHackers/MCCentral#498
Android: Cannot put away keyboard on EEPROM screen android
Fix terminal widget closing on android.
 2016-09-29 10:48:19 -07:00
Lars Brubaker
1303e8abff Merge pull request #1440 from larsbrubaker/master 
Don't load deleted printers
 2016-09-28 17:20:05 -07:00
Lars Brubaker
1816c52545 Better window size for eeprom 
Refactoring
Send M115 if can't find eeprom settings
 2016-09-28 17:16:21 -07:00