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

Develop #2450

Closed
wants to merge 60 commits into from
Closed

Develop #2450

wants to merge 60 commits into from

Conversation

WIFI-ROBOTS
Copy link

@WIFI-ROBOTS WIFI-ROBOTS commented May 8, 2019

The basics

  • I branched from develop
  • My pull request is against develop
  • My code follows the style guide

The details

Resolves

Proposed Changes

Reason for Changes

Test Coverage

Tested on:

Additional Information

alschmiedt and others added 30 commits April 5, 2019 11:59
* Fixed mutator flyout being positioned incorrectly.

* Changed flyout_horizonal and flyout_vertical to check this.targetWorkspace_.toolboxPosition instead of targetWorkspaceMetrics.toolboxPosition.
Angle picker's degree symbol left of number in both LTR and RTL.
* Propagate the visible state when blocks connect

This fixes #1967.

In rendered connections when connecting:
- If the superior connection is hidden this hides the newly connected block.
- If the superior connection isn't hidden it makes sure the block is visible.

In rendered connections when disconnecting:
- If the superior connection is hidden, make the disconnected block stack visible.

TODO before review:
 - write tests.
 - update collapsed message

* Add missing overrides

* Add tests for hidden connections and fix a bug while disposing
* Reorganize conditionals for block context menu

* Disable comments and disabling in block factory
Update version number to 1.20190419.0-develop
Moved RTL Demo Blocks so They Aren't Behind the Toolbox
Added isSerializable and SERIALIZABLE to Field
BeksOmega and others added 26 commits April 24, 2019 10:43
Added fromXml and toXml to Fields
These date back to before Blockly Games was separated from Blockly.
Matches existing stripping of Google’s licence.  Done with MIT’s permission.  Resolves issue 2412.
…rade

Update to webdriverio v5; fix resulting test breakages
Removed Explicitly Setting Variable Type to Two Single Quotes
Matches code in Blockly Games.
No functional change.
Previously, if the XML of a toolbox contained a block ID, the first creation of this block would inherit this ID.  Thus two realtime collaborators could realistically end up with conflict.  Likewise, cut and paste could generate similar conflict.
I don’t care about whether we use the Element constants or the ubiquitously known 1 & 3 integers.  But we had a mix.
Also, ’x’ is usually used for horizontal location, ‘i’ is an iterator.
No functional change.
* Rebuild and update version numbers

* rebuild

* Update version number to 1.20190419.0

* Resolve field angle overlap render problem

* use block.getColourBorder() function
Refactored field.init into field.initView and field.initModel
@googlebot
Copy link

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here (e.g. I signed it!) and we'll verify it.


What to do if you already signed the CLA

Individual signers
Corporate signers

ℹ️ Googlers: Go here for more info.

@NeilFraser
Copy link
Contributor

I think this massive commit from develop to master is accidental. Closing.

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.

None yet