Milan Kolar
|
b7053630a5
|
resolve conflict
|
2018-10-16 23:42:17 +02:00 |
|
Milan Kolar
|
dbe6203318
|
Merge remote-tracking branch 'origin/ftrack-all-jakub' into sync-avalon
# Conflicts:
# pype/plugins/global/publish/collect_deadline_user.py
# pype/plugins/global/publish/submit_publish_job.py
fixed conflicts
|
2018-10-16 22:36:38 +02:00 |
|
Milan Kolar
|
9a99d640fe
|
get up to dat with colorbleed. add 'studio.' to families temporarily
|
2018-10-16 22:26:42 +02:00 |
|
Jakub Jezek
|
2c21cbdb3b
|
all dependencies for ftrack solved
|
2018-10-16 14:39:21 +02:00 |
|
Jakub Jezek
|
776af26cb6
|
ftrack-api-python3 dependencies to pype.vendor
|
2018-10-11 15:20:01 +02:00 |
|
Jakub Jezek
|
0bdc5d6e71
|
ftrack-api integration initialization
|
2018-10-10 18:34:04 +02:00 |
|
Jakub Jezek
|
c668594a35
|
commit fixes app.lib
|
2018-10-10 17:10:49 +02:00 |
|
Jakub Jezek
|
ff0faa176d
|
nuke plugins work
|
2018-10-07 08:14:01 +02:00 |
|
Jakub Jezek
|
8b931f5207
|
adding pyblish plugins from kredenc
|
2018-10-03 19:06:08 +02:00 |
|
Jakub Jezek
|
2dc510a3ab
|
Merge branch 'initialisation' into nuke-all-jakub
|
2018-10-02 23:49:09 +02:00 |
|
Jakub Jezek
|
eb9936b487
|
family names cut of 'studio.'
|
2018-10-02 23:35:35 +02:00 |
|
Jakub Jezek
|
7667674317
|
rename config folder
|
2018-10-02 22:55:04 +02:00 |
|