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
..
aport	evenmore logging	2019-04-09 18:54:37 +02:00
avalon_apps	change logger imports	2019-04-08 22:07:27 +02:00
clockify	get_tags fixed workspace_id, start timer can have tags, added add_tag method	2019-03-15 09:51:00 +01:00
ftrack	Merge branch 'develop' into 2.0/sync_from_1.0	2019-04-09 23:00:22 +02:00
fusion	colorbleed to pype reformat	2019-01-28 21:27:58 +01:00
houdini	colorbleed to pype reformat	2019-01-28 21:27:58 +01:00
maya	add easytreez to maya menu (needs to be eventually separated to studio specific code)	2019-03-13 08:36:24 +01:00
nuke	Merge branch 'develop' into 2.0/sync_from_1.0	2019-04-09 22:38:28 +02:00
plugins	Merge branch 'develop' into 2.0/sync_from_1.0	2019-04-09 22:38:28 +02:00
premiere	evenmore logging	2019-04-09 18:54:37 +02:00
scripts	colorbleed to pype reformat	2019-01-28 21:27:58 +01:00
services	added basic docstrings	2019-03-22 19:32:01 +01:00
tools	reversed parent list when finding ftrack entity	2019-02-26 09:50:20 +01:00
vendor	cleanup conflicts with CB code	2019-01-28 22:59:57 +01:00
widgets	rename cb to pype	2019-01-28 20:31:55 +01:00
__init__.py	temporarily turn of templates in nuke	2019-04-09 18:28:15 +02:00
action.py	cleanup conflicts with CB code	2019-01-28 22:59:57 +01:00
api.py	temporarily turn of templates in nuke	2019-04-09 18:28:15 +02:00
launcher_actions.py	rename cb to pype	2019-01-28 20:31:55 +01:00
lib.py	logger fixes	2019-04-09 18:22:55 +02:00
plugin.py	Merge branch 'develop' into bugfix/PYPE-147-fixing-nuke-publishing-write	2019-01-30 23:23:12 +01:00
setdress_api.py	colorbleed to pype reformat	2019-01-28 21:27:58 +01:00
templates.py	Merge branch 'develop' into 2.0/sync_from_1.0	2019-04-09 22:38:28 +02:00