Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CONCD-551 Merge Main into Feature branch #2117

Merged
merged 29 commits into from
Oct 3, 2023

Conversation

rasarkar
Copy link
Collaborator

@rasarkar rasarkar commented Oct 2, 2023

joshuastegmaier and others added 29 commits August 29, 2023 10:03
…atic reprocessing of import items that are missing assets. (#2075)
…ly (#2078)

* Partial implementation of stacking

* Added missing image

* Added full split toggle

* Fixed broken images in horizontal layout. Added buttons for toggling layout

* Finished layout changes to support switching between vertical and horizontal layouts

* Added split size and direction persistence
* CONCD-467 backfill daily data

* CONCD-467 pin node to version 9
…that are in a valid campaign (primarily to handle assets, etc. removed when retiring a campaign)
…redirects

Added redirects from projects, items and assets that don't exist but that are in a valid campaign
…al-models

CONCD-491 Create Django models for Tutorial slides
* update ecr log in step - post robo formatting

* add a job environment to each workflow for more  control and better isolation

* remove ecr registry type setting

* remove ecr registry type from remaining deploy workflows
* initial commit prod deploy

* Correct job step name and add celerybeat and importer ecs service
…r build, test workflows to see if it's enough to resolve the exit code 100. (#2098)
* add apt-get update and dist-install to system package install step for build, test workflows to see if it's enough to resolve the exit code 100.

* fix added command permissions
* add apt-get update and dist-install to system package install step for build, test workflows to see if it's enough to resolve the exit code 100.

* fix added command permissions

* update dev, stage, and feature workflow install system packages step
…en switching into the vertical transcription layout (#2100)
* CONCD-536 Fix indenting in template

* CONCD-536 this should do it
…nches and to ignore changes to an initial list of specific paths (#2109)
Bumps [cryptography](https://github.com/pyca/cryptography) from 41.0.3 to 41.0.4.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@41.0.3...41.0.4)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@rasarkar rasarkar changed the base branch from main to feature-tutorial October 2, 2023 18:43
@rasarkar rasarkar marked this pull request as ready for review October 2, 2023 19:22
@jkueloc jkueloc merged commit db6496f into feature-tutorial Oct 3, 2023
@rasarkar rasarkar deleted the CONCD-551-rsar-merge-main branch December 12, 2023 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants