29 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Milan Kolar	c4fede895c	start testing pype templates in publishing	2018-10-24 14:01:48 +02:00
Milan Kolar	7b9ea27f39	cleaning up family names	2018-10-18 13:59:58 +02:00
Milan Kolar	7bd49bfd4e	Merge branch 'sync-avalon'	2018-10-17 10:23:24 +02:00
Milan Kolar	b7053630a5	resolve conflict	2018-10-16 23:42:17 +02:00
Milan Kolar	8aa48c894a	Merge pull request #4 from pypeclub/sync-avalon ... Update from colorbleed	2018-10-16 23:29:26 +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	ff8fe86771	Merge branch 'nuke-all-jakub' of github.com:pypeclub/studio-config into nuke-all-jakub	2018-10-10 17:10:57 +02:00
Jakub Jezek	c668594a35	commit fixes app.lib	2018-10-10 17:10:49 +02:00
Rendering	fea5b55ebb	fix int.py	2018-10-09 16:25:49 +02:00
Jakub Jezek	ff0faa176d	nuke plugins work	2018-10-07 08:14:01 +02:00
Jakub Jezek	e2a600bf78	Merge branch 'nuke-all-jakub' of github.com:pypeclub/studio-config into nuke-all-jakub	2018-10-03 20:40:46 +02:00
Jakub Jezek	710e0d46df	Merge branch 'master' of github.com:pypeclub/studio-config into nuke-all-jakub	2018-10-03 20:40:00 +02:00
Jakub Jezek	8b931f5207	adding pyblish plugins from kredenc	2018-10-03 19:06:08 +02:00
Jakub Ježek	d341fbbc03	Merge pull request #3 from pypeclub/initialisation ... Initialisation	2018-10-03 11:46:50 +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
Jakub Jezek	efb74363b9	integration workfiles for nuke	2018-10-02 16:56:31 +02:00
Jakub Jezek	01f01997b8	nuke integration wip	2018-10-01 00:10:48 +02:00
Jakub Ježek	cfea9c8f5c	Merge pull request #1 from pypeclub/initialisation ... Initialisation convert colorbleed to studio or config	2018-09-27 21:51:08 +02:00
Jakub Jezek	bb17ef7221	nuke integration wip	2018-09-27 21:28:16 +02:00
Jakub Jezek	fe1372fef6	convert "colorbleed" to either "studio" or "config"	2018-09-20 10:37:03 +02:00
Jakub Jezek	528c98c5e3	rebase to initialisation branch	2018-09-15 17:52:29 +02:00
Jakub Jezek	b72efea31c	initial commit	2018-09-13 15:11:59 +02:00
Jakub Ježek	415527918a	Initial commit	2018-09-13 14:07:33 +02:00