15 commits

Author	SHA1	Message	Date
Jakub Jezek	c0e0820739	Merge branch 'develop' into feature/1235-hiero-unify-otio-workflow-from-resolve	2021-04-20 11:15:48 +02:00
iLLiCiTiT	2b97f7d044	Merge branch 'develop' into 1175-add-ffmpeg-and-othe-binaries-to-build	2021-04-15 16:24:32 +02:00
iLLiCiTiT	7b76a0188b	reordered imports	2021-04-14 16:36:00 +02:00
iLLiCiTiT	51713e4cc1	removed legacy processing from extract review	2021-04-14 16:35:48 +02:00
iLLiCiTiT	203c32183d	replaced usage of OPENPYPE_OIIO_PATH env with get_oiio_tools_path function	2021-04-14 15:14:50 +02:00
Milan Kolar	1d6abd9f8e	Merge pull request #1260 from pypeclub/feature/1121-site-sync-add-site-information-and-buttons-to-loader_op ... Feature#1121 site sync add site information and buttons to loader	2021-04-13 18:46:26 +02:00
Jakub Jezek	1fef682dfc	Hiero: fixing review workflow	2021-04-13 16:58:22 +02:00
Jakub Jezek	87ad6fed45	Merge branch 'develop' into feature/1235-hiero-unify-otio-workflow-from-resolve	2021-04-13 14:51:11 +02:00
Jakub Jezek	8a84b0ae3f	Global: fixing Python2 compatibility	2021-04-12 12:34:31 +02:00
Jakub Jezek	cbf39cea7c	Global: adding Hiero to hosts	2021-04-09 12:30:42 +02:00
Petr Kalis	0693d13fbd	SyncServer fix duplication of document skeleton if same sites ... MongoDB contained duplicated skeletons	2021-04-08 19:21:28 +02:00
Jakub Jezek	f74bf468e0	Merge branch 'develop' into feature/916-resolve-instance-manager	2021-04-06 15:04:10 +02:00
Jakub Jezek	40fe1ba76a	Hiero: Solving Merge conflicts	2021-04-06 13:32:00 +02:00
Petr Kalis	399f9bd059	SyncServer adding functionality to Loader ... In one big commit as PR wasnt merged before rebranding and merge exploded	2021-04-06 12:27:49 +02:00
Milan Kolar	8432e94615	rename folder	2021-04-01 18:54:46 +02:00