Jaime van Kessel
efeba48ffb
Move initializeSettingDefinitions and setting functions to their own function
...
This means we don't have to instantiate CuraApplication in the tests anymore
2019-02-18 09:45:30 +01:00
Jaime van Kessel
75b185d462
Add test for duration messages for printInformation
2019-02-15 16:43:08 +01:00
Jaime van Kessel
4acc480544
Also add tests for configurationModel
2019-02-15 15:27:57 +01:00
Jaime van Kessel
369c64e1b6
Add tests for PrintJobOutputModel & PrinterOutputModel
2019-02-15 15:19:19 +01:00
Lipu Fei
f521fae152
Fix call_on_qt_thread decorator
...
CURA-6225
Do thread check in the wrapper function, not outside.
2019-02-15 15:11:11 +01:00
Jaime van Kessel
2820bc2e8f
Merge branch 'master' of github.com:Ultimaker/Cura
2019-02-15 14:08:22 +01:00
Jaime van Kessel
c0d75b38b7
Added test to check if a key in the profile is defined in the definition
2019-02-15 14:06:46 +01:00
Ghostkeeper
d42ba9dda0
Merge branch '4.0'
...
Conflicts:
resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg -> Weights being changed while a whole slew of fixes were being done on 4.0
resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg -> Ditto
2019-02-15 13:58:47 +01:00
Ghostkeeper
f3cab17e20
Revert "Check if on main thread for call_on_qt_thread"
...
This reverts commit 21099e30cb
2019-02-15 13:45:23 +01:00
Lipu Fei
21099e30cb
Check if on main thread for call_on_qt_thread
...
CURA-6225
2019-02-15 12:51:42 +01:00
Ian Paschal
61b84bdcfc
Merge pull request #5305 from Ultimaker/CL-1250_set_cloud_buildplate
...
CL-1250 set cloud build plate
2019-02-15 10:28:07 +01:00
Lipu Fei
45af26879f
Merge pull request #5298 from Ultimaker/CURA-6120_arrange_child_nodes_fix
...
Arrange child-nodes (like blocker) with parents. [CURA-6120]
2019-02-14 16:05:23 +01:00
Remco Burema
2f5e973836
Partly revert sugested changes for '()'s because line-breaks. [CURA-5864]
2019-02-14 15:01:32 +01:00
Remco Burema
f1b6e527be
Rectified wrong placement of brackets causing logic change. [CURA-5864]
2019-02-14 14:55:12 +01:00
Jaime van Kessel
68cec2679c
Apply suggestions from code review.
...
Cross some brackets and dot some quotes.
[CURA-5864]
Co-Authored-By: rburema <41987080+rburema@users.noreply.github.com>
2019-02-14 14:52:42 +01:00
Jaime van Kessel
b09538da63
Ensure that the numberOfExtruders property gets updated after configuration sync
...
CURA-6220
2019-02-14 13:44:43 +01:00
Ghostkeeper
6e883c0431
Use default parameter of getMetaDataEntry
...
We don't need to do that manually.
2019-02-14 13:33:01 +01:00
Ian Paschal
10f84184f3
Continued clarification on "name"
...
Contributes to CL-1250
2019-02-14 11:57:47 +01:00
Ian Paschal
af565aff55
Clarify if using key or human-readable name
...
This is refering to "glass", not "Glass". According to @lipufei, "name" should denote a human readable/capitalized name.
Contributes to CL-1250
2019-02-14 11:49:43 +01:00
Remco Burema
0e329946f8
Small refactor (init set plain instead of with empty list). [CURA-6120]
2019-02-14 11:05:13 +01:00
Jaime van Kessel
a8f66a558c
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-02-14 10:53:01 +01:00
Remco Burema
a601e0878c
Explicitly also check for Raft when checking for prime-tower=brim. [CURA-5864]
2019-02-13 15:46:39 +01:00
Simon Edwards
dc9d3ba2a3
Merge pull request #5293 from Ultimaker/CL-1165_missing_cloud_info
...
CL-1165 Improve cloud connection or not checking
2019-02-13 14:23:05 +01:00
Remco Burema
a24dc00bc5
Arrange child-nodes (like blocker) with parents. [CURA-6120]
2019-02-12 18:08:17 +01:00
Ian Paschal
3c2791fefe
Improve cloud connection or not checking
...
Contributes to CL-1165
2019-02-12 12:12:59 +01:00
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
