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

merging test #1

Open
wants to merge 102 commits into
base: develop
Choose a base branch
from
Open

merging test #1

wants to merge 102 commits into from

Conversation

GilmarCorreia
Copy link

@GilmarCorreia GilmarCorreia commented Sep 4, 2023 •
edited
Loading

The basics

The details

Resolves

Fixes

Proposed Changes

Behavior Before Change

Behavior After Change

Reason for Changes

Test Coverage

Documentation

Additional Information

GilmarCorreia and others added 30 commits September 16, 2022 11:10
@GilmarCorreia
construindo pacote blockly
5ec747b
@GilmarCorreia
buildando a versão final
be0474a
@GilmarCorreia
salvando readme
42d46a5
@lucaslbmp
Modificando call_variables
e2e941c
@lucaslbmp
arg0 = jsonCodeInfo.code
4ead54d
@lucaslbmp
Modificando variables_call
ebb871d
@lucaslbmp
Modificando variables_call (2)
5537ab7
@lucaslbmp
Modificando variables_call (3)
f8ac2f8
@lucaslbmp
call method recebendo json do bloco encaixado
261744d
@lucaslbmp
call method recebendo json do bloco encaixado (2)
cc1346f
@lucaslbmp
Adicionando setup e loop
6a4d7f5
@lucaslbmp
Adicionando setup e loop (2)
c5efb15
@lucaslbmp
Modificando connections do call method
7619ffc
@lucaslbmp
Modificando connections do call method (2)
a35e581
@lucaslbmp
Modificando connections do call method (3)
141db9c
@lucaslbmp
Modificando quebra de linha do call method
7dec59c
@lucaslbmp
Merge
627d69f
@lucaslbmp
Arrumando nome das variaveis (self)
df9a966
@lucaslbmp
Merge
6ece244
@lucaslbmp
Novo build
c6d93e6
@lucaslbmp
Adicionando self. às inicializaçoes de variaveis
7d0355a
@lucaslbmp
removendo troca do output
765c825
@lucaslbmp
removendo troca do output (2)
9edea2f
@lucaslbmp
Setando output do call method no core
88ff2ea
@lucaslbmp
Setando output como null no definitions
d4ea904
@lucaslbmp
Eliminando funcionalidade de mudar output
c7bd82c
@lucaslbmp
Eliminando funcionalidade de mudar output
bde6fd3
@GilmarCorreia
adicionando os blocos de funcs e vars
84b96fc
@GilmarCorreia
buildando o blockly
200571e
@lucaslbmp
Adicionando tooltip dos blocos de setup e run aos dicionarios de trad…
606d301 
…ução
GilmarCorreia and others added 30 commits February 1, 2023 11:51
@GilmarCorreia
adding text in call and return
27c1408
@GilmarCorreia
adding text in call and return
1353a76
@GilmarCorreia
adding text in call and return
2932274
@GilmarCorreia
changing color for call blocks
58b448b
@GilmarCorreia
changing color for call blocks
e35b493
@lucaslbmp
decreasing trash bin size
044b0c2
@lucaslbmp
adjusting trash bin position
b623859
@lucaslbmp
fixing lid leaving ghost part
d0f67b9
@lucaslbmp
Adding custom js dialog
12b8a54
@lucaslbmp
Adding custom js dialog (2)
adb8216
@lucaslbmp
Adding css styling to custom dialog box
2eb3990
@lucaslbmp
Changing dialog box styling
339e71f
@lucaslbmp
Changing dialog box styling
5516be6
@lucaslbmp
Changing dialog box css to match Drops style
b06ff9f
@lucaslbmp
Changing dialog box styling to match Drops style (2)
aac7d06
@lucaslbmp
Changing dialog box styling to match Drops style (3)
7b49f53
@lucaslbmp
merge
0aa2d42
@lucaslbmp
Changing the order of the buttons in the custom dialog box
dc0ce2e
@GilmarCorreia
count block fix
43c51e9
@lucaslbmp
Adding spanish translations for main function blocks
c8c65e0
@lucaslbmp
Merge branch 'dev' of https://github.com/NTU-AI/ntu-blockly into dev
7ed8e2a
@lucaslbmp
Modifying connect_ (connection.js) and checkAndDelete (block_svg.js) …
0fc5b08 
…to change blocks color when child is disconnected or deleted
@lucaslbmp
Changing color for undo/redo
09878db
@lucaslbmp
Changing call/return blocks color when insertion marker is created
79652ab
@lucaslbmp
Fixing call/return color behaviour when insertion marker is created/d…
98fd2cd 
…estroyed
@lucaslbmp
Fixing call/return blocks mistakenly getting parent scope block or ne…
866bff6 
…xt block color
@lucaslbmp
Fixing error in getRenderer() when performing undo
151c701
@lucaslbmp
Building and packaging changes
66f0eb9
@lucaslbmp
Fixing call/return block connected in sequence of another call/return…
31117f6 
… block changing the color of the latter when it itself changes color
@lucaslbmp
Removing undo/redo changes
4d372ae
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.
3 participants
@GilmarCorreia @lucaslbmp @KevinYuki