Commit graph

109 commits

Author SHA1 Message Date
Jakub Trllo
919cdf7178 Merge branch 'develop' into feature/PYPE-71-event_server 2018-12-06 13:00:17 +01:00
Jakub Trllo
5904fa4c65 Revert "renamed file"
This reverts commit ea7a10f94f.
2018-12-06 12:55:05 +01:00
Jakub Trllo
ea7a10f94f renamed file 2018-12-06 12:52:58 +01:00
Jakub Trllo
64bebac394 Removed event server from Tray 2018-12-06 12:49:43 +01:00
Jakub Trllo
796388b330 ftrackRun.py renamed to ftrack_run.py 2018-12-06 11:54:52 +01:00
Jakub Trllo
0d61f2d59f Login dialog withou UI deleted 2018-12-06 11:54:04 +01:00
Jakub Trllo
5eb6c48faf Added event server class. Login dialog bugs repaired: didn't login properly through username+API; icon missing problem 2018-12-06 11:42:48 +01:00
Jakub Trllo
3fda5c32b3 Action syncToAvalon - changed identifier and label. Is visible only for role 'Pypeclub' 2018-12-06 10:13:47 +01:00
Jakub Trllo
c5c6927e61 Merged in feature/sync_avalon_events (pull request #21)
Feature/sync avalon events

Approved-by: Milan Kolar <milan@orbi.tools>
2018-12-05 17:32:06 +00:00
Jakub Trllo
a7ac81dcc1 Prepared action for event server 2018-12-05 16:58:39 +01:00
Jakub Trllo
d1c1c4f039 Sync to avalon event should work like action. Synchronize only projects that have checked Avalon auto-sync. 2018-12-05 16:15:11 +01:00
Milan Kolar
e27b1ee0f8 Merge branch 'develop' into feature/PYPE-13-nuke-loadsequence
# Conflicts:
#	pype/plugins/ftrack/integrate_ftrack_instances.py
#	pype/plugins/nuke/publish/collect_writes.py
#	pype/plugins/nuke/publish/integrate_rendered_frames.py
2018-12-05 13:43:10 +01:00
Jakub Trllo
f586695ed8 Merge branch 'develop' into feature/PYPE-16-sync_avalon_event 2018-12-04 18:48:20 +01:00
Jakub Trllo
c148e9b65e Merged in feature/PYPE-51-custom-attribute-action (pull request #18)
Created attributes are set to group and security roles are set for API only

Approved-by: Milan Kolar <milan@orbi.tools>
2018-12-04 17:35:42 +00:00
Jakub Trllo
5520504975 Merged in feature/PYPE-43 (pull request #15)
Feature/PYPE-43

Approved-by: Milan Kolar <milan@orbi.tools>
2018-12-04 17:22:26 +00:00
Jakub Trllo
5818350ba2 User's can't move entites 2018-12-04 18:16:57 +01:00
Jakub Trllo
e1308d7f64 Action shows only to users in roleList: Admin & Project Manager 2018-12-04 16:55:36 +01:00
Jakub Trllo
884ac36f25 Creates Checkbox for auto-sync event in Project. Action update roles and group on existing attributes 2018-12-04 16:35:04 +01:00
Jakub Trllo
6e0fc1771d Top entity is not pushed to Avalon as asset and error message is full now 2018-12-04 15:50:20 +01:00
Jakub Jezek
27618c8d55 Create write, Publish write, Publish prerendered.frames, Load sequence. All is working 2018-12-04 14:49:11 +01:00
Jakub Trllo
9910fa0b0d Validation Error is now in context 2018-12-04 14:16:02 +01:00
Jakub Trllo
06d473425d Added action validation - only for admins, security role - for admins, Library removed from excepted entity type 2018-12-04 13:39:42 +01:00
Jakub Trllo
01b331fdd9 Added few comments 2018-12-04 13:18:11 +01:00
Jakub Trllo
0cf395c3bc Created attributes are set to group and security roles are set for API only 2018-12-04 11:29:10 +01:00
Jakub Trllo
86ae83df95 Merge branch 'develop' into feature/PYPE-43 2018-12-04 09:41:58 +01:00
antirotor
5b482789fe
fixed launching on linux 2018-12-03 15:02:53 +01:00
Jakub Trllo
a0f6e017f9 Added few words 2018-12-03 12:47:24 +01:00
Jakub Trllo
ce1ff14dad update action 2018-12-03 11:31:25 +01:00
Jakub Trllo
91c3bbf022 Silo is set to same name as highest parent, except Project 2018-12-03 10:41:13 +01:00
Milan Kolar
c0385b3e95 Merge branch 'feature/PYPE-2-pyblish-ftrack' into develop 2018-12-02 12:36:13 +01:00
Milan Kolar
ed6415cce4 Merge branch 'develop' into feature/PYPE-32-nuke-publish-write-sequence
fixing conflicts
2018-12-02 11:50:13 +01:00
Milan Kolar
72773e7a28 fix typo in templates 2018-12-01 17:48:40 +01:00
Milan Kolar
c3e5d70b4d Merged in feature/PYPE-2-pyblish-ftrack (pull request #9)
Feature/PYPE-2 pyblish ftrack #close
2018-11-29 19:37:46 +00:00
Jakub Trllo
c7c592504b Quickfix - change variable: app => apptoml 2018-11-29 17:16:06 +01:00
Jakub Trllo
476208b1e2 Removed features from different branch 2018-11-29 17:11:02 +01:00
Jakub Trllo
e588b6e686 application load label and icon from toml 2018-11-29 17:08:30 +01:00
Jakub Trllo
f415883a66 ftrack_utils:Imported toml 2018-11-29 17:02:49 +01:00
Jakub Trllo
30c4066d2d events can show messages to user now 2018-11-29 16:30:07 +01:00
Jakub Trllo
c684a84df2 Avalon check name is working now 2018-11-29 15:47:14 +01:00
Milan Kolar
3fb57aa30f cleanup code 2018-11-29 15:33:34 +01:00
Jakub Trllo
e71b3aef8d Added few featers that are from different unmerged branches 2018-11-29 15:17:32 +01:00
Jakub Trllo
5db5d7d086 Creating backup 2018-11-29 15:12:20 +01:00
Jakub Trllo
6a94143cc8 Action raises error and show message to user with info about: What he did! 2018-11-29 11:34:18 +01:00
Jakub Trllo
d6a15e259a Creating backup 2018-11-29 11:28:50 +01:00
Jakub Jezek
fe2162cbd2 ftrack connecting to pype.templates 2018-11-29 10:54:52 +01:00
Jakub Trllo
5aa0edffd4 Events work but don't show messag eto user 2018-11-27 19:19:17 +01:00
Milan Kolar
3ab2b7a1bb Merge remote-tracking branch 'origin/develop' into feature/pyblish-ftrack 2018-11-27 14:36:52 +01:00
Jakub Trllo
0543d4405a Merge branch 'develop' into feature/sync_avalon_events
# Conflicts:
#	pype/ftrack/actions/action_syncToAvalon.py
2018-11-27 14:03:05 +01:00
Jakub Trllo
355dcbbae8 If one App is broken other will load. Print were changed for Logger 2018-11-27 12:00:30 +01:00
Jakub Trllo
01cf4230ed Creating Backup 2018-11-27 09:43:47 +01:00