Commit graph

370 commits

Author SHA1 Message Date
Jakub Trllo
d3753fef31 Merge branch 'develop' into release/3.15.x
# Conflicts:
#	openpype/hosts/aftereffects/api/pipeline.py
#	openpype/hosts/photoshop/api/pipeline.py
#	openpype/hosts/photoshop/plugins/create/create_legacy_image.py
#	openpype/modules/deadline/plugins/publish/submit_publish_job.py
2022-12-16 12:09:01 +01:00
Ondřej Samohel
5eeb9cd72b
Merge pull request #4185 from pypeclub/documentation/OP-4474_deadline-testing 2022-12-12 17:02:18 +01:00
Felix David
a8969fb5c2 Feature: API token refreshed every week 2022-12-09 09:57:10 +01:00
Petr Kalis
492e5bbd03 Merge develop 2022-12-08 11:21:38 +01:00
Ondrej Samohel
4c102b51d6
📝 add documentation about testing on deadline 2022-12-06 15:41:03 +01:00
Ondřej Samohel
8ddcfd55d3
Merge pull request #4160 from tokejepsen/patch-1 2022-12-02 18:48:43 +01:00
Petr Kalis
7959bfb958
Merge branch 'release/3.15.x' into feature/OP-3426_Add-support-for-Deadline-for-automatic-tests 2022-12-02 15:35:00 +01:00
Toke Jepsen
73393a75b7
Note about unrestricted execution on Windows. 2022-12-02 10:47:06 +00:00
Toke Jepsen
11a2ce396b
Consistent Python version 2022-12-02 10:28:14 +00:00
Petr Kalis
1e0ae0c96a
Merge pull request #4092 from pypeclub/feature/OP-4361_After-Effects-multiple-compositions
AfterEffects: publish multiple compositions
2022-11-16 11:35:33 +01:00
Petr Kalis
a9249c1b75 OP-4361 - remove limitation on single output module 2022-11-15 16:17:16 +01:00
Petr Kalis
41f4c3981b
Merge branch 'release/3.15.x' into feature/OP-3426_Add-support-for-Deadline-for-automatic-tests 2022-11-11 19:32:08 +01:00
Ondřej Samohel
86cd0e60f2
Merge pull request #3979 from pypeclub/enhancement/remove-staging-logic-on-version
Remove staging logic set by OpenPype version
2022-11-11 18:43:16 +01:00
Petr Kalis
1114c86f15 Merge branch 'develop' of github.com:pypeclub/OpenPype into feature/OP-3426_Add-support-for-Deadline-for-automatic-tests 2022-11-11 16:39:59 +01:00
Jakub Jezek
85e5741385
Merge branch 'main' into release/3.15.x 2022-11-10 18:03:31 +01:00
Petr Kalis
d0f8233b8b OP-4361 - updated documentation 2022-11-10 17:40:33 +01:00
Petr Kalis
418135cde0 Merge remote-tracking branch 'origin/release/3.15.x' into feature/OP-3426_Add-support-for-Deadline-for-automatic-tests 2022-11-07 12:40:41 +01:00
Petr Kalis
4a4726fe79 OP-3426 - add more details to web documentation 2022-11-04 15:39:22 +01:00
Petr Kalis
8aa05190c6 OP-3426 - fix wrong command in web docs 2022-11-04 15:28:58 +01:00
Petr Kalis
0d47e958eb
Merge pull request #4051 from pypeclub/feature/OP-3908_Make-New-Publisher-default-in-Photoshop
Photoshop: make new publisher default
2022-11-04 12:28:33 +01:00
Petr Kalis
a7881ba994
Merge pull request #4056 from pypeclub/feature/OP-3909_Make-New-Publisher-default-in-AfterEffects
AfterEffects: make new publisher default
2022-11-04 12:28:13 +01:00
Jakub Trllo
e3c339b153 added information about additional filtering 2022-11-03 11:27:53 +01:00
Petr Kalis
296c2e1917 Merge remote-tracking branch 'origin/release/3.15.x' into feature/OP-3908_Make-New-Publisher-default-in-Photoshop 2022-11-02 12:28:08 +01:00
Petr Kalis
7d69ea3712 OP-3909 - updated documentation for AE 2022-11-01 17:41:29 +01:00
Jakub Trllo
0818edb58b Merge branch 'develop' into release/3.15.x 2022-11-01 14:02:48 +01:00
Petr Kalis
bd72e16552 OP-3908 - updates to documentation 2022-11-01 13:57:08 +01:00
Ryan J. Quinlan
c81b42d6a6
Added punctuation for clarity. 2022-10-27 14:37:25 -07:00
Ryan J. Quinlan
4f07ddae9d
Modified wording for clarity. 2022-10-27 14:34:27 -07:00
Ryan J. Quinlan
fae3f14af4
Modified working 2022-10-27 14:31:15 -07:00
Ryan J. Quinlan
3a08324a87
Fixed some wording and grammar. 2022-10-27 14:27:13 -07:00
Ryan J. Quinlan
5a3856b565
Fixed spelling and wording 2022-10-27 14:06:34 -07:00
Ryan J. Quinlan
2c0e59da6a
Italicized menu path 2022-10-27 14:02:06 -07:00
Ryan J. Quinlan
33416b4658
Formatting and wording changes to admin_settings 2022-10-27 13:59:35 -07:00
Jakub Trllo
7c1c276f4d Merge branch 'release/3.15.x' into enhancement/remove-staging-logic-on-version 2022-10-25 11:40:12 +02:00
Jakub Trllo
e484535cdd Merge branch 'develop' into release/3.15.x 2022-10-25 11:36:37 +02:00
Ryan J. Quinlan
754cebb06f
Update dev_requirements.md
Small typo and grammar fixes.
2022-10-24 13:13:22 -07:00
Jakub Trllo
2b6b5668b8 Merge branch 'release/3.15.x' into enhancement/remove-staging-logic-on-version 2022-10-24 16:55:18 +02:00
Jakub Trllo
258acdfca1 Merge branch 'develop' into release/3.15.x 2022-10-20 15:11:40 +02:00
Jakub Trllo
149aebaac9 Merge branch 'develop' into feature/OP-4178_Add-Shared-data-for-collection-phase 2022-10-19 12:14:43 +02:00
Jakub Trllo
7571d62709 Updated documentation 2022-10-18 15:22:50 +02:00
Jakub Trllo
e9db3dbadc rephrase sentence 2022-10-18 15:07:56 +02:00
Jakub Trllo
952fd6c15c removed unnecessary lines 2022-10-18 15:01:43 +02:00
Jakub Trllo
8e90bf73c9 added information about ffmeg and oiio to documentation 2022-10-18 15:00:56 +02:00
Jakub Trllo
ba2cb2d11d add information about shared data to documentation 2022-10-17 17:00:44 +02:00
Ondrej Samohel
d00d023f53
Merge remote-tracking branch 'origin/release/3.15.x' into feature/OP-3553_update-to-python-39 2022-10-13 12:59:53 +02:00
Ondrej Samohel
59e23f21d0
📝 change staging logic in documentation 2022-10-13 11:35:38 +02:00
Jakub Trllo
935c8e0cdd added information about instance passed to 'get_subset_name' and 'get_dynamic_data' 2022-10-12 11:22:57 +02:00
Ondřej Samohel
3dc17918d4
📝 update python version specs 2022-09-12 18:10:41 +02:00
Ondřej Samohel
c1a9d5392a
Merge remote-tracking branch 'origin/develop' into feature/OP-3553_update-to-python-39 2022-09-12 11:32:17 +02:00
Thomas Fricard
e47a6ce5d3
Merge branch 'develop' into 120-create-shelf-manager 2022-09-12 11:24:55 +02:00