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

5095 commits

This branch
This branch
All branches
Author SHA1 Message Date
Greg
2ceda33d62 Fixed Downloads provider automated tests 
MatterHackers/MCCentral#286
Pre-pended "-" to Temporary folder created in Download provider tests. Temporary folder
now shows up as the first Downloads item in list.
 2016-09-13 12:58:07 -07:00
Lars Brubaker
93d5f8d2ed Merge pull request #1382 from unlimitedbacon/profiles 
Changed default_movement_speeds to manual_movement_speeds since the f…
 2016-09-13 12:24:20 -07:00
Tyler Anderson
fb3705c8f9 Changed default_movement_speeds to manual_movement_speeds since the former is now ignored 2016-09-13 12:07:11 -07:00
Lars Brubaker
e639207cf1 Merge pull request #1380 from larsbrubaker/master 
Fixed tests
 2016-09-13 11:50:41 -07:00
Lars Brubaker
5ff2b45420 latest agg 2016-09-13 11:14:24 -07:00
Lars Brubaker
79e461cf81 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-09-13 11:13:32 -07:00
Lars Brubaker
d93ae17eca Fixing tests 2016-09-13 11:12:13 -07:00
Lars Brubaker
31128b8c9d Merge pull request #1378 from larsbrubaker/master 
Some HTML rendering tests
 2016-09-13 09:27:42 -07:00
larsbrubaker
89ebfa7361 Some HTML rendering tests 2016-09-12 21:55:40 -07:00
Lars Brubaker
527ab44d1f Merge pull request #1377 from larsbrubaker/master 
Make sure we dons't call user changed until we are done loading.
 2016-09-12 17:18:58 -07:00
Lars Brubaker
f27d555af1 latest agg 2016-09-12 17:10:05 -07:00
Lars Brubaker
87f10fd3a8 Make less possible threading issues on ProfileManager 2016-09-12 16:20:01 -07:00
Lars Brubaker
9ca333ff97 Make sure we dons't call user changed until we are done loading. 2016-09-12 14:06:42 -07:00
Lars Brubaker
cbb0c5fb32 Merge pull request #1376 from larsbrubaker/master 
Wrote a DownloadToImageAsync function in in StaticData
 2016-09-10 12:37:59 -07:00
larsbrubaker
9866b98930 Somehow missed the file delete 2016-09-10 12:30:53 -07:00
larsbrubaker
b9ce5e15cd latest agg 2016-09-10 12:22:42 -07:00
larsbrubaker
d6d91f0df5 Deleted ImageWidget_AsyncLoadOnDraw 
Implemented the funcion on ImageBuffer
Wrote a DownloadToImageAsync function in in StaticData
 2016-09-10 12:19:50 -07:00
larsbrubaker
0ac4f4e5f4 merge 2016-09-09 20:25:19 -07:00
larsbrubaker
ce972c4326 new ray trace bundle work 2016-09-09 20:22:46 -07:00
Lars Brubaker
c7000a9fdf Merge pull request #1375 from larsbrubaker/master 
moving IsLoading to after done with the OnLoading call back.
 2016-09-09 16:20:20 -07:00
Lars Brubaker
76cfe47590 moving IsLoading to after done with the OnLoading call back. 2016-09-09 16:14:11 -07:00
Lars Brubaker
715c7ba4ba Merge pull request #1374 from larsbrubaker/master 
latest agg
 2016-09-09 15:25:07 -07:00
Lars Brubaker
99ad969ecf Latest agg 2016-09-09 15:20:33 -07:00
Lars Brubaker
bb000f40eb Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-09-09 15:18:50 -07:00
Lars Brubaker
47b7635b60 Merge pull request #1373 from larsbrubaker/master 
Fixed the key to delete profiles on
 2016-09-09 15:13:10 -07:00
Lars Brubaker
904ac7c449 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-09-09 14:56:32 -07:00
Lars Brubaker
9b2dbdcfe3 Fixed the key to delete profiles on 
Added fire and forget for task
Added WaitUntil function on Automation Runner
Added some documentation
 2016-09-09 14:48:37 -07:00
Lars Brubaker
a2246e1139 Merge pull request #1371 from larsbrubaker/master 
Took out ChangeID and Made ID a property do it
 2016-09-09 10:29:44 -07:00
Lars Brubaker
b9b2f93dcc Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-09-09 10:22:38 -07:00
Lars Brubaker
778bf8823f Took out ChangeID and Made ID a property do it 
Fixes MatterHackers/MCCentral#393
 2016-09-09 09:55:53 -07:00
johnlewin
5ac6ff1e1c Merge pull request #1370 from mmoening/master 
Fixed Bug in Public profile Static Data fallback
 2016-09-08 20:37:46 -07:00
Matt Moening
7acfd1ca6a Fixed bug in Public Profiles Static data Fallback 
- Fixed bug discovered while writing test
 - Added check for null ProfileManager.Instance to allow tests to work when initializing in a differently than MC
 2016-09-08 18:10:46 -07:00
Matt Moening
1135271a9f Removed Public Profile tests from AutomationTests 
- these were moved into MCCentral
 2016-09-08 18:10:46 -07:00
johnlewin
f423a19120 Merge pull request #1368 from larsbrubaker/master 
Made delete printer a function
 2016-09-08 15:50:57 -07:00
Lars Brubaker
be1c5eaddf Made delete printer a function inside of MatterControl utilities 
Re-factoring
 2016-09-08 14:20:39 -07:00
Lars Brubaker
4dd38cd409 Merge pull request #1367 from larsbrubaker/master 
Created new layer change G code
 2016-09-08 13:13:47 -07:00
Lars Brubaker
c23afa5566 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-09-08 10:30:28 -07:00
Lars Brubaker
6f0ffb17fd Created new layer change G code 2016-09-08 10:30:14 -07:00
Lars Brubaker
106c86df58 Merge pull request #1366 from larsbrubaker/master 
Test that printers delete on guest profile
 2016-09-08 09:36:25 -07:00
Lars Brubaker
cd27388ad5 Test that printers delete on guest profile 2016-09-07 17:00:17 -07:00
Lars Brubaker
ec893f7277 Merge pull request #1363 from unlimitedbacon/stuff 
Switched movement control settings from mm/min to mm/s
 2016-09-07 15:57:39 -07:00
Lars Brubaker
8840298561 Merge pull request #1365 from larsbrubaker/master 
Make settings history consistent across references
 2016-09-07 15:55:12 -07:00
Lars Brubaker
92f01f894e Make settings history consistent across references 
Revert ChangeID code
 2016-09-07 15:53:52 -07:00
Lars Brubaker
5a1c0fe8d2 Merge pull request #1364 from larsbrubaker/master 
Removed ChangeID -> set ID property
 2016-09-07 15:45:29 -07:00
Lars Brubaker
ced3d5174f Removed ChangeID -> set ID property 2016-09-07 15:15:49 -07:00
johnlewin
0bf232854c Merge pull request #1362 from larsbrubaker/master 
Improved printer edit pop-up
 2016-09-07 13:25:31 -07:00
Tyler Anderson
a75453fe87 Switched movement control settings from mm/min to mm/s 2016-09-07 13:19:04 -07:00
Lars Brubaker
fe5ea9315c latest matter slice. 2016-09-07 12:10:11 -07:00
Lars Brubaker
19eac00467 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-09-07 12:08:09 -07:00
Lars Brubaker
fbe9b17f46 Improved printer edit pop-up 2016-09-07 12:08:03 -07:00