John Lewin
|
4c2e366397
|
Disable Edit Preset button on default item
- Use common string for default menu text
- Localize default menu text
- Issue MatterHackers/MatterControl#1295
|
2016-08-23 09:35:22 -07:00 |
|
johnlewin
|
25a126ed87
|
Merge pull request #1314 from mmoening/master
Sync printer page updates progress of syncing operations
|
2016-08-22 17:02:33 -07:00 |
|
Matt Moening
|
2f68e99449
|
Sync printer page updates progress of syncing operations
- Both private and public profiles report
- public profiles are not called to report but can be later
|
2016-08-22 16:42:55 -07:00 |
|
johnlewin
|
9f1c42b544
|
Merge pull request #1311 from jlewin/master
Conditionally execute UserChanged
|
2016-08-22 12:47:41 -07:00 |
|
John Lewin
|
4b4a5ebfad
|
Conditionally execute UserChanged
- Issue MatterHackers/MCCentral#318
|
2016-08-22 12:39:36 -07:00 |
|
johnlewin
|
39d375be3c
|
Merge pull request #1306 from jlewin/master
Rebuild printers droplist on ProfilesListChanged event
|
2016-08-20 12:17:09 -07:00 |
|
John Lewin
|
7183cbf919
|
Rebuild printers droplist on ProfilesListChanged event
- Fixes list not refreshing after import
- Issue MatterHackers/MCCentral#288
|
2016-08-19 09:27:57 -07:00 |
|
johnlewin
|
c002338d5d
|
Merge pull request #1305 from jlewin/master
Wire up LibraryItemsSelected event to Reloaded items
|
2016-08-19 08:16:14 -07:00 |
|
John Lewin
|
f2c57ae715
|
Wire up LibraryItemsSelected event to Reloaded items
- Reuse Reload function in constructor initialization
- Issue MatterHackers/MatterControl#1298
|
2016-08-19 08:06:21 -07:00 |
|
johnlewin
|
be5b55e696
|
Merge pull request #1304 from jlewin/master
Add assembly binding redirect
|
2016-08-17 19:55:49 -07:00 |
|
John Lewin
|
9e5ac149f4
|
Add assembly binding redirect
- Issue MatterHackers/MCCentral#307
|
2016-08-17 19:49:23 -07:00 |
|
Lars Brubaker
|
1ce37c3d31
|
Merge pull request #1292 from gregory-diaz/master
On first run we effectively sign out user so that they will be forced to sign in and import printers
|
2016-08-17 18:29:17 -07:00 |
|
Lars Brubaker
|
61303768e8
|
Merge pull request #1301 from larsbrubaker/master
Fixed a bug with pause resume gcode
|
2016-08-17 18:24:07 -07:00 |
|
Lars Brubaker
|
cb06d6b1ea
|
Merge pull request #1302 from rytz/master
fixing cm3 superscript in LAYER VIEW
|
2016-08-17 18:22:01 -07:00 |
|
Lars Brubaker
|
b397480b56
|
Removing unneeded files
adding link to main static data.
|
2016-08-17 18:20:52 -07:00 |
|
rytz
|
7d3a191194
|
fixing cm3 superscript in LAYER VIEW
|
2016-08-17 15:34:04 -07:00 |
|
Lars Brubaker
|
357a497505
|
Fixed a bug with pause resume gcode
Made a new test.
added test layouts.txt and master.txt and porperties.json
added paus_gcode and resume_gcode to settingskey
|
2016-08-17 14:04:03 -07:00 |
|
Lars Brubaker
|
835f2efd88
|
Merge pull request #1296 from larsbrubaker/master
spelling error
|
2016-08-16 16:45:18 -07:00 |
|
Lars Brubaker
|
bd417d390a
|
spelling error
fixes #1291
|
2016-08-16 16:39:46 -07:00 |
|
Lars Brubaker
|
2fcb906a2d
|
Merge pull request #1294 from larsbrubaker/master
Upgraded Newtonsoft.Json
|
2016-08-16 16:36:26 -07:00 |
|
Lars Brubaker
|
08926336eb
|
latest ms
|
2016-08-16 14:55:57 -07:00 |
|
Lars Brubaker
|
af3f8d0a03
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
Conflicts:
Submodules/agg-sharp
|
2016-08-16 14:30:44 -07:00 |
|
Lars Brubaker
|
4f97c20891
|
Upgraded Newtonsoft.Json
|
2016-08-16 14:28:15 -07:00 |
|
Greg
|
ad5305e3ae
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2016-08-16 12:59:35 -07:00 |
|
johnlewin
|
0409fe9c1e
|
Merge pull request #1293 from jlewin/master
Revise method name
|
2016-08-16 12:37:27 -07:00 |
|
John Lewin
|
e9b99eb71d
|
Revise method name
|
2016-08-16 11:48:59 -07:00 |
|
Greg
|
1b882e8050
|
If first run we effectively sign out user so that they will be forced to sign in and import printers
MatterMatterHackers/MatterControl#1207
|
2016-08-16 11:22:37 -07:00 |
|
Greg
|
b9ffb8fbc2
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2016-08-15 15:21:13 -07:00 |
|
Greg
|
4bffba0f68
|
Revert "revert this is specifically to cause a git sync fail"
This reverts commit c5587a07df.
|
2016-08-15 15:05:05 -07:00 |
|
johnlewin
|
9d40460eea
|
Merge pull request #1290 from jlewin/master
Avoid null conditional result on awaited call to workaround Mono error
|
2016-08-15 14:53:13 -07:00 |
|
John Lewin
|
4e83bab707
|
Avoid null conditional result on awaited call to workaround Mono error
- Issue MatterHackers/MCCentral#283
|
2016-08-15 13:36:40 -07:00 |
|
Lars Brubaker
|
1ef7bd0b8c
|
Merge pull request #1289 from jlewin/master
Assign ActiveSliceSettings.Instance on the UI thread
|
2016-08-12 16:45:12 -07:00 |
|
John Lewin
|
5237ef09da
|
Assign ActiveSliceSettings.Instance on the UI thread
|
2016-08-12 15:59:53 -07:00 |
|
johnlewin
|
8a27863f11
|
Merge pull request #1288 from larsbrubaker/master
Make the EULA come up faster.
|
2016-08-12 15:54:28 -07:00 |
|
Lars Brubaker
|
c6658eaf2a
|
Make the EULA come up faster.
|
2016-08-12 15:07:04 -07:00 |
|
Lars Brubaker
|
9ca5a376a4
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2016-08-12 15:06:08 -07:00 |
|
Lars Brubaker
|
47f1e6d043
|
Merge pull request #1286 from jlewin/master
Revise profile recovery
|
2016-08-12 14:59:33 -07:00 |
|
John Lewin
|
b498f80254
|
Fall back to dummy profile to assist Delete operations as last resort
|
2016-08-12 13:29:22 -07:00 |
|
John Lewin
|
70899bbedf
|
Prevent unhandled exceptions when indexing into OemProfiles
- Return null on caught exceptions
- Issue MatterHackers/MatterControl#1285
|
2016-08-12 13:29:22 -07:00 |
|
John Lewin
|
d4c0751505
|
Update ActiveSliceSettings.Instance before calling SettingChanged event
|
2016-08-12 13:29:22 -07:00 |
|
John Lewin
|
ea381ef7b1
|
Refactor LoadProfileAsync to reuse LoadWithoutRecovery
|
2016-08-12 13:29:22 -07:00 |
|
John Lewin
|
6079694be5
|
Prevent profile recovery during startup
- Fix whitespace
- Remove unused comportNames variable
- Prevent assigning profile reload if already loaded
|
2016-08-12 13:29:22 -07:00 |
|
John Lewin
|
e7b82a47e4
|
Improve history recovery, try up to the last 5 history items
|
2016-08-12 13:29:22 -07:00 |
|
John Lewin
|
d0ce7a5600
|
Move recovery orchestration into ProfileManager.LoadProfileAsync
|
2016-08-12 13:29:22 -07:00 |
|
John Lewin
|
3bc253a3fe
|
Migrate recovery logic from PrinterSettings.LoadFile to PrinterSettings.RecoverProfile
|
2016-08-12 13:29:22 -07:00 |
|
John Lewin
|
c22916c884
|
Move http profile acquisition into LoadProfileAsync
|
2016-08-12 13:29:22 -07:00 |
|
John Lewin
|
72deb94de3
|
Better convey that ChangeID expects a deviceToken param
- Avoid recovery - use PrinterSettings.LoadFile rather than ProfileManager.LoadProfile
|
2016-08-12 13:29:22 -07:00 |
|
Lars Brubaker
|
97eed4a84f
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2016-08-12 11:49:19 -07:00 |
|
Lars Brubaker
|
893b9db70e
|
Merge pull request #1283 from tellingmachine/master
Don't call uninitialized action.
|
2016-08-12 11:47:44 -07:00 |
|
tellingmachine
|
b96ff64a4e
|
Don't call uninitialized action.
This action gets set by code that is part of CloudServices and not part of the common code.
|
2016-08-12 11:27:40 -07:00 |
|