Toke Jepsen
|
9b31031791
|
Merge branch 'develop' into change/develop/nukestudio_improvements
|
2019-07-04 08:34:27 +01:00 |
|
Jakub Trllo
|
41dfa3de48
|
Merged in bugfix/PYPE-406_hierarchical_attrs (pull request #188)
Bugfix/PYPE-406 hierarchical attrs
Approved-by: Milan Kolar <milan@orbi.tools>
|
2019-07-02 13:49:39 +00:00 |
|
Jakub Trllo
|
5352422d77
|
simplified sync and removed custom db connector
|
2019-07-01 22:37:58 +02:00 |
|
Toke Jepsen
|
0470fea6d8
|
When creating new assets syncing from Ftrack would overwrite data in Avalon. Since the inputs aren't a custom attribute, the "inputs" would be overwritten on creation.
|
2019-07-01 18:26:27 +01:00 |
|
Jakub Trllo
|
029ccc0f55
|
hotfix: custom attribute keys which are not on entities are skipped
|
2019-07-01 17:08:02 +02:00 |
|
Jakub Trllo
|
7038387ba3
|
avalon entities data are not overriden but updated (due to hierarchical attributes)
|
2019-06-28 17:18:57 +02:00 |
|
Jakub Trllo
|
633b01e3c6
|
sync to avalon skipping hierarchical attributes
|
2019-06-28 17:18:13 +02:00 |
|
Jakub Trllo
|
00ce72e8f2
|
added custom db connector from another branch not final!!!
|
2019-06-28 17:17:25 +02:00 |
|
Toke Jepsen
|
73720698fc
|
Update ftrack_base_handler.py
|
2019-06-11 19:27:33 +01:00 |
|
Jakub Trllo
|
7d748c9dc2
|
credentials moved to lib
|
2019-05-22 13:45:30 +02:00 |
|
Jakub Trllo
|
1917944069
|
base handler import log directly from pypeapp
|
2019-05-22 13:45:17 +02:00 |
|
Milan Kolar
|
2460cd1fdc
|
Merge branch '2.0/develop' into develop
|
2019-05-20 18:44:28 +02:00 |
|
Milan Kolar
|
6868859aea
|
hotfix/minot fixes for submitting maya to deadline in 2.0
|
2019-05-10 17:10:31 +02:00 |
|
Jakub Trllo
|
91ab9e3c5f
|
fixed ftrack_api import in ftrack_base_handler
|
2019-05-08 12:09:25 +02:00 |
|
Jakub Trllo
|
1ed32627c5
|
bug fixed ftrack_api symbol not used from imported module but directly imported
|
2019-05-08 10:14:44 +02:00 |
|
Jakub Trllo
|
7c7b925671
|
import ftrack_api is specified now from pype.vendor
|
2019-04-28 20:47:32 +02:00 |
|
Jakub Trllo
|
7ed5c1c1d1
|
(fix) forgotten method definition
|
2019-04-23 17:34:16 +02:00 |
|
Jakub Trllo
|
6157dff134
|
update ftrack preactions
|
2019-04-19 21:33:58 +02:00 |
|
Jakub Trllo
|
5d603f0446
|
Merged in feature/PYPE-202_preactions (pull request #75)
Feature/PYPE-202 preactions
Approved-by: Milan Kolar <milan@orbi.tools>
|
2019-04-13 15:07:43 +00:00 |
|
Milan Kolar
|
dce33a9370
|
convert anatomy in plugins to new
|
2019-04-13 01:06:48 +02:00 |
|
Milan Kolar
|
b72368e1d7
|
Merge branch '2.0/sync_from_1.0' into 2.0/develop
# Conflicts:
# pype/ftrack/lib/ftrack_app_handler.py
|
2019-04-12 19:00:33 +02:00 |
|
Milan Kolar
|
03d85fafb8
|
Merge branch 'develop' into 2.0/sync_from_1.0
# Conflicts:
# pype/ftrack/lib/ftrack_app_handler.py
|
2019-04-12 18:59:22 +02:00 |
|
Milan Kolar
|
b262c304ce
|
fix logging
|
2019-04-12 18:53:14 +02:00 |
|
Milan Kolar
|
30d600b894
|
Merge branch '2.0/bugfix/PYPE-287-chase-old-dependencies' into 2.0/develop
|
2019-04-12 18:27:45 +02:00 |
|
Milan Kolar
|
e08b026e9d
|
fix anatomy
|
2019-04-12 18:26:39 +02:00 |
|
Jakub Trllo
|
c6f94113aa
|
created action for start timer and set it as preaction for apps
|
2019-04-11 14:29:16 +02:00 |
|
Jakub Trllo
|
b9e43bed77
|
preactions also added to actions
|
2019-04-11 14:24:14 +02:00 |
|
Milan Kolar
|
698c59c8ea
|
convert presets to pype2.0 way
|
2019-04-10 00:12:09 +02:00 |
|
Milan Kolar
|
7fe8d02abf
|
Merge branch 'develop' into 2.0/sync_from_1.0
# Conflicts:
# pype/ftrack/actions/action_djvview.py
# pype/ftrack/actions/event_collect_entities.py
# pype/ftrack/lib/ftrack_app_handler.py
# pype/plugins/global/publish/collect_assumed_destination.py
# pype/plugins/launcher/actions/AssetCreator.py
|
2019-04-09 23:00:22 +02:00 |
|
Milan Kolar
|
6c0bba1168
|
Merge branch 'develop' into 2.0/sync_from_1.0
|
2019-04-09 22:38:28 +02:00 |
|
Milan Kolar
|
28dbe25f16
|
use new anatomy
|
2019-04-09 18:28:27 +02:00 |
|
Jakub Trllo
|
918d588225
|
templates are loaded from database when app is launched
|
2019-04-09 16:31:11 +02:00 |
|
Milan Kolar
|
7e1c815607
|
change logger imports
|
2019-04-08 22:07:27 +02:00 |
|
Jakub Trllo
|
eb3f8d80a2
|
added "app" into all template_data thath fill "work" dir
|
2019-04-04 16:55:40 +02:00 |
|
Jakub Trllo
|
bb11c77334
|
ability to set default preactions
|
2019-04-04 11:23:58 +02:00 |
|
Jakub Trllo
|
315ed42a41
|
launch moved back
|
2019-04-04 11:18:18 +02:00 |
|
Jakub Trllo
|
67a672f676
|
handle preactions moved to base handler
|
2019-04-04 11:14:06 +02:00 |
|
Jakub Trllo
|
35db6b394e
|
preactions are by default empty list
|
2019-04-04 11:13:28 +02:00 |
|
Jakub Trllo
|
fdf261ed58
|
added possibility to have register conditions if action will be registered
|
2019-04-04 11:12:13 +02:00 |
|
Jakub Trllo
|
83f907d771
|
removed ability - checking if app is already running
|
2019-04-04 11:09:35 +02:00 |
|
Jakub Trllo
|
a9ec09de43
|
Merge branch 'develop' into feature/PYPE-202_preactions
|
2019-04-04 10:45:48 +02:00 |
|
Jakub Trllo
|
30abd7ff5c
|
fixed imports to 2.0 in pype/ftrack
|
2019-03-20 09:35:46 +01:00 |
|
Jakub Trllo
|
5760d2b53a
|
Merge branch 'develop' into feature/PYPE-224_clockify_integration
|
2019-03-18 12:02:17 +01:00 |
|
Jakub Trllo
|
b10ac0b279
|
fixed bug in start clockify app launch
|
2019-03-16 09:50:54 +01:00 |
|
Jakub Trllo
|
6f624c8a2d
|
base handler catch assert exceptions
|
2019-03-15 18:17:15 +01:00 |
|
Jakub Trllo
|
7d3a0fe82b
|
start timer set tag_ids instead of task_id
|
2019-03-15 09:52:07 +01:00 |
|
Jakub Trllo
|
e0f6ba6eb2
|
task name is added to timer description
|
2019-03-15 09:41:04 +01:00 |
|
Jakub Trllo
|
f23b0f0b8a
|
better result handling on ftrack ations
|
2019-03-14 18:15:22 +01:00 |
|
Jakub Trllo
|
c2eb4599e8
|
_translate_event is not launched by default so events are faster
|
2019-03-13 16:31:51 +01:00 |
|
Jakub Trllo
|
af477178f5
|
event's exceptions are logged out on crash
|
2019-03-13 16:28:12 +01:00 |
|