Resolve merge conflicts for TanStack composables #882
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* playing with the combination of reports * adding format * progress on function migration * created the function to export both * completed score report and halfway of progress report * progress on progress report * creating the export to csv combined * correcting cypress * name of the exported csv * simplifying name * cypress tests * progress on exporting * firebase functions * commenting test that should be a compoenent test * adding not assined to progress of not assigned tasks * fixing the order on exporting * roar-firebase-functions * Update src/pages/ScoreReport.vue Co-authored-by: Maximilian Oertel <[email protected]> * Update src/pages/ScoreReport.vue Co-authored-by: Maximilian Oertel <[email protected]> * Update src/pages/ScoreReport.vue Co-authored-by: Maximilian Oertel <[email protected]> * Update src/pages/ScoreReport.vue Co-authored-by: Maximilian Oertel <[email protected]> * Update src/pages/ScoreReport.vue Co-authored-by: Maximilian Oertel <[email protected]> * Update src/pages/ScoreReport.vue Co-authored-by: Maximilian Oertel <[email protected]> * Update src/pages/ScoreReport.vue Co-authored-by: Maximilian Oertel <[email protected]> * Update src/pages/ScoreReport.vue Co-authored-by: Maximilian Oertel <[email protected]> * fixing and testing export function --------- Co-authored-by: Maximilian Oertel <[email protected]>
* changing syntax name on game tabs * change Roar for ROAR
* just adding simple test until I can run local * Progress on Invite Users * completing test * uncommenting other orgs * modifying some comments * adding some try catch for the github actions * change to baseUrl * changing .env.example.test * Suggested changes for parent sign up e2e test (#857) * suggested changes for parent sign up e2e test * update workflow with new secrets * remove unncessary then() * updating commands --------- Co-authored-by: Kyle Montville <[email protected]>
maximilianoertel
changed the title
21 tasks
|
Visit the preview URL for this PR (updated for commit 089e95f): https://roar-staging--pr882-ref-318-query-compos-f0p8elo7.web.app (expires Mon, 21 Oct 2024 17:19:26 GMT) 🔥 via Firebase Hosting GitHub Action 🌎 Sign: 2631e9c58fd0104ecbfddd72a62245ddac467460 |
roar-dashboard-e2e
|
||||||||||||||||||||||||
| Project |
roar-dashboard-e2e
|
| Run status |
|
| Run duration | 03m 56s |
| Commit |
|
| Committer | Maximilian Oertel |
| View all properties for this run ↗︎ | |
| Test results | |
|---|---|
Failures
|
0
|
Flaky
|
0
|
Pending
|
0
|
Skipped
|
0
|
Passing
|
14
|
kellyel
approved these changes
Oct 14, 2024
Emily-ejag
approved these changes
Oct 14, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes
This PR updates the
ref/318/query-composablesbranch frommainand resolves the expected merge conflicts.Types of changes
Checklist
Justification of missing checklist items
n/a
Further comments
n/a
Ref https://github.com/yeatmanlab/roar/issues/318