Commit graph

6270 commits

Author SHA1 Message Date
Toke Stuart Jepsen
c131ffefbd Calculate size
- option to only calculate without deletion
2020-07-23 11:12:06 +01:00
Milan Kolar
40b470b1cf update ffmpeg variable and small maya fix 2020-07-20 11:08:16 +02:00
Milan Kolar
2f9c05dc96
Merge pull request #329 from tokejepsen/2.x/bugfix/socket_thread_timeout
Increase socket thread timeout.
2020-07-17 19:22:44 +02:00
Toke Stuart Jepsen
62e296de6d Using PYPE_FTRACK_SOCKET_TIMEOUT variable
and default 45.
2020-07-17 17:52:16 +01:00
Milan Kolar
398e1c7b28
Merge pull request #355 from tokejepsen/2.x/bugfix/preview_always_true
Fix preview always True.
2020-07-17 17:57:57 +02:00
Milan Kolar
3b4ef0ec8b
Merge pull request #359 from pypeclub/bugfix/mac-tweaks
Mac tweaks
2020-07-17 17:43:00 +02:00
Milan Kolar
56c283558d
Merge pull request #354 from simonebarbieri/bugfix/blender_local_objects_duplicates
bugfix/Blender local objects duplicated
2020-07-17 17:37:58 +02:00
Milan Kolar
b00d4647c0
Merge pull request #353 from pypeclub/bugfix/last_workfile_existence_check
Bugfix/last workfile existence check
2020-07-17 17:25:31 +02:00
Milan Kolar
c30626265d
Merge pull request #349 from pypeclub/feature/last_res_to_resources
Feature/last res to resources
2020-07-17 17:14:30 +02:00
Milan Kolar
592d77846f
Merge pull request #348 from pypeclub/feature/clockify_tweaks
Feature/clockify tweaks
2020-07-17 17:09:17 +02:00
Milan Kolar
c0b78eb03e Merge branch '2.x/develop' into feature/clockify_tweaks 2020-07-17 16:52:43 +02:00
Jakub Ježek
ff055188a4
Merge pull request #360 from pypeclub/bugfix/validate_autosync_off
Bugfix/validate autosync off
2020-07-17 16:23:21 +02:00
iLLiCiTiT
e879fe7895 changed ReparAction to RepairContextAction 2020-07-17 16:21:25 +02:00
iLLiCiTiT
fdaf486ef5 added additional check to repair for sure 2020-07-17 16:21:11 +02:00
iLLiCiTiT
7f2d6a7d85 one more place where constant for custom attribute key is used 2020-07-17 16:15:52 +02:00
iLLiCiTiT
00acee01ce get_invalid returns project only if auto sync is turned on 2020-07-17 16:15:10 +02:00
iLLiCiTiT
f7304ba26d do not query project in process part (not used) 2020-07-17 16:14:48 +02:00
iLLiCiTiT
ab9e1637fe use constant from ftrack.lib for custom attribute name 2020-07-17 16:14:30 +02:00
Milan Kolar
f62dbe2672 change string attribute to ingeter in project sync 2020-07-17 16:10:43 +02:00
Jakub Ježek
ecc3a943b3
Merge pull request #358 from pypeclub/bugfix/celaction_litle_bits
fix(global): remove duplicate code for copy files
2020-07-17 12:52:05 +02:00
Jakub Jezek
59608daac1 fix(global): remove duplicate code for copy files 2020-07-17 11:50:07 +01:00
Jakub Ježek
690878e8d6
Merge pull request #357 from pypeclub/bugfix/celaction_litle_bits
Bugfix/celaction litle bits
2020-07-17 12:44:50 +02:00
Ondrej Samohel
5f53213dc5 added mac stuff to gitignore 2020-07-16 17:22:54 +02:00
Jakub Jezek
027ac52004 fix(celaction): correct host path 2020-07-16 14:46:25 +01:00
Jakub Jezek
91786b5206 fix(celaction): support for space in folder or file name 2020-07-16 14:45:51 +01:00
Simone Barbieri
8aed10d1b5 Fixed indentation 2020-07-16 14:17:33 +01:00
Toke Stuart Jepsen
4d1f5b12dc Fix preview always True. 2020-07-16 11:44:02 +01:00
iLLiCiTiT
f2fdd9ca0a job status fix 2020-07-15 15:22:08 +02:00
iLLiCiTiT
0cdf9ac479 set estimate for new project 2020-07-15 15:02:20 +02:00
iLLiCiTiT
6ea84a04e2 fix job status on crash 2020-07-15 15:02:08 +02:00
iLLiCiTiT
ae043d5a65 fix icon path 2020-07-15 15:01:55 +02:00
Simone Barbieri
21df2093d5 Fixed problem with local objects 2020-07-15 12:23:04 +01:00
Milan Kolar
19dadf5b0b
Merge pull request #347 from simonebarbieri/bugfix/blender_crash_with_remove
Bugfix/Blender crash with remove
2020-07-14 16:11:49 +02:00
iLLiCiTiT
05cc4385df check if last workfile exist before env variable is set 2020-07-14 15:04:42 +02:00
iLLiCiTiT
2fdf6a4ec1 undo changes in ftrack.lib.__init__ 2020-07-14 11:28:39 +02:00
iLLiCiTiT
a8db8cd241 removed unused imports 2020-07-14 11:25:22 +02:00
iLLiCiTiT
6d8148af6b not successfull project creation log full response from clockify 2020-07-14 11:23:51 +02:00
iLLiCiTiT
8e05b9f33c task types have more logs 2020-07-14 11:23:25 +02:00
iLLiCiTiT
acd933954b do not store project_id because is not used 2020-07-14 11:22:52 +02:00
iLLiCiTiT
56736a62c1 made ftrack part of getting data easier to read 2020-07-14 11:22:28 +02:00
iLLiCiTiT
88ddce4313 removed deprecated parts of stync action 2020-07-14 11:21:35 +02:00
iLLiCiTiT
5c20c38630 api check addedto beginning of launch method 2020-07-14 11:21:20 +02:00
iLLiCiTiT
11a680dba5 simplified discover 2020-07-14 11:20:55 +02:00
iLLiCiTiT
09dc456f73 removed preregister method because api check must happen just before launch because is running in different process than tray 2020-07-14 11:20:25 +02:00
iLLiCiTiT
b8afa33abb fix import 2020-07-14 10:50:19 +02:00
iLLiCiTiT
308d643bae moved resources changed in code 2020-07-13 14:12:18 +02:00
iLLiCiTiT
21645bb30b moved remaining resources from ~/pype/res/ to ~/pype/pype/resources/icons/ 2020-07-13 13:59:52 +02:00
iLLiCiTiT
53bdf84abb removed Thumbs.db from pype/res 2020-07-13 13:59:17 +02:00
iLLiCiTiT
0ace96c4dc catch all exceptions in tray during module object creation 2020-07-13 11:23:43 +02:00
iLLiCiTiT
be135a7932 added workspace_name attribute to clockify 2020-07-13 11:18:58 +02:00