iLLiCiTiT bb97c3cdd2 Merge branch 'develop' into feature/maya_python_3 ... # Conflicts: # openpype/modules/default_modules/ftrack/python2_vendor/arrow # openpype/modules/default_modules/ftrack/python2_vendor/ftrack-python-api		2021-09-15 14:45:35 +02:00
..
hooks	Update pre_copy_template_workfile.py	2021-07-28 11:11:46 +01:00
hosts	Merge branch 'develop' into feature/maya_python_3	2021-09-15 14:45:35 +02:00
lib	Merge pull request #2016 from pypeclub/bugfix/python_2_comp_fix	2021-09-14 21:20:17 +02:00
modules	Merge pull request #2015 from pypeclub/bugfix/1310-ftrack-actions-in-job-monitor	2021-09-14 21:21:26 +02:00
plugins	Merge pull request #1975 from tokejepsen/bugfix/stop_timer_as_extractor	2021-09-09 09:14:21 +02:00
resources	moved password dialog to openpype widgets	2021-06-03 12:16:39 +02:00
scripts	h264 cares about bitrate	2021-08-05 10:45:17 +02:00
settings	Merge pull request #2003 from pypeclub/PYPE-1823_Nuke-13-compatibility	2021-09-15 13:20:33 +02:00
style	made tabs a little bit more visible	2021-08-15 23:26:43 +02:00
tests
tools	steps can not be set	2021-09-09 14:28:17 +02:00
vendor	Merge branch 'develop' into feature/maya_python_3	2021-09-15 14:45:35 +02:00
widgets	recalculate relativelly offset by value	2021-08-30 11:33:00 +02:00
__init__.py	Merge branch 'develop' into feature/dynamic_modules	2021-08-04 18:10:37 +02:00
__main__.py
action.py
api.py	addressing comments PR#1996	2021-09-10 14:43:09 -07:00
cli.py	Merge remote-tracking branch 'origin/develop' into enhancement/headless-and-validation	2021-09-01 13:15:50 +02:00
plugin.py	added docstring for get_dynamic_data	2021-06-09 12:07:27 +02:00
pype_commands.py	Webpublisher - moved dummy ls to api	2021-08-25 15:06:27 +02:00
version.py	[Automated] Bump version	2021-08-31 09:35:27 +00:00