6402 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Milan Kolar	eea020eca7	Merge branch 'hotfix/option-to-disable-photoshop-exports' into develop	2020-07-31 16:48:25 +02:00
Milan Kolar	8934fba388	make png and jpeg configurable in config	2020-07-30 17:45:05 +02:00
Milan Kolar	edf61b7c28	bump version to 2.11.1	2020-07-29 10:51:23 +02:00
Milan Kolar	1370af1ca8	Merge branch 'hotfix/celaction-workfile-versioning'	2020-07-28 16:00:26 +02:00
Milan Kolar	607ecb71fa	Merge branch 'hotfix/celaction-workfile-versioning' into develop	2020-07-28 16:00:25 +02:00
Milan Kolar	e6111ac624	Merge branch 'hotfix/celaction-publish-metadata-json' into develop	2020-07-28 16:00:16 +02:00
Milan Kolar	b4997d74e9	Merge branch 'hotfix/celaction-publish-metadata-json'	2020-07-28 15:59:47 +02:00
Jakub Jezek	7df271afb3	fix(global): unneeded code	2020-07-28 15:57:56 +02:00
Milan Kolar	5c3e809092	Merge branch 'hotfix/photoshop_save_as_is_explicit'	2020-07-28 15:50:07 +02:00
Milan Kolar	a69d8725ba	Merge branch 'hotfix/photoshop_save_as_is_explicit' into develop	2020-07-28 15:50:06 +02:00
Jakub Jezek	2d553e5cc4	feat(celactoin, global): metadata json folder fixes on path	2020-07-28 15:39:18 +02:00
iLLiCiTiT	2a4d075ae5	plugins extract review and extract image in photoshop does not use SaveAs to folder without specifying the filename	2020-07-28 15:30:22 +02:00
Jakub Jezek	9527904cff	fix(celaction): version up method taken fro pype.lib	2020-07-28 14:26:25 +02:00
Milan Kolar	660633606b	Merge branch 'master' into develop	2020-07-28 14:22:22 +02:00
Milan Kolar	eb9f9173c5	Merge branch 'hotfix/fix-ass-update-with-sequence'	2020-07-28 14:22:16 +02:00
Milan Kolar	d761a65a24	Merge branch 'hotfix/fix-ass-update-with-sequence' into develop	2020-07-28 14:22:15 +02:00
Milan Kolar	a87022b47f	make sure we skip frames in proxy loader	2020-07-28 12:33:38 +02:00
Milan Kolar	1e91fe0138	Merge branch 'master' into develop	2020-07-28 11:24:29 +02:00
Milan Kolar	cd70e66b17	Merge branch 'hotfix/photoshop_review_resolution_fix'	2020-07-28 11:24:09 +02:00
Milan Kolar	1842753e35	Merge branch 'hotfix/photoshop_review_resolution_fix' into develop	2020-07-28 11:24:09 +02:00
Milan Kolar	0035dc009a	ensure that resolution is divisible by 2	2020-07-28 11:13:27 +02:00
Milan Kolar	da97d8909a	Merge branch '2.x/develop' into develop	2020-07-28 09:13:21 +02:00
Milan Kolar	bfd9f0e0c8	Merge branch 'master' into develop	2020-07-28 09:13:07 +02:00
Milan Kolar	471bc57156	Merge branch 'master' into 2.x/develop	2020-07-28 09:13:01 +02:00
Milan Kolar	9ed0639789	add mb to maya loaders	2020-07-27 17:10:02 +02:00
Milan Kolar	56525851ea	Merge branch 'release/2.11.0' into 2.x/develop	2020-07-27 13:15:21 +02:00
Milan Kolar	062d40681d	Merge branch 'release/2.11.0'	2020-07-27 13:15:15 +02:00
Milan Kolar	cf6371e862	Merge branch 'release/2.11.0' into develop	2020-07-27 13:15:13 +02:00
Milan Kolar	c05f3060ba	version bump	2020-07-27 13:14:09 +02:00
Milan Kolar	300f7e3119	Merge branch 'feature/set_status_to_assetversion' into release/2.11.0	2020-07-27 13:13:54 +02:00
Milan Kolar	20ff2829ca	Merge branch 'feature/set_status_to_assetversion' into 2.x/develop	2020-07-27 13:13:18 +02:00
iLLiCiTiT	eec1d35e3f	skip scene for changing version to taks statuses	2020-07-27 13:04:58 +02:00
iLLiCiTiT	d14975d9b1	change status on task not on asset version	2020-07-27 12:46:25 +02:00
iLLiCiTiT	94be335e91	change staus of asset version if is set	2020-07-27 12:27:37 +02:00
iLLiCiTiT	6f2132b0aa	added function _asset_version_status for getting statuses	2020-07-27 12:26:10 +02:00
Milan Kolar	5e4906dafc	Merge pull request #385 from pypeclub/feature/client-events_pugins ... fix(celaction): version up	2020-07-27 12:25:43 +02:00
iLLiCiTiT	f52a1de2d1	fix stored project entity in collect ftrack api	2020-07-27 12:25:38 +02:00
Jakub Jezek	702ad11023	fix(celaction): version up	2020-07-27 12:13:45 +02:00
Milan Kolar	962feb5edc	Merge pull request #365 from pypeclub/feature/optional_last_workfile_launch ... Feature/optional last workfile launch	2020-07-27 11:25:03 +02:00
Milan Kolar	d63e51da9c	Merge pull request #379 from pypeclub/feature/pype_version_in_tray ... feature/pype version in tray	2020-07-27 11:22:52 +02:00
iLLiCiTiT	b7cf667924	show the version string all the time	2020-07-27 10:03:22 +02:00
Milan Kolar	10ca31482f	Merge pull request #378 from pypeclub/bugfix/celaction-deadline-rendering ... celaction deadline rendering	2020-07-26 22:49:06 +02:00
Milan Kolar	43d8600b19	Merge pull request #380 from pypeclub/bugfix/template_choose_fix ... Bugfix/template choose fix	2020-07-26 21:56:39 +02:00
Milan Kolar	507afc442e	Merge pull request #373 from pypeclub/feature/safer_maya_tools ... Feature/safer maya tools	2020-07-26 21:47:48 +02:00
Milan Kolar	9548dda22a	Merge pull request #351 from pypeclub/feature/maya-validate-instance-in-context ... validator for Maya: check if instances asset matches context asset	2020-07-26 21:36:30 +02:00
Milan Kolar	36bc8d3a4a	Merge pull request #372 from pypeclub/feature/clockify_on_event_server ... Feature/clockify on event server	2020-07-26 21:35:20 +02:00
iLLiCiTiT	50422e3b05	reset matching profiles if profile value is higher than previous	2020-07-24 17:26:41 +02:00
iLLiCiTiT	60501b1763	added time check for limit of 10 request in 1 second	2020-07-24 12:30:28 +02:00
iLLiCiTiT	f4d49b330e	add version item only if client information is in config.ini	2020-07-24 11:12:47 +02:00
iLLiCiTiT	4d638ebdc8	added item to tray menu with version	2020-07-24 11:08:04 +02:00