Ghostkeeper
5b9fb20b9a
Remove unused imports
2019-02-12 11:48:23 +01:00
Remco Burema
c50fcf42c5
Fix crash on no output devices in list.
2019-02-12 11:39:03 +01:00
ChrisTerBeke
14c361a297
Add comment to clarify usage of fallback date
2019-02-11 09:45:50 +01:00
ChrisTerBeke
62c7ba5659
remove unused argument
2019-02-08 22:31:36 +01:00
ChrisTerBeke
4192c9e764
Fix typing issue
2019-02-08 22:30:31 +01:00
ChrisTerBeke
48c756b01d
Fixes for storing timestamp
2019-02-08 22:24:14 +01:00
ChrisTerBeke
05c4b6012e
Calculate expiry date to determine if token refresh is needed
2019-02-08 21:39:45 +01:00
ChrisTerBeke
9d6bd4b29a
Check access token before using it
2019-02-08 21:03:59 +01:00
Ghostkeeper
51420c8311
Merge branch '4.0'
2019-02-08 14:23:36 +01:00
Simon Edwards
1163d8f442
Merge pull request #5271 from Ultimaker/CL-1222_cloud_flow_pop_up
...
CL-1222 Cloud flow pop up
2019-02-08 13:26:03 +01:00
Ghostkeeper
473633de2c
Merge branch '4.0'
2019-02-08 11:28:06 +01:00
Ghostkeeper
1b29ff2b8a
Make authorisation error messages translatable
...
Because they weren't. Foreigners might not understand them.
2019-02-08 11:19:22 +01:00
Ghostkeeper
12b2154a96
Fix code style and documentation formatting
2019-02-08 11:10:43 +01:00
Ghostkeeper
eb3129815d
Fix some code style
...
Please, people, adhere to our code style.
2019-02-08 11:01:09 +01:00
Jaime van Kessel
a1d08dab69
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2019-02-08 10:51:08 +01:00
Jaime van Kessel
91f0d76c8a
Fix crash when user was logged in but there was no internet connection on boot
2019-02-08 10:50:17 +01:00
Ian Paschal
5f0d9fc16a
Merge remote-tracking branch 'origin/4.0' into CL-1237_fix_move_to_top
2019-02-08 09:41:41 +01:00
Lipu Fei
d6abad3f27
Merge remote-tracking branch 'origin/master' into CURA-5864_prime_tower_brim_enable
2019-02-07 14:47:11 +01:00
Lipu Fei
e5071eac5b
Fix typing
2019-02-07 14:31:40 +01:00
Lipu Fei
47d531e2c5
Fix typing
2019-02-07 14:30:10 +01:00
Lipu Fei
6e40e4a831
Remove unused things
2019-02-07 14:29:59 +01:00
Remco Burema
da6ff7c5a9
Merge branch 'master' into temp_CURA-5864
2019-02-06 16:23:30 +01:00
Simon Edwards
18786a1e7d
Fix the default content-type for HTTP PUT requests in NetworkedPrinterOutputDevice
...
CL-1237
2019-02-06 12:18:32 +01:00
Ian Paschal
01ca3546aa
Add activeMachineAddress to MachineManager for easy access
...
Contributes to CL-1222
2019-02-06 11:59:39 +01:00
Remco Burema
0a860c7011
Dissalow overlap of skirt/brim (model vs. prime-towrer) in case of prime-tower brim. [CURA-5864]
2019-02-05 18:15:23 +01:00
Lipu Fei
fff6cb9ce8
Merge remote-tracking branch 'origin/4.0'
2019-02-05 09:48:10 +01:00
Lipu Fei
bac344a692
Show extruder names in disabled message
...
CURA-5693
2019-02-05 09:26:50 +01:00
Ian Paschal
f2ddb2808f
Add firmware check
...
Contributes to CL-1222
2019-02-04 16:02:38 +01:00
Ghostkeeper
e7d2400199
Merge branch '4.0'
2019-02-04 13:06:32 +01:00
Diego Prado Gesto
c568759fbc
Merge pull request #4788 from fieldOfView/feature_curaversion_appname
...
Make Cura app name configurable in CuraVersion
2019-02-01 17:18:05 +01:00
Diego Prado Gesto
42ca21fc1a
Fix typo in comment
2019-02-01 16:46:09 +01:00
Lipu Fei
f7765189c8
Show Extruder 1,2,3,... in message
...
CURA-5693
2019-02-01 13:36:10 +01:00
Jaime van Kessel
5600d5407c
Add default if group_name is not set.
...
Otherwise we get a crash.
CURA-6153
2019-02-01 12:02:59 +01:00
Jaime van Kessel
4aaeb8c2d5
Merge branch 'CURA-6153_wrong_name_on_disconnect' of github.com:Ultimaker/Cura into 4.0
2019-02-01 11:54:35 +01:00
Lipu Fei
efa26c8323
Merge remote-tracking branch 'origin/4.0'
2019-02-01 11:08:33 +01:00
Remco Burema
7e11345f14
Remove checked off TODO-comment. [CURA-6153]
2019-01-31 20:30:57 +01:00
Remco Burema
954fdb20ad
Rename 'connect_group_name' to 'group_name'. [CURA-6153]
2019-01-31 20:21:42 +01:00
Simon Edwards
eeb23c4ba4
Merge pull request #5255 from Ultimaker/CL-1154_monitor_empty_states
...
CL-1154 Monitor empty states
2019-01-31 16:44:25 +01:00
Remco Burema
6cd3a5fe3d
Show correct printer name in selector-header on disconnect. [CURA-6153]
2019-01-31 15:05:27 +01:00
Lipu Fei
c73747ad44
Merge remote-tracking branch 'origin/4.0'
2019-01-31 14:22:59 +01:00
Jaime van Kessel
3734b980d8
When disabling an extruder due to sync, always show a message.
...
Originally it would only show a message if the extruder was actually used,
but this didn't take the flow into account when you would first sync and then load a model.
In that case, the user never got a message and never got any notification that (and why) any of the extruders
got disabled.
CURA-5693
2019-01-31 11:30:37 +01:00
Jaime van Kessel
e40b730457
Merge branch 'CURA-5693_handle_empty_variant_and_material' of github.com:Ultimaker/Cura into 4.0
2019-01-31 11:22:00 +01:00
Ian Paschal
389bdeb0c7
Expose configurations the same way as connectivity
...
Contributes to CL-1154
2019-01-31 10:50:14 +01:00
Lipu Fei
5a196423db
Merge remote-tracking branch 'origin/4.0'
2019-01-31 08:47:01 +01:00
Lipu Fei
4f6d53b009
Do not disable all extruders when syncing
...
CURA-5693
When syncing with a machine with no material/nozzle, do not disable all
extruders. leave the first one enabled.
2019-01-31 08:30:41 +01:00
Jaime van Kessel
87070aefce
Fixed typing issues for configuredConnectionTypes
...
CURA-6159
2019-01-30 17:17:46 +01:00
Ghostkeeper
a36aa3f17b
Merge branch '4.0'
2019-01-30 12:53:18 +01:00
Ghostkeeper
14300e745f
Use Doxygen-style comments for documentation
...
According to our style. Not just single line comments without anything else.
Contributes to issue CURA-6159.
2019-01-30 12:52:58 +01:00
Lipu Fei
b70e9c9080
Handle empty hotend and material in config syncing
...
CURA-5693
- Disable an extruder if the config states no material or nozzle for
it.
- Show a warning message if an used extruder gets disabled.
2019-01-29 13:06:38 +01:00
Ghostkeeper
232498980c
Merge branch '4.0'
...
Conflicts:
cura/GlobalStacksModel.py -> CuraContainerRegistry being used in stead of ContainerRegistry, but imports were reordered.
plugins/CuraDrive/src/DrivePluginExtension.py -> Typing being solved in two ways.
2019-01-28 16:45:45 +01:00
