Lars Brubaker
|
bfa1d735fc
|
Moved redeem code into ApplicationController
|
2016-11-14 16:51:01 -08:00 |
|
johnlewin
|
0beb684a69
|
Merge pull request #1623 from jlewin/1.6.0
Remove HockeyApp exception
|
2016-11-14 16:20:19 -08:00 |
|
John Lewin
|
ba5b3dc780
|
Remove HockeyApp exception
|
2016-11-14 16:15:24 -08:00 |
|
Lars Brubaker
|
e8f4dacf2c
|
Merge pull request #1622 from larsbrubaker/1.6.0
fixed the redeem share code
|
2016-11-14 16:02:48 -08:00 |
|
Lars Brubaker
|
313b3b901e
|
fixed the redeem share code
MatterHackers/MCCentral#817
Redeem Purchase/Share code are non functional
|
2016-11-14 15:58:24 -08:00 |
|
johnlewin
|
f0496637f2
|
Merge pull request #1621 from jlewin/1.6.0
Throw in release to test HockeyApp reporting
|
2016-11-14 15:51:15 -08:00 |
|
John Lewin
|
ef15c50689
|
Throw in release to test HockeyApp reporting
|
2016-11-14 15:44:31 -08:00 |
|
johnlewin
|
fd167e2dad
|
Merge pull request #1619 from jlewin/1.6.0
Remove nunit from production code
|
2016-11-14 11:54:17 -08:00 |
|
John Lewin
|
e7f36fcb59
|
Remove nunit from production code
|
2016-11-14 11:46:32 -08:00 |
|
Lars Brubaker
|
07393c76f2
|
Merge pull request #1617 from larsbrubaker/1.6.0
More smoothie fix
|
2016-11-14 09:37:55 -08:00 |
|
Lars Brubaker
|
09eaccb8b9
|
Merge branch '1.6.0' of https://github.com/MatterHackers/MatterControl into 1.6.0
|
2016-11-11 18:35:43 -08:00 |
|
Lars Brubaker
|
a01df173d8
|
More smoothie fix
|
2016-11-11 18:35:18 -08:00 |
|
johnlewin
|
834c3e5d2c
|
Merge pull request #1616 from jlewin/1.6.0
Restore original naming
|
2016-11-11 17:11:43 -08:00 |
|
John Lewin
|
05dbebec31
|
Restore original naming
|
2016-11-11 17:06:12 -08:00 |
|
johnlewin
|
860b4f4e49
|
Merge pull request #1615 from larsbrubaker/1.6.0
getting smoothie resend working.
|
2016-11-11 16:36:53 -08:00 |
|
Lars Brubaker
|
2f909df4cf
|
getting smoothie resend working.
|
2016-11-11 16:29:25 -08:00 |
|
johnlewin
|
9eef915b9b
|
Merge pull request #1614 from jlewin/1.6.0
Rename CameraInUse flag
|
2016-11-11 14:51:01 -08:00 |
|
John Lewin
|
aa6ee96808
|
Rename CameraInUse flag
|
2016-11-11 14:45:34 -08:00 |
|
johnlewin
|
4b6ca99812
|
Merge pull request #1613 from jlewin/1.6.0
Force Make/Model to Other/Other if null or empty
|
2016-11-11 13:44:16 -08:00 |
|
John Lewin
|
6de490fd39
|
Force Make/Model to Other/Other if null or empty
- Workaround for server side requirements
|
2016-11-11 13:03:57 -08:00 |
|
Lars Brubaker
|
53cdc9b0da
|
Merge pull request #1611 from larsbrubaker/1.6.0
Make sure we initialize PrintHistoryData for print recovery
|
2016-11-10 15:56:15 -08:00 |
|
Lars Brubaker
|
22a54815b1
|
Make sure we initialize PrintHistoryData for print recovery
|
2016-11-10 15:51:58 -08:00 |
|
johnlewin
|
15ace21155
|
Merge pull request #1610 from jlewin/1.6.0
Close application on EULA cancel
|
2016-11-09 17:37:28 -08:00 |
|
John Lewin
|
61c509fecc
|
Close application on EULA cancel
|
2016-11-09 15:14:22 -08:00 |
|
johnlewin
|
39bad5139a
|
Merge pull request #1609 from jlewin/1.6.0
Prevent invoke on null references
|
2016-11-09 13:33:34 -08:00 |
|
John Lewin
|
c09fcc479e
|
Cleanup whitespace
|
2016-11-09 13:26:49 -08:00 |
|
John Lewin
|
89f44a8856
|
Prevent invoke on null references
|
2016-11-09 13:24:00 -08:00 |
|
Lars Brubaker
|
914d6ad868
|
Merge pull request #1608 from larsbrubaker/1.6.0
Made the queue always populate on touch
|
2016-11-09 11:17:45 -08:00 |
|
Lars Brubaker
|
7ea08edc29
|
Made the queue always populate on touch
|
2016-11-09 11:13:45 -08:00 |
|
Lars Brubaker
|
b89455a11b
|
Merge pull request #1607 from larsbrubaker/1.6.0
Moved the redeem buttons for T7
|
2016-11-09 10:28:51 -08:00 |
|
Lars Brubaker
|
dc923538be
|
Moved the redeem buttons for T7
|
2016-11-09 10:24:43 -08:00 |
|
Lars Brubaker
|
a9684a7b70
|
Merge pull request #1606 from larsbrubaker/1.6.0
Make sure we are able to print HW erorrs on any printer after connect…
|
2016-11-09 10:23:11 -08:00 |
|
Lars Brubaker
|
e7aa87338e
|
Make sure we are able to print HW erorrs on any printer after connection.
|
2016-11-09 09:22:38 -08:00 |
|
Lars Brubaker
|
abc90f589c
|
Merge pull request #1605 from larsbrubaker/1.6.0
Fixed export when apply leveling not applyed.
|
2016-11-09 09:07:26 -08:00 |
|
Lars Brubaker
|
1415563f53
|
Fixed export when apply leveling not applyed.
|
2016-11-08 18:21:23 -08:00 |
|
Lars Brubaker
|
b3a186d3df
|
Merge pull request #1604 from larsbrubaker/1.6.0
Make sure we reload the printer menu in touchscreen
|
2016-11-08 16:17:31 -08:00 |
|
Lars Brubaker
|
22ea59abe5
|
Merge branch '1.6.0' into 1.6.0
|
2016-11-08 16:06:13 -08:00 |
|
Lars Brubaker
|
074ea0cdf8
|
Make sure we reload the printer menu in touchscreen
|
2016-11-08 16:02:05 -08:00 |
|
johnlewin
|
cb6e87e607
|
Merge pull request #1603 from larsbrubaker/1.6.0
Make sure we can raise keyboard on wizard windows
|
2016-11-08 15:22:54 -08:00 |
|
Lars Brubaker
|
f5e45c9a2f
|
Updated copywrite
|
2016-11-08 15:01:16 -08:00 |
|
Lars Brubaker
|
ba0970434a
|
Make sure we can raise keyboard on wizard windows
|
2016-11-08 14:56:42 -08:00 |
|
Lars Brubaker
|
4357d17a56
|
Merge pull request #1601 from larsbrubaker/1.6.0
Show sign in status message on android
|
2016-11-08 12:30:41 -08:00 |
|
Lars Brubaker
|
6de35b03a1
|
Merge branch '1.6.0' of https://github.com/MatterHackers/MatterControl into 1.6.0
|
2016-11-08 12:21:05 -08:00 |
|
Lars Brubaker
|
bc640c003e
|
Refactor name
|
2016-11-08 12:20:25 -08:00 |
|
Lars Brubaker
|
1bc1d5c10e
|
Merge pull request #1599 from larsbrubaker/1.6.0
Update action row on profile list changes
|
2016-11-08 11:32:58 -08:00 |
|
Lars Brubaker
|
f623c4edf9
|
Show sign in status message on android
|
2016-11-08 11:32:58 -08:00 |
|
Lars Brubaker
|
6b2add8c44
|
Update action row on profile list changes
|
2016-11-08 10:49:01 -08:00 |
|
Lars Brubaker
|
83b31493e8
|
Merge pull request #1597 from jlewin/1.6.0
Workaround for Library selection crash
|
2016-11-07 14:28:39 -08:00 |
|
John Lewin
|
e83a0bd42a
|
Workaround for Library selection crash
|
2016-11-07 14:06:40 -08:00 |
|
Lars Brubaker
|
6df36ea37d
|
Merge pull request #1596 from larsbrubaker/1.6.0
Don't save close state on reload of settings
|
2016-11-07 14:05:06 -08:00 |
|