7490 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jaime van Kessel	adab4a1110	Added "blurred" auth key logging. ... The getSafeaAuthKey prints a key of the same length, but only the last 5 chars are real. The rest is blurred out with * THis is a bit like how most payment services hide your credit card number.	2017-03-24 11:04:08 +01:00
Jaime van Kessel	8023341090	Merge branch '2.5' of github.com:Ultimaker/Cura	2017-03-23 15:15:08 +01:00
Jaime van Kessel	ecbf0e1e28	Only add center to list for merge if there is one	2017-03-23 15:14:34 +01:00
Lipu Fei	a0f841e8eb	Prevent MachineSettings dialog go beyond the top of screen	2017-03-23 13:46:01 +01:00
Lipu Fei	96e9780273	Fix typo in changelog 2.5.0	2017-03-23 08:53:57 +01:00
Lipu Fei	08f6ee319e	Use default font for open file dialog text ... CURA-3495	2017-03-23 08:46:48 +01:00
Lipu Fei	ef0a502dcf	Add { } around statements in "if" ... Make nitpicking people happy :P	2017-03-22 21:05:45 +01:00
Lipu Fei	fa7dc3a708	Use onActivated for profile override combobox	2017-03-22 16:01:50 +01:00
Lipu Fei	e35d276e25	Complete Changelog for 2.5.0 ... CURA-3467	2017-03-22 15:20:57 +01:00
Jack Ha	33d16f8601	Added Not Supported profiles when second extruder is a 0.8 nozzle. CURA-3555	2017-03-22 14:51:53 +01:00
Jack Ha	bd10e50249	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-22 13:24:37 +01:00
Jack Ha	4eff58995d	Merge branch '2.5'	2017-03-22 13:24:32 +01:00
Jack Ha	79ea09d616	Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5	2017-03-22 13:24:21 +01:00
Jack Ha	6dcd4d13e4	Removed quality profile aa0.8 PLA Not Supported. CURA-3555	2017-03-22 13:24:13 +01:00
Lipu Fei	f9e377ec43	Enable/disable Keep/Discard buttons according to selection	2017-03-22 13:07:58 +01:00
Lipu Fei	12918b02b5	CTRL-P only works when the button is enabled ... CURA-3496	2017-03-22 12:01:41 +01:00
Jaime van Kessel	94c6b23418	Codestyle & removal unused imports	2017-03-22 11:38:55 +01:00
Jaime van Kessel	808df4c228	Merge branch '2.5' of github.com:Ultimaker/Cura	2017-03-22 11:03:27 +01:00
Lipu Fei	c6df3adddb	Update 2.5.0 BETA ChangeLog ... CURA-3467	2017-03-22 10:26:01 +01:00
Jack Ha	72db7772f5	Merge branch '2.5'	2017-03-22 09:44:47 +01:00
Jack Ha	3d6e378289	Revert accidently added test-code.	2017-03-22 09:44:21 +01:00
Jack Ha	8275c419c1	Merge branch '2.5'	2017-03-22 09:34:06 +01:00
Jack Ha	40a7d2fecc	Added not supported quality profiles. CURA-3555	2017-03-22 09:33:17 +01:00
Jaime van Kessel	f379791d70	Merge branch '2.5' of github.com:Ultimaker/Cura	2017-03-21 14:43:58 +01:00
Jaime van Kessel	0752c4440c	Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5	2017-03-21 14:43:30 +01:00
Jaime van Kessel	5489fc8caf	Added number of missing quality profiles ... CURA-3555	2017-03-21 14:43:01 +01:00
Jack Ha	f2eebc165f	Merge branch '2.5'	2017-03-21 14:37:42 +01:00
jack	af43b2e8c4	Merge pull request #1554 from LipuFei/feature_CURA-3495_open_in_one ... CURA-3495 Open project/models menu	2017-03-21 14:32:53 +01:00
jack	6d1a99ff33	Merge pull request #1556 from Ultimaker/feature_more_spacing_override_profile_combobox ... Add more spacing between the label and combobox for override profile option	2017-03-21 14:12:40 +01:00
Lipu Fei	622ff4e662	Add default for preference "view/invert_zoom"	2017-03-21 13:56:12 +01:00
Lipu Fei	2d48809214	Also asks when opening a recent project file ... CURA-3495	2017-03-21 13:56:11 +01:00
Lipu Fei	9e5513ade6	Use QUrl to parse fileUrl ... CURA-3495	2017-03-21 13:56:11 +01:00
Lipu Fei	f3167bb84b	Add dialog for opening a project file ... CURA-3495	2017-03-21 13:56:09 +01:00
Jaime van Kessel	70dbeaf256	Merge branch '2.5' of github.com:Ultimaker/Cura	2017-03-21 13:24:06 +01:00
Jaime van Kessel	90a92dce19	If a container_changes can not be found, handle it more gracefully ... CURA-3560	2017-03-21 13:23:50 +01:00
Lipu Fei	8dbb1d47e1	Shrink the widht of profile override combobox	2017-03-21 11:14:55 +01:00
Jaime van Kessel	00258e570f	If a container_changes can not be found, handle it more gracefully ... CURA-3560	2017-03-21 11:13:10 +01:00
Lipu Fei	8f3e7c6fa5	More spacing for override profile combobox	2017-03-21 11:05:37 +01:00
Ghostkeeper	45934202a9	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-21 10:47:35 +01:00
Ghostkeeper	780e24d050	Merge branch 'master' of https://github.com/austin-makeit/Cura into austin-makeit-master	2017-03-21 10:45:43 +01:00
Lipu Fei	eaad358e42	Remove shortcut text in the SaveButton	2017-03-21 09:51:07 +01:00
Jaime van Kessel	8a1ad98ed5	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-21 09:39:27 +01:00
Jaime van Kessel	a8cec631b4	Lowered the required qtquick number for open dialog	2017-03-21 09:39:07 +01:00
jack	07cfe76edb	Merge pull request #1553 from Ultimaker/feature_CURA-3561_save_profile_override_with_codes ... CURA-3561 Save with code names for profile override preference	2017-03-21 09:31:21 +01:00
Lipu Fei	139bb76806	Add CTRL+P shortcut for save/print button ... CURA-3496	2017-03-21 09:28:03 +01:00
Lipu Fei	555cd58f5e	Save with code names for profile override preference ... CURA-3561	2017-03-21 09:09:17 +01:00
austin-makeit	2be100ec42	Rename makeit_l_dual_2nd to makeit_l_dual_2nd.def.json	2017-03-20 10:45:06 -07:00
austin-makeit	f893fa8633	Rename makeit_l_dual_1st to makeit_l_dual_1st.def.json	2017-03-20 10:44:52 -07:00
austin-makeit	8b009181c4	Rename makeit_dual_2nd to makeit_dual_2nd.def.json	2017-03-20 10:44:20 -07:00
austin-makeit	16ac40f22e	Rename makeit_dual_1st to makeit_dual_1st.def.json	2017-03-20 10:44:01 -07:00