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.

Sign up for GitHub

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

Jump to bottom

CATROID-1202 In Catroid in Catblocks mode, the bricks in the selection menus shall be shown with Catblocks bricks #4619

Merged
merged 1 commit into from
Nov 16, 2022
Merged

CATROID-1202 In Catroid in Catblocks mode, the bricks in the selection menus shall be shown with Catblocks bricks #4619

merged 1 commit into from
Nov 16, 2022

Conversation

bprattes
Copy link
Contributor

https://jira.catrob.at/browse/CATROID-1202 (Catblocks: https://jira.catrob.at/browse/BLOCKS-264)
"Add Brick" in Catblocks-Style for Catroid when 2D view is active.

Your checklist for this pull request

Please review the contributing guidelines and wiki pages of this repository.

  • Include the name of the Jira ticket in the PR’s title
  • Include a summary of the changes plus the relevant context
  • Choose the proper base branch (develop)
  • Confirm that the changes follow the project’s coding guidelines
  • Verify that the changes generate no compiler or linter warnings
  • Perform a self-review of the changes
  • Verify to commit no other files than the intentionally changed ones
  • Include reasonable and readable tests verifying the added or changed behavior
  • Confirm that new and existing unit tests pass locally
  • Check that the commits’ message style matches the project’s guideline
  • Stick to the project’s gitflow workflow
  • Verify that your changes do not have any conflicts with the base branch
  • After the PR, verify that all CI checks have passed
  • Post a message in the catroid-stage or catroid-ide Slack channel and ask for a code reviewer

@bprattes bprattes changed the title CATROID-1202 implement add brick functionality in Catblocks CATROID-1202 In Catroid in Catblocks mode, the bricks in the selection menus shall be shown with Catblocks bricks Aug 28, 2022
@bprattes bprattes force-pushed the CATROID-1202 branch 5 times, most recently from 7600e90 to 85f96ac Compare September 15, 2022 12:02
MichaelFlucher
MichaelFlucher approved these changes Sep 15, 2022
View reviewed changes
Copy link
Member

@MichaelFlucher MichaelFlucher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Catblocks Part LGTM

@bprattes bprattes force-pushed the CATROID-1202 branch 3 times, most recently from 01e6212 to 9dbe236 Compare September 15, 2022 12:48
mseiser
mseiser requested changes Oct 13, 2022
View reviewed changes
Copy link
Contributor

@mseiser mseiser left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please have a look at the Jenkins report. The build fails due to uncompilable Tests e.g. AddBrickCatblocksTest. Please verify that affected Tests run through and add additional tests to verify new functionality.

Also please rebase.

@bprattes bprattes closed this Oct 23, 2022
@bprattes bprattes reopened this Oct 23, 2022
@bprattes bprattes requested a review from mseiser October 26, 2022 12:44
mseiser
mseiser approved these changes Nov 5, 2022
View reviewed changes
Copy link
Contributor

@mseiser mseiser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me 👍

@MichaelFlucher MichaelFlucher merged commit 909e73a into Catrobat:develop Nov 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MichaelFlucher MichaelFlucher MichaelFlucher approved these changes

@mseiser mseiser mseiser approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bprattes @mseiser @MichaelFlucher