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

4981 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lars Brubaker
b6dcacdef9 Fixed a problem with create new printer 2016-08-31 12:49:25 -07:00
Lars Brubaker
3cabfb3985 Merge pull request #1335 from larsbrubaker/master 
Made the default theme blue - light.
 2016-08-31 12:43:23 -07:00
Lars Brubaker
22bca53d69 Changed the theme colors to save by name 
fixed linux run bug MatterHackers/MCCentral#344

ActiveTheme does not recreate its data all the time
 2016-08-31 11:42:02 -07:00
Lars Brubaker
698426858e Made the default theme blue - light. 
Moved setting to UserrSettingsKey
 2016-08-30 17:30:31 -07:00
Lars Brubaker
cd5f3dec26 Merge pull request #1334 from larsbrubaker/master 
Created a UserSettingsKey and SystemSettingsKey
 2016-08-30 11:22:57 -07:00
Lars Brubaker
cd7406d82b Created a UserSettingsKey and SystemSettingsKey 
Moved some settings into this, lots more to do
 2016-08-30 10:30:55 -07:00
Lars Brubaker
8f8afc5681 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-08-30 10:06:13 -07:00
Lars Brubaker
bbd0117d85 Merge pull request #1333 from larsbrubaker/master 
added  "Don't  ask me again" to ShowAuthPanel.
 2016-08-29 22:12:52 -07:00
larsbrubaker
eebb8b212a added "Don't ask me again" to ShowAuthPanel. 2016-08-29 22:04:09 -07:00
Lars Brubaker
e8572e56a2 Merge pull request #1332 from larsbrubaker/master 
Changed Login -> Sign in & Logout -> Sign Out
 2016-08-29 17:25:31 -07:00
Lars Brubaker
3c7e63c744 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-08-29 17:15:37 -07:00
Lars Brubaker
2dadb72271 Changed Login -> Sign in & Logout -> Sign Out 2016-08-29 17:13:45 -07:00
Lars Brubaker
8cf3521218 Merge pull request #1331 from larsbrubaker/master 
Each unique version of MC requires a separate login
 2016-08-29 17:13:27 -07:00
Lars Brubaker
a9718fa28a Fixed json. 2016-08-29 16:40:00 -07:00
Lars Brubaker
f62d384be9 Make sure we have the right preloaded files. 2016-08-29 16:20:28 -07:00
Lars Brubaker
4207f1c4b9 Each unique version of MC requires a separate login 
Made the ability to get the application instance count
 2016-08-29 15:29:43 -07:00
Lars Brubaker
54b4e0001c Merge pull request #1330 from larsbrubaker/master 
Fixed MatterHackers/MCCentral#340
 2016-08-29 09:42:45 -07:00
Lars Brubaker
d799c79224 Fixed MatterHackers/MCCentral#340 
Fill thin gaps/walls does not toggle to blue like sibling settings
Make development always run on test by default
 2016-08-29 09:41:42 -07:00
Lars Brubaker
6a9bda2822 Merge pull request #1329 from larsbrubaker/master 
changed get("ClientToken") GetClientToken()
 2016-08-26 18:58:06 -07:00
Lars Brubaker
c6d0408ab9 changed get("ClientToken") GetClientToken() 2016-08-26 18:30:21 -07:00
Lars Brubaker
024cfd85b8 Merge pull request #1325 from larsbrubaker/master 
Adding in the ability to turn on and off thin line code
 2016-08-26 12:23:46 -07:00
Lars Brubaker
7981513b6e Adding in the ability to turn on and off thin line code 
Sorted some settings lists
Put in minimum thin line width option
Clean thin line output
 2016-08-26 12:13:39 -07:00
Lars Brubaker
ba3eb27498 Merge pull request #1323 from larsbrubaker/master 
Got the check and uncheck of reload ui settings to work
 2016-08-25 17:47:47 -07:00
Lars Brubaker
98c114f79b Got the check and uncheck of reload ui settings to work 
Wrote a test
Added heat_extruder_before_homing
 2016-08-25 17:43:30 -07:00
Lars Brubaker
d18c8cfcb3 New test for has_fan 2016-08-24 15:53:46 -07:00
Lars Brubaker
7e431f4625 Merge pull request #1320 from larsbrubaker/master 
Makeing Profile History update request server side
 2016-08-23 15:18:07 -07:00
Lars Brubaker
0be1c9d540 Makeing Profile History update request server side 2016-08-23 14:58:56 -07:00
Lars Brubaker
1002686893 pull 2016-08-23 13:48:33 -07:00
Lars Brubaker
de84ea249f Latest Master.txt 2016-08-23 13:47:43 -07:00
johnlewin
13f764ed01 Merge pull request #1315 from jlewin/master 
Disable Edit Preset button on default item
 2016-08-23 13:31:37 -07:00
johnlewin
6cf33b802c Merge pull request #1312 from gregory-diaz/master 
ShowMessageBox if users try t to add new printer while a print is eit…
 2016-08-23 13:31:11 -07:00
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
Greg
eb93687bd5 Prevent user from adding a printer from file menu while print is active. 
Previous pull request prevents user from adding a printer via printers... dropdown while print is active
or paused . This commit achieves the same goal when users take the same action in the file menu.
 2016-08-22 15:03:31 -07:00
Greg
13f8660214 ShowMessageBox if users try t to add new printer while a print is either active or paused 
MatterHackers/MatterControl#1299
 2016-08-22 14:47:21 -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