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

5240 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Lars Brubaker
caa79ddff0 Don't load deleted printers 2016-09-28 16:29:11 -07:00
Lars Brubaker
b522a47dbe Making android not connect to unspecified printer 2016-09-28 15:31:40 -07:00
Lars Brubaker
0d028a6429 Merge pull request #1439 from larsbrubaker/master 
Attempting to fix keyboard pop up in android
 2016-09-28 13:59:57 -07:00
Lars Brubaker
e4a934a1f4 Attempting to fix keyboard pop up in android 
white space
 2016-09-28 13:46:26 -07:00
Lars Brubaker
352049f297 Merge pull request #1438 from larsbrubaker/master 
Getting android to build
 2016-09-28 12:59:55 -07:00
Lars Brubaker
4bee2ea718 Made using 2016-09-28 12:56:34 -07:00
Lars Brubaker
4a5181db26 Protect against nulls 2016-09-28 12:51:46 -07:00
Lars Brubaker
c16cede87a Getting android to build 2016-09-28 10:24:11 -07:00
Lars Brubaker
cfe2ad7493 Merge pull request #1437 from larsbrubaker/master 
Make the test count correct
 2016-09-27 17:56:29 -07:00
Lars Brubaker
d1cbeef204 Latest agg 2016-09-27 17:48:37 -07:00
Lars Brubaker
e2686cde08 Make the test count correct 2016-09-27 15:33:35 -07:00
Lars Brubaker
2fec27c108 Merge pull request #1436 from larsbrubaker/master 
Made a setup leveling test work
 2016-09-27 12:50:55 -07:00
Lars Brubaker
de12a5c8ba Finished print leveling test – fixed reset to defaults 
Moved more things to settings key
Disabled end-user license agreement on Mac for now
 2016-09-27 12:47:15 -07:00
Lars Brubaker
ebdf87f6cb latest ms 2016-09-26 16:02:18 -07:00
Lars Brubaker
c3e57dcc3c Made a setup leveling test work 2016-09-26 15:59:29 -07:00
Lars Brubaker
45f2a0c576 Merge pull request #1435 from larsbrubaker/master 
Changing to "Migrate Printers" description
 2016-09-24 11:03:29 -07:00
larsbrubaker
a8749a4edc Changing to "Migrate Printers" description 
MatterHackers/MCCentral#489
Inconsistent action description
 2016-09-24 10:57:40 -07:00
Lars Brubaker
5f9a79037e Merge pull request #1434 from larsbrubaker/master 
Changed the button name to "Close" as it does not cancel the operation.
 2016-09-24 10:56:52 -07:00
larsbrubaker
b0d9d52564 Changed the button name to "Close" as it does not cancel the operation. 2016-09-24 10:46:47 -07:00
johnlewin
e446e3fc21 Merge pull request #1433 from jlewin/master 
Fix PrinterNameStaysChanged test
 2016-09-23 19:20:24 -07:00