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-552 Merge Main into Feature branch #2161

Merged
merged 67 commits into from
Oct 31, 2023

Conversation

rasarkar
Copy link
Collaborator

No description provided.

joshuastegmaier and others added 30 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>
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.16 to 1.26.17.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@1.26.16...1.26.17)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
joshuastegmaier and others added 24 commits October 13, 2023 14:22
…recent-pages-pdf

Added recent pages data to service letter view/template
Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.12.12 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Updates to support storage_image not allowing empty values

* Updated unit tests to populate storage_image
…asset-status

Added logging to asset status signal and transcription views
…recent-pages-pdf

Added styles to the page number
…precommit-update

Various code compliance changes and updates
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.17 to 1.26.18.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@1.26.17...1.26.18)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…2149)

* CONCD-546 Allow users to add first/ last name data via profile page

* CONCD-564 would be useful if the user could see if their first/ last name is already set
* CONCD-526 update existing data in the site's daily review actions field to accurately fit the new field description

* CONCD-526 update all previous site reports to also have data for this field
* CONCD-564 Add padding above Save Changes button

* CONCD-564 make overall gray padding of name boxes match the size of the email padding

* CONCD-564 Add name change instructions
Bumps [werkzeug](https://github.com/pallets/werkzeug) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/pallets/werkzeug/releases)
- [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst)
- [Commits](pallets/werkzeug@3.0.0...3.0.1)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@rasarkar rasarkar marked this pull request as ready for review October 31, 2023 17:39
@jkueloc jkueloc merged commit fe884b7 into feature-tutorial Oct 31, 2023
@rasarkar rasarkar deleted the CONCD-552-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