Commit graph

9358 commits

Author SHA1 Message Date
iLLiCiTiT
7b285dcba0 hound fixes once more (changed indent from 3 to 4) 2020-12-17 12:08:58 +01:00
iLLiCiTiT
c2a06d6f19 hound fixes 2020-12-17 12:06:42 +01:00
iLLiCiTiT
52eafcd668 skip processing if new status id is same as asset version already has 2020-12-17 11:56:46 +01:00
iLLiCiTiT
ee3e840e4a removed join_query_keys from event as it is in base already 2020-12-17 11:50:48 +01:00
iLLiCiTiT
fc6bc15080 fixed missing status name in mapping 2020-12-17 11:50:24 +01:00
iLLiCiTiT
c8d6d120f5 fixed query templates 2020-12-17 11:50:00 +01:00
iLLiCiTiT
128a86b3b0 separated skip logs 2020-12-17 11:49:40 +01:00
iLLiCiTiT
4fbd70328a moved gui schema changes back 2020-12-17 11:38:01 +01:00
iLLiCiTiT
4f7b15395b Merge branch 'develop' into feature/task_to_version_use_setings
# Conflicts:
#	pype/tools/settings/settings/gui_schemas/projects_schema/schema_project_ftrack.json
2020-12-17 11:35:35 +01:00
Milan Kolar
5d89f0b83c Merge branch '2.x/develop' into develop 2020-12-16 23:18:33 +01:00
Milan Kolar
3f20b2602d
Merge pull request #695 from simonebarbieri/feature/unreal-support
Unreal: animation, layout and setdress updates
2020-12-16 23:17:44 +01:00
Milan Kolar
02ff1d99cc Merge branch '2.x/develop' into develop 2020-12-16 23:06:39 +01:00
Milan Kolar
50dda03248
Merge pull request #831 from pypeclub/bugfix/maya-deadline-access-shared-violation
Maya: Deadline submitter - shared data access violation
2020-12-16 23:04:50 +01:00
Milan Kolar
a596b96c5f
Merge pull request #825 from pypeclub/feature/thumbnail_event_handler
Thumbnail event handler with settings
2020-12-16 22:31:29 +01:00
Milan Kolar
0a9aa29523 change level default 2020-12-16 22:31:05 +01:00
Milan Kolar
f1f82fb0ce Merge branch 'master' into develop 2020-12-16 22:22:38 +01:00
Milan Kolar
73c285e54c Merge branch 'release/2.14.3' into 2.x/develop 2020-12-16 22:16:17 +01:00
Milan Kolar
6cd6c7b966 bump version 2020-12-16 22:15:46 +01:00
Milan Kolar
639efb674f
Merge pull request #816 from pypeclub/feature/self_contained_tvpaint
Self contained tvpaint
2020-12-16 22:08:13 +01:00
Milan Kolar
27715c0a59
Merge pull request #823 from pypeclub/hotfix/nuke-read-node-from-write
respecting space in path
2020-12-16 21:56:07 +01:00
Milan Kolar
91db8c1fe2
Merge pull request #822 from pypeclub/bugfix/vray-global-aov-switch
Maya: Take into account vray master AOV switch
2020-12-16 21:54:26 +01:00
Milan Kolar
de2a7be94f
Merge pull request #796 from pypeclub/3.0/fix_sync_server_settings
3.0.fix sync server settings
2020-12-16 21:32:50 +01:00
Milan Kolar
a2671b57e9
Merge branch 'develop' into 3.0/fix_sync_server_settings 2020-12-16 21:31:38 +01:00
Milan Kolar
09ac9d38d9
Merge pull request #830 from pypeclub/feature/add_ftrack_actions_to_settings
Add ftrack actions to settings
2020-12-16 21:29:13 +01:00
Milan Kolar
989bdafaad add actions after prettifying 2020-12-16 21:28:07 +01:00
Milan Kolar
493b7e2f70 Merge remote-tracking branch 'origin/develop' into feature/add_ftrack_actions_to_settings 2020-12-16 21:22:35 +01:00
Milan Kolar
91d02419c3 prettire schema 2020-12-16 21:18:48 +01:00
Milan Kolar
b5559047a1
Merge pull request #829 from pypeclub/feature/use_modules_manager_for_user_ftrack_paths
Ftrack module use modules manager for ftrack paths
2020-12-16 21:13:27 +01:00
Milan Kolar
484ec894dd
Merge pull request #828 from pypeclub/feature/list_item_without_label
List item without label in settings gui
2020-12-16 21:08:30 +01:00
Milan Kolar
8b11ce00f0
Merge pull request #827 from pypeclub/bugfix/reset_to_pype_defaults
Reset to pype default action show properly
2020-12-16 21:07:15 +01:00
Milan Kolar
a33bbfd5a4
Merge pull request #826 from pypeclub/feature/remove_start_timer_action
Removed start timer action
2020-12-16 20:53:39 +01:00
Milan Kolar
61a0dbee80
Merge pull request #820 from pypeclub/feature/prettier_jsons
Prettier Jsons
2020-12-16 20:49:52 +01:00
Milan Kolar
05e92d07fb prettier format 2020-12-16 20:48:34 +01:00
Milan Kolar
a82f7bcd1d Merge branch 'develop' into feature/prettier_jsons 2020-12-16 20:44:28 +01:00
Milan Kolar
c2a3d20667
Merge pull request #821 from pypeclub/feature/version_to_task_with_right_settings
Version to task with right settings
2020-12-16 20:42:16 +01:00
Milan Kolar
86f27fd3f7 tweak the help text 2020-12-16 20:40:04 +01:00
Ondrej Samohel
3b4002e9e4
fix shared data access violation, check for oiio 2020-12-16 20:26:45 +01:00
iLLiCiTiT
71af6620b0 changed margins of "label" item in settings 2020-12-16 19:21:27 +01:00
iLLiCiTiT
2b492d4c49 changed label of "Server Events" to "Server Actions/Events" 2020-12-16 19:21:13 +01:00
iLLiCiTiT
b23da64ada added "user_handlers" key to ftrack settings with initial values 2020-12-16 19:20:57 +01:00
iLLiCiTiT
52e892f9fc ftrack server is using ftrack module to get paths to handlers 2020-12-16 19:11:52 +01:00
iLLiCiTiT
c240cd813b user handlers are loaded with modules manager instead of lib functions 2020-12-16 19:05:19 +01:00
iLLiCiTiT
2409dee0c5 ftrack module load default paths to server and user handlers on initialization 2020-12-16 19:04:05 +01:00
iLLiCiTiT
6bdb782786 object specific objects are not created in class definition but on init 2020-12-16 19:03:26 +01:00
iLLiCiTiT
f73dc451be user clockify sync action create ClockifyApi object on initialization 2020-12-16 19:02:41 +01:00
iLLiCiTiT
9eb8602491 clockify server action inherit from ServerAction 2020-12-16 19:01:26 +01:00
iLLiCiTiT
b05d7f5b6e list and list-strict items may not contain "label" key if are not marked with is_group to True 2020-12-16 18:31:16 +01:00
iLLiCiTiT
8225764c56 fix reset to pype's default in hiearchy 2020-12-16 18:24:36 +01:00
iLLiCiTiT
dc33f3d842 ftrack's post launch hook do not trigger start.timer action but trigger start of the timer on it's own 2020-12-16 17:39:29 +01:00
iLLiCiTiT
3674bc8f94 removed start timer action from ftrack 2020-12-16 17:38:56 +01:00