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

BF: Cherrypick changes from dev to fix pavlovia syncing #5221

Merged
merged 1 commit into from
Nov 30, 2022

Conversation

TEParsons
Copy link
Contributor

Changes:

  • Access Pavlovia projects via namespace/name string rather than numeric ID, unless numeric ID is all we have
  • Don't request info from Pavlovia if we have it locally
  • Handle genuine project not found errors (i.e. where the project has actually been deleted) via dedicated dialog rather than unhandled error
  • Handle avatar too big with dedicated dialog rather than unhandled error

@TEParsons TEParsons requested a review from peircej November 21, 2022 14:51
@TEParsons
Copy link
Contributor Author

There's a few commits from dev squashed in to one here, but I believe Git should handle that and recognise that the changes are identical when we merge release into dev? If not I can handle merge conflicts

@peircej peircej merged commit ee11868 into psychopy:release Nov 30, 2022
@TEParsons TEParsons deleted the release-pav-cherry branch February 10, 2023 11:22
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.

2 participants