Commit graph

1424 commits

Author SHA1 Message Date
Petr Kalis
2eaca1ea03 Merge branch 'develop' of github.com:pypeclub/pype into feature/1121-site-sync-add-site-information-and-buttons-to-loader_op 2021-04-08 18:59:01 +02:00
Jakub Jezek
d5e4c1ee0c
Hiero: otio export finishing 2021-04-08 18:56:02 +02:00
Jakub Jezek
7d8457d7f9
Merge branch 'develop' into feature/1235-hiero-unify-otio-workflow-from-resolve 2021-04-08 18:28:38 +02:00
iLLiCiTiT
261e1db2c0 changed keyring key of mongodb data to OpenPype/mongodb 2021-04-08 17:15:26 +02:00
iLLiCiTiT
787d037ca0 imported OpenPypeSecureRegistry in pype.lib.__init__ 2021-04-08 17:08:04 +02:00
iLLiCiTiT
ee93c229fe added some docstring to OpenPypeSecureRegistry 2021-04-08 16:54:32 +02:00
Jakub Jezek
2890a5fcbc
Hiero: otio publishing workflow wip 2021-04-08 16:30:13 +02:00
Petr Kalis
89a49d9d12 Settings cleaned up icons, replaced by standard from resources 2021-04-08 15:59:22 +02:00
iLLiCiTiT
454bd9d1b5 copy pasted secure registry logic from igniter to pype lib 2021-04-08 15:40:21 +02:00
Petr Kalis
331b80d6fe SyncServer - fix scrolling 2021-04-08 15:15:47 +02:00
Ondrej Samohel
72e0c42543
small refactors 2021-04-08 14:27:30 +02:00
iLLiCiTiT
983b9264ec clockify is using keyring to store and receive api key 2021-04-08 14:11:22 +02:00
Milan Kolar
69ce0a8194
Merge pull request #1270 from pypeclub/fix/AE_highlight_comp_render
Fix clean up of composition must propagate to instance
2021-04-08 13:49:52 +02:00
Milan Kolar
3c268d6693
Merge pull request #1251 from pypeclub/bugfix/ftrack_api_connection
Ftrack api connection fix
2021-04-08 13:30:03 +02:00
Petr Kalis
7981a23655 Merge branch 'develop' of github.com:pypeclub/pype into feature/1121-site-sync-add-site-information-and-buttons-to-loader_op 2021-04-08 13:13:58 +02:00
Milan Kolar
0a3d9b1dbd
Merge pull request #1286 from pypeclub/bugfix/local_settings_applications
Fix executables from local settings
2021-04-08 12:59:08 +02:00
iLLiCiTiT
153160f85d use OpenPypeRegistry to set, get and remove ftrack credentials 2021-04-08 12:58:45 +02:00
iLLiCiTiT
5a7d19337c added helper function to get secure item key the same way 2021-04-08 12:43:27 +02:00
iLLiCiTiT
b742f3a9c5 credentials are not stored per user 2021-04-08 12:42:53 +02:00
Milan Kolar
5b7f94c5a5
Merge pull request #1257 from pypeclub/feature/shell_prelaunch_hook
Shell prelaunch hook fix
2021-04-08 12:36:04 +02:00
iLLiCiTiT
d7bca3f53c fix executables from local settings 2021-04-08 12:11:16 +02:00
iLLiCiTiT
a6ac99c755 added ability to define name of registry 2021-04-08 11:31:41 +02:00
iLLiCiTiT
cf2dc1f70e renamed PypeSettingsRegistry to OpenPypeSettingsRegistry 2021-04-08 11:31:04 +02:00
Jakub Jezek
0a23208381
Merge branch 'develop' into feature/1235-hiero-unify-otio-workflow-from-resolve 2021-04-08 11:10:11 +02:00
Jakub Jezek
5d64ed22a2
remains of unrenamed pype. namespace 2021-04-08 11:01:54 +02:00
Jakub Jezek
6c27152eeb
Hiero: otio-workflow wip 2021-04-08 10:52:15 +02:00
iLLiCiTiT
4377dbb026 removed resolve from shell prelaunch hook 2021-04-08 10:46:01 +02:00
iLLiCiTiT
d1e047d40c moved one method from credentials.py to ftrack module 2021-04-08 10:32:46 +02:00
iLLiCiTiT
ae5d05a813 ftrack server waits until event hub is connected 2021-04-08 10:10:44 +02:00
iLLiCiTiT
38926fe85e updated custom session with new timeout attribute 2021-04-08 10:10:20 +02:00
iLLiCiTiT
73abae2f26 removed unused function 2021-04-08 09:59:58 +02:00
Milan Kolar
39f5103d4e
Merge pull request #1274 from pypeclub/fix/AE_remove_orphaned_instances
AE remove orphaned instance from workfile
2021-04-08 09:58:40 +02:00
Milan Kolar
18860253bc
Merge pull request #1277 from pypeclub/feature/dynamic_app_variants
Dynamic app variants
2021-04-08 09:57:53 +02:00
Milan Kolar
42fd33ef81 add unreal and terminal to modifiable applications 2021-04-08 09:53:16 +02:00
Milan Kolar
0d71f7c216 remove mayabatch from applications 2021-04-08 09:50:20 +02:00
Petr Kalis
c8ab6a6971 Merge remote-tracking branch 'origin/bugfix/ftrack_api_connection' into feature/1121-site-sync-add-site-information-and-buttons-to-loader_op 2021-04-07 17:53:16 +02:00
Simone Barbieri
5a1889e413 Fix for the workflow between Blender and Unreal for OpenPype 3.0 2021-04-07 16:49:27 +01:00
Petr Kalis
cc832d0156 SyncServer - fix roots must have root key 2021-04-07 17:39:58 +02:00
iLLiCiTiT
dd82401259 fix root_value_for_template method in Anatomy 2021-04-07 17:33:41 +02:00
iLLiCiTiT
19a9a54754 ftrack custom attributes have right tool label 2021-04-07 17:17:19 +02:00
iLLiCiTiT
da32cbe8b0 fix tool labels 2021-04-07 17:17:04 +02:00
Petr Kalis
264025554e SyncServer - fix label from local to active 2021-04-07 17:14:53 +02:00
Petr Kalis
1c4d1f0346 SyncServer - fix wrong method for local site 2021-04-07 17:04:12 +02:00
iLLiCiTiT
e59e959a95 fix enabled attribute in Application class 2021-04-07 16:51:05 +02:00
iLLiCiTiT
3c4f48e3ab fix applications in local settings 2021-04-07 16:49:38 +02:00
Petr Kalis
e0eeec5e45 SyncServer - fix typo resulting in infinitive recursion 2021-04-07 16:44:57 +02:00
iLLiCiTiT
b86c56015a removed TODO which is already done 2021-04-07 16:37:10 +02:00
iLLiCiTiT
633f99f13e count with metadata keys in tools too and add variant label too 2021-04-07 16:37:00 +02:00
iLLiCiTiT
db4836e662 fill variant label with label from metadata 2021-04-07 16:36:39 +02:00
Petr Kalis
f2609f5f12 Merge branch 'develop' of github.com:pypeclub/pype into feature/1121-site-sync-add-site-information-and-buttons-to-loader_op 2021-04-07 16:34:33 +02:00