-
Notifications
You must be signed in to change notification settings - Fork 56
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
[ENG-5028] [ENG-5919] Preprints Affiliation Project PR (FE) #2321
Conversation
* fix preprint resubmission workflow * Update test for review-action model to reflect target relationship change * delete review-action relationship from child classes * ENG-6008: Add My Preprints route and page template * setup mirage route and view * change defaultSortKey attribute * Bump version no. Add CHANGELOG * create preprint card * fix date format * formatting changes * remove unnecessary controller and old logic * Add tests * remove unused classes and services * Moved changes to preprints-paginated-list branch * remove redundant pagination component * add usePlaceholders property --------- Co-authored-by: Uditi Mehta <[email protected]> Co-authored-by: Uditi Mehta <[email protected]> Co-authored-by: Yuhuai Liu <[email protected]> Co-authored-by: Uditi Mehta <[email protected]>
# Conflicts: # app/models/preprint.ts # mirage/serializers/preprint.ts
…ions Try to resolve merge conflicts
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The most minor of changes to some tests, and it looks like from Percy there's changes to the developer apps page that was unintended, but otherwise looks good.
Update: It looks like the developer app problem came from somewhere else. It would be awesome if it could be fixed quickly here, but otherwise just make a ticket and we can fix it in B&I.
app/preprints/-components/preprint-institutions/institution-manager/component-test.ts
Outdated
Show resolved
Hide resolved
app/preprints/-components/preprint-institutions/institution-manager/component-test.ts
Outdated
Show resolved
Hide resolved
app/preprints/-components/preprint-institutions/institution-manager/component-test.ts
Outdated
Show resolved
Hide resolved
32d1042
to
b813257
Compare
Looks like there were some unintended changes to the developer apps page that will need to be corrected. |
It seems the new changes come from last week's hotfix. Maybe taking a look with @futa-ikeda to see if they can be dismissed/manually approved. |
[ENG-5919] Fixed some typos
Purpose
Request to merge the feature/preprints-affiliations branch into develop for release.
Summary of Changes
Merge all the feature work into the develop branch