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

Changes from GToolkit #348

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open

Changes from GToolkit #348

wants to merge 32 commits into from

Conversation

JurajKubelka
Copy link
Contributor

Sync with GToolkit as a part of the feenkcom/gtoolkit#3564.

JurajKubelka and others added 30 commits January 5, 2022 15:24
@JurajKubelka
clean package dependencies
0c1502c
@JurajKubelka
add BaselineOfMagritteForGt
2dec5cb
@JurajKubelka
add Magritte-Pharo7-PlainPharo
6403375
@JurajKubelka
fix the Magritte-Pharo7-PlainPharo name and reference
ede88dc
@JurajKubelka
move Morphic code into the Morph package
e7abe38
@JurajKubelka
add BaselineOfMagritteForGToolkit
2c68528
@JurajKubelka
remove BaselineOfMagritteForGt
9501ba4
@JurajKubelka
remove a class reference that resides in a package that we do not loa…
42893f8 
…d in GToolkit
@JurajKubelka
add MAFileDescription >> #pharoFileReferenceFor: to convert `MAFile…
75f8af2 
…Model` into `FileReference`
@JurajKubelka
add MAFileDescription >> #pharoFileReferenceFor:
391bd0b
@JurajKubelka
Merge commit '42893f8b3ec54f995352611fe20284539eee05c6'
a05f7a6 
* commit '42893f8b3ec54f995352611fe20284539eee05c6':
  remove a class reference that resides in a package that we do not load in GToolkit
  remove `BaselineOfMagritteForGt`
  add `BaselineOfMagritteForGToolkit`
  move Morphic code into the Morph package
  fix the `Magritte-Pharo7-PlainPharo` name and reference
  add `Magritte-Pharo7-PlainPharo`
  add `BaselineOfMagritteForGt`
  clean package dependencies
@hellerve
Add blocStencilto number description [feenkcom/gtoolkit#2543]
8512330
@chisandrei
Depend on GreaseForGToolkit
13e118e
@chisandrei
Merge pull request #1 from magritte-metamodel/master
d6e23a7 
Merge remote into feenk01
@chisandrei
Merge pull request #2 from magritte-metamodel/master
9393e9b 
Sync master
@hellerve
Revert 8512330
04008a3
@JurajKubelka
asGlmAction includes inexistent class references
a63ecf8
@JurajKubelka
Magritte descriptions have #definingSource [feenkcom/gtoolkit#3190]
d11e0d9
@JurajKubelka
Merge remote-tracking branch 'upstream/master'
dc66041 
# Conflicts:
#	source/BaselineOfMagritte/BaselineOfMagritte.class.st
@JurajKubelka
Merge branch 'master' into feenk01
d6e98fc 
# Conflicts:
#	source/BaselineOfMagritte/BaselineOfMagritte.class.st
@JurajKubelka
move MAFileDescription>>#pharoFileReferenceFor: into gt4magritte …
cd4a27d 
…repository
@JurajKubelka
Magritte descriptions announce property value changes [feenkcom/gtool…
cec4e48 
…kit#3371]

- add `MAPropertyChangedAnnouncement`
- currently we support all properties and `MAActionDescription >> #label:` (which stored as an instance variable)
@JurajKubelka
add MAElementDescription>>#autoAccept [feenkcom/gtoolkit#3371]
a1f025c
@JurajKubelka
improve method comments [feenkcom/gtoolkit#3371]
6c23fcb
@JurajKubelka
Merge 7748a0d
a7a46a3
@JurajKubelka
remove #definingSource as it is replaced by #definingContext [fee…
710e291 
…nkcom/gtoolkit#3377]
@JurajKubelka
add MATPropertyOwner >> #unsubscribel: [feenkcom/gtoolkit#3378]
7bdfa5e
@JurajKubelka
remove `source/Magritte-Deprecated3dot7/MABlockDescription.extension.…
ba0eb1f 
…st` [feenkcom/gtoolkit#3378]

magritte-metamodel#331 (comment)
@JurajKubelka
remove source/Magritte-Pharo7-Model/MAFileDescription.extension.st [f…
d020e60 
…eenkcom/gtoolkit#3378]

https://github.com/magritte-metamodel/magritte/pull/331/files/7bdfa5ea02083caf4b1257492f936bf1855f46b5#r1282553171
@JurajKubelka
remove source/Magritte-Pharo7-PlainPharo [feenkcom/gtoolkit#3378]
24a481b 
- magritte-metamodel#331 (comment)
- magritte-metamodel#331 (comment)
- magritte-metamodel#331 (comment)
@JurajKubelka JurajKubelka mentioned this pull request Jan 22, 2024
Closed
@seandenigris
Copy link
Member

Something looks weird here. The commit list seems to include many that were already resolved - possibly in a conflicting way - during the last sync. I’ll take a better look when at home

@JurajKubelka
Copy link
Contributor Author

I had to resolve several conflicts while merging to the feenk repository. I accepted incoming changes in all cases. I am actually surprised that it claims that MATPropertyOwner >> #whenPropertyChangedSend:to: is not in the upstream repository. At least this is what claims this pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@JurajKubelka @seandenigris @hellerve @chisandrei