31364 Commits

Author SHA1 Message Date
Joey de l'Arago
ca34fe2d2d Change display now to include enterprise for MacOS
Add CFBundleVersionString, this might fix the app not showing up in search.

CURA-6867
2023-01-11 16:47:59 +01:00
Joey de l'Arago
50c4f777ab Fix Cura being moved on install
CURA-6867
2023-01-11 16:08:06 +01:00
Joey de l'Arago
9ae3bc37dc Rename MacOs -> MacOS
CURA-6867
2023-01-11 13:27:26 +01:00
Joey de l'Arago
11b2c94988 Remove build installer check.
CURA-6867
2023-01-11 13:03:16 +01:00
Joey de l'Arago
a80390efb3 Make building easier without signing identity.
CURA-6867
2023-01-11 12:07:12 +01:00
Joey de l'Arago
ddb4547598 Use path to join paths
CURA-6867
2023-01-11 11:57:51 +01:00
Joey de l'Arago
b96c0dce39 Remove source path from build_macos.py because it is unused.
Refactor filename because it now includes the extension.

The component now has -Component.pkg instead of the installer usincg -Installer.pkg. They must have different names but now the input filename is used to upload the artifacts.

CURA-6867
2023-01-10 10:11:27 +01:00
Joey de l'Arago
43b672834b Deprecate DMG building.
CURA-6867
2023-01-10 09:29:49 +01:00
Joey de l'Arago
db501f5eed Merge branch 'main' into CURA-6867_pkg_for_macos
# Conflicts:
#	.github/workflows/cura-installer.yml
2023-01-10 09:19:01 +01:00
jellespijker
a43b51a736 Applied printer-linter format 2023-01-10 08:03:39 +00:00
jspijker
d84545540b Fix unnecessary default_value(s) in blocks_base definition
Contributes to CURA-10101
2023-01-10 09:02:23 +01:00
jspijker
d95314250a Fix typo in blocks_base definition
Contributes to CURA-10101
2023-01-10 08:36:16 +01:00
Jelle Spijker
a28fc03628
Merge pull request #11620 from BlocksTechnology/master
Add Blocks machines to ultimaker cura

Implements CURA-10101
2023-01-10 08:34:01 +01:00
Jelle Spijker
16d2dbf750 Check against macOS
Contribute to CURA-9157 and CURA-6867
2023-01-09 14:51:17 +01:00
Jelle Spijker
3e4453f48b Package the specific file
Contribute to CURA-9157 and CURA-6867
2023-01-09 14:19:58 +01:00
Jelle Spijker
79b898b9f6 Use step output instead of environment vars
Contribute to CURA-9157 and CURA-6867
2023-01-09 14:05:05 +01:00
Jelle Spijker
6b1722b693 Create separate archives per extension
Contribute to CURA-9157 and CURA-6867
2023-01-09 13:26:37 +01:00
Joey de l'Arago
da061910ed Try using new codesign identity. This is a more generic code sign identity that should work with multiple certificates.
CURA-6867
2023-01-09 11:05:49 +01:00
jspijker
7a29c99700 Moved PR template to .github
Added contribution link and code style links
2023-01-07 14:45:51 +01:00
Jelle Spijker
d3e1611c87
Merge pull request #13898 from Ultimaker/ad_pr_template
Add PR template
2023-01-07 14:31:01 +01:00
Jelle Spijker
2f5053da6e
check on version 2023-01-07 14:19:39 +01:00
Jelle Spijker
38b4d8f2c4 Ignore self reg warning 2023-01-06 20:59:32 +01:00
Duarte Bragadesto
63a1994e75
Merge branch 'Ultimaker:main' into master 2023-01-06 18:28:39 +00:00
Duarte Bragadesto
2c4b4eb410
Delete blocks_oneauto_extruder_0.def.json 2023-01-06 18:28:21 +00:00
Duarte Bragadesto
52aed188ba
Merge pull request #1 from Ultimaker/blockstech
Blockstech
2023-01-06 18:27:11 +00:00
Jelle Spijker
1caad1c8dc Shorten run name 2023-01-06 15:34:23 +01:00
Jelle Spijker
ee87e0a925 negate bool input in appropriate place 2023-01-06 15:30:27 +01:00
Jelle Spijker
9f3381a54b Treat bool inputs as bools 2023-01-06 15:16:06 +01:00
Jelle Spijker
aafde6fb4c Don't use github.event. 2023-01-06 14:57:20 +01:00
Jelle Spijker
1048b015b3 IDK 2023-01-06 14:53:51 +01:00
Jelle Spijker
fc6472862d IDK 2023-01-06 14:50:36 +01:00
Jelle Spijker
53a9f43e5c IDK 2023-01-06 14:48:05 +01:00
Casper Lamboo
0d5f482e15
Merge pull request #14223 from Ultimaker/CURA-9522
[CURA-9522] Fix hovering on last popup items triggering popup to close
2023-01-06 14:38:39 +01:00
c.lamboo
12f2246f1c Merge branch 'main' into CURA-9522
# Conflicts:
#	.github/workflows/cura-all-installers.yml
2023-01-06 14:31:37 +01:00
Jelle Spijker
44126324d5 IDK 2023-01-06 14:23:57 +01:00
Jelle Spijker
2aba5ca840 IDK 2023-01-06 14:22:15 +01:00
Jelle Spijker
cd9b36517d Merge remote-tracking branch 'origin/main' into CURA-9522
# Conflicts:
#	.github/workflows/cura-installer.yml
2023-01-06 14:10:38 +01:00
Jelle Spijker
beac5b7eb1 fix wrong quote placement 2023-01-06 14:01:35 +01:00
Jelle Spijker
6a79fc6d37 remove quotes 2023-01-06 14:00:25 +01:00
Jelle Spijker
f4bfe915e1 msi input as a string 2023-01-06 13:58:56 +01:00
Jelle Spijker
803770e38d msi input as a string 2023-01-06 13:56:53 +01:00
Jelle Spijker
787fd803b1 Merge remote-tracking branch 'origin/CURA-9522' into CURA-9522 2023-01-06 13:36:12 +01:00
Jelle Spijker
ce1b0d2ada Merge remote-tracking branch 'origin/main' into CURA-9522 2023-01-06 13:35:55 +01:00
Jelle Spijker
02d9de1aff Require the msi input 2023-01-06 13:34:03 +01:00
Jelle Spijker
4e08e0528e Require the msi input 2023-01-06 13:32:29 +01:00
Jelle Spijker
127b4b7976 fix typing 2023-01-06 13:31:12 +01:00
Joey de l'Arago
12701b7dac Hacky fix for mouseArea bug.
CURA-9522
2023-01-06 13:25:57 +01:00
Jelle Spijker
20c43a4f13 compare against string type 2023-01-06 13:12:02 +01:00
Jelle Spijker
0c8425b273 Ignore old Cura version tags 2023-01-06 13:06:52 +01:00
Jelle Spijker
71ad73beb4 Use bool 2023-01-06 12:57:41 +01:00