Jakub Trllo
|
a223bf69bb
|
Revert "- changed hide() for close()"
This reverts commit 5ae016af8a.
|
2018-12-11 14:20:16 +01:00 |
|
Jakub Trllo
|
5ae016af8a
|
- changed hide() for close()
- ftrack_run: added thread for logout from ftrack/ was freezing whole
application
|
2018-12-11 14:18:34 +01:00 |
|
Milan Kolar
|
e5df6ad2b3
|
Merge branch 'develop' into feature/PYPE-14-ftrack-stop-timer
# Conflicts:
# pype/ftrack/ftrack_run.py
|
2018-12-09 18:09:27 +01:00 |
|
Jakub Trllo
|
b7f7a26bc7
|
restore 5 min countdown from testing 10sec
|
2018-12-07 16:16:49 +01:00 |
|
Jakub Trllo
|
990ff19cea
|
better thread terminating
|
2018-12-07 16:11:17 +01:00 |
|
Jakub Trllo
|
0686794513
|
5 min countdown begin when timer is started. On mouse/keyboard move countdown resets. 30sec before countdown show message to user. After countdown inform user that timer was stopped.
|
2018-12-07 15:48:16 +01:00 |
|
Jakub Trllo
|
dc16dfe78d
|
renamed ftrackRun
|
2018-12-07 10:12:04 +01:00 |
|
Jakub Trllo
|
1ff834e971
|
Merge branch 'develop' into feature/PYPE-71-event_server
|
2018-12-07 09:57:01 +01:00 |
|
Milan Kolar
|
3a38a90784
|
ftrackRun renamed to ftrack_run
|
2018-12-07 09:24:07 +01:00 |
|
Milan Kolar
|
d4b66146ee
|
Merge branch 'hotfix/apps-not-launching-after-last-PR' into develop
|
2018-12-07 01:12:51 +01:00 |
|
Milan Kolar
|
3b3a379b7a
|
fixing issue with apps not launchign at all after last merge
|
2018-12-07 01:12:34 +01:00 |
|
Jakub Trllo
|
352431c6eb
|
Merged in feature/PYPE-54-LOCAL_ICONS (pull request #23)
preparation for 'ftrack_resources'
Approved-by: Milan Kolar <milan@orbi.tools>
|
2018-12-06 22:32:28 +00:00 |
|
Jakub Trllo
|
7fcee7e351
|
Merged in feature/PYPE-73-action_as_API (pull request #22)
Prepared action for event server
|
2018-12-06 22:31:40 +00:00 |
|
Jakub Trllo
|
3730f437a2
|
Basic implementation
|
2018-12-06 18:49:00 +01:00 |
|
Jakub Trllo
|
c7f4476545
|
Merge branch 'develop' into feature/PYPE-14-ftrack-stop-timer
|
2018-12-06 16:51:21 +01:00 |
|
Jakub Trllo
|
e19fbea3e9
|
Identifier is now full app name(with version), so same app won't launch twice if two versions are available.
|
2018-12-06 15:20:05 +01:00 |
|
Jakub Trllo
|
c2d45680fd
|
Merge branch 'feature/PYPE-73-action_as_API' into feature/PYPE-71-event_server
|
2018-12-06 13:17:00 +01:00 |
|
Jakub Trllo
|
919cdf7178
|
Merge branch 'develop' into feature/PYPE-71-event_server
|
2018-12-06 13:00:17 +01:00 |
|
Jakub Trllo
|
f59bcf2e44
|
renamed filename
|
2018-12-06 12:57:44 +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
|
2da8a47442
|
preparation for 'ftrack_resources'
|
2018-12-05 19:00:29 +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
|
6bbb34fa34
|
added module pynput for listening mouse and keyboard
|
2018-12-05 17:59:02 +01: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 |
|