Commit graph

4173 commits

Author SHA1 Message Date
Robin De Lillo
83cc964ca0
Apply suggestions from code review
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2024-11-19 08:07:52 -05:00
Petr Kalis
bdd2615420 Merge branch 'develop' of https://github.com/ynput/ayon-core into feature/AY-6789_Render-instance-support-of-Frame-List 2024-11-19 11:45:17 +01:00
Jakub Jezek
6685330455
Merge branch 'develop' into feature/AY-5235_Delivery-Farm-Publishing 2024-11-19 11:05:15 +01:00
Kayla Man
3078ba2a23 kuba's comment - add current project name as argument in the get_container_data and make sure the scene inventory won't show Entity N/A as name and version 2024-11-19 15:45:27 +08:00
robin@ynput.io
7375538f22 Fix lint. 2024-11-18 16:43:31 -05:00
robin@ynput.io
e96133b348 Address feedback from PR. 2024-11-18 16:34:31 -05:00
robin@ynput.io
eabe9674e0 Merge branch 'feature/AY-971_Use-custom-staging-dir-functions' of github.com:ynput/ayon-core into feature/AY-971_Use-custom-staging-dir-functions 2024-11-18 15:45:00 -05:00
Robin De Lillo
f003d8af1d
Apply suggestions from code review
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2024-11-18 15:29:40 -05:00
robin@ynput.io
acaae18966 Merge branch 'develop' into feature/AY-971_Use-custom-staging-dir-functions 2024-11-18 15:23:28 -05:00
robin@ynput.io
ff56393da8 Fix linting. 2024-11-18 13:40:09 -05:00
robin@ynput.io
4a4377b489 Rework to avoid csv_ingest_shot family. 2024-11-18 13:38:21 -05:00
Kayla Man
004e9626ee big roy comment - refactoring the dict per repre_id per project 2024-11-19 00:19:48 +08:00
robin@ynput.io
a69d60f9d4 Merge branch 'develop' into enhancements/allow_csv_ingest_to_create_shot 2024-11-18 08:18:40 -05:00
Robin De Lillo
d2229fbb15
Apply suggestions from code review
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2024-11-18 08:16:02 -05:00
Kayla Man
0866c00201 code tweaks - kuba's comment 2024-11-18 19:18:50 +08:00
Kayla Man
8965a88594 clean up code and add project name row into scene inventory 2024-11-18 17:59:20 +08:00
Kayla Man
574ea3580d codes clean up & make sure it supports mulitple asset loading per project 2024-11-15 21:58:59 +08:00
Kayla Man
0bec953dec query the product id per project 2024-11-14 22:46:43 +08:00
Ynbot
a181fc897d [Automated] Update version in package.py for develop 2024-11-13 10:51:57 +00:00
Ynbot
bccd8d813c [Automated] Add generated package files to main 2024-11-13 10:51:16 +00:00
robin@ynput.io
f6547264fb Fix lint. 2024-11-12 16:30:55 -05:00
robin@ynput.io
863c6f5187 Allow CSV ingest to create new shots. 2024-11-12 16:04:25 -05:00
Roy Nieterau
b9f6f39490
Merge branch 'develop' into enhancement/attributes_by_families_tiny 2024-11-12 16:18:54 +01:00
Jakub Ježek
a42fff3c4c
Merge branch 'develop' into bugfix/AY-7105_colorspacedata-not-correctly-distributed-from-clips 2024-11-12 15:58:19 +01:00
Jakub Ježek
235949b867
Update client/ayon_core/plugins/publish/collect_otio_review.py
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2024-11-12 15:58:08 +01:00
Mustafa Jafar
7c8fced86e
Merge branch 'develop' into enhancement/attributes_by_families_tiny 2024-11-12 16:28:31 +02:00
Jakub Trllo
d09d35fae7
Merge branch 'develop' into bugfix/1007-loader-tool-selection-changes-upon-just-hover-over-version-column 2024-11-12 14:41:58 +01:00
Kayla Man
735409f9ac do not get the container item from self.get_container 2024-11-12 20:13:49 +08:00
Jakub Trllo
b79e0189a0 Use N/A label if is not available 2024-11-11 16:43:17 +01:00
Jakub Trllo
2cf62f0bb4 fix product type key in immutable keys 2024-11-11 16:20:35 +01:00
Jakub Trllo
a089b17f2f added '__required_keys' to CreatedInstance 2024-11-11 16:20:21 +01:00
Jakub Trllo
a6729802dc make sure version combobox has no focus policy 2024-11-11 15:58:47 +01:00
Roy Nieterau
3da898b344
Update client/ayon_core/pipeline/publish/publish_plugins.py
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2024-11-11 15:37:59 +01:00
Roy Nieterau
ac7b59fb89
Merge branch 'develop' into enhancement/attributes_by_families_tiny 2024-11-11 14:45:39 +01:00
Jakub Jezek
a7908a46e9
Update handling of missing otioReviewClips data
- Handle case where otioReviewClips is missing by logging a message.
2024-11-11 12:50:05 +01:00
Kayla Man
dcb838e145 resolve the project root during updating container 2024-11-11 19:17:00 +08:00
Kayla Man
e0ff639c49 Merge branch 'develop' into enhancement/Load-and-manage-products-from-a-library-project 2024-11-11 16:58:57 +08:00
Kayla Man
aaadaffabe refactoring the load container so that it can load the library project 2024-11-11 16:57:41 +08:00
Ynbot
7ae9b18153 [Automated] Update version in package.py for develop 2024-11-08 18:07:45 +00:00
Ynbot
262cc0e7bb [Automated] Add generated package files to main 2024-11-08 18:07:10 +00:00
Jakub Trllo
e9f778496d
Merge branch 'develop' into bugfix/scriptsmenu_run_command_pyside6 2024-11-08 18:06:57 +01:00
Jakub Trllo
41db386f23 add empty lines 2024-11-08 16:59:05 +01:00
Jakub Trllo
20206a3cf3 check executable name before killing the process 2024-11-08 16:57:00 +01:00
Roy Nieterau
652b27d2ee
Merge branch 'develop' into bugfix/loader_load_option_box_widgets 2024-11-08 13:13:17 +01:00
Roy Nieterau
749984c0bf Fix loader load option box widgets 2024-11-08 13:10:44 +01:00
Jakub Trllo
750b99a9a7
Merge branch 'develop' into bugfix/991-file-attribute-definition-can-crash-with-defined-default-value 2024-11-08 11:15:04 +01:00
Roy Nieterau
32b0b6e613
Merge branch 'develop' into bugfix/scriptsmenu_run_command_pyside6 2024-11-08 10:21:19 +01:00
Jakub Trllo
7b26f2629a
Merge branch 'develop' into bugfix/886-manager-filter-to-outdated-toggle-does-not-work 2024-11-08 09:54:23 +01:00
Jakub Trllo
1de069c324 remove unnessary conversion 2024-11-07 18:47:15 +01:00
Jakub Trllo
8a7239fc05 remove unncessary line 2024-11-07 18:47:04 +01:00