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

FIXED double "need to" on "If statements" page #6

Open
wants to merge 33 commits into
base: main
Choose a base branch
from
Open

FIXED double "need to" on "If statements" page #6

wants to merge 33 commits into from

Conversation

beerlincur
Copy link

@beerlincur beerlincur commented May 6, 2023 •
edited
Loading

the first commit contains only changes in the code, the second commit after the npm run build

beerlincur and others added 28 commits May 6, 2023 15:38
@beerlincur
FIXED double "need to" on "If statements" page
cc53fba
@beerlincur
FIXED double "need to" on "If statements" page [builded]
58a3455
@howardpen9
Update Tact compiler to latest version
47fe0a2
@talkol
Merge pull request tact-lang#10 from howardpen9/howard-patch-4-Update…
17f78cf 
…CompilerVersion

Update Tact compiler to latest version
@howardpen9
update Readme and adding Changelog
925a9ae
@howardpen9
Update Readme and adding changelog
98e359e
@howardpen9
Merge pull request tact-lang#11 from howardpen9/howard-patch-5-add-ch…
0c711fd 
…ange-log

Howard patch 5 add change log
@howardpen9
Update
d49e627
@howardpen9
Merge pull request tact-lang#12 from howardpen9/howard-patch-6--Optim…
8f75a9f 
…ized-Terminal-Log

Update
@howardpen9
[0.4.0] - 2023-09-29
63f1ca2 
[0.4.0] - 2023-09-29
@howardpen9
Merge pull request tact-lang#13 from howardpen9/howard-patch-7
517a508 
[0.4.0] - 2023-09-29
@howardpen9
Update: [0.5.0]
75a75e5 
- Add the Jetton Token Standard example.
@arashnm80
Update content.md
83b320c 
fix typo
@howardpen9
Merge pull request tact-lang#14 from tact-lang/howard-patch-8-JettonT…
b56946c 
…oken

Update:  [0.5.0]
@SC-One
just changed the sender's message to be match.
e60b5e8 
Update (examples)-06-contract-deploy-another-page.svelte.ad13b189.js
@SC-One
corerction msg.
05af0be
@SC-One
update doc for message correction
94d40d0
@howardpen9
Merge pull request tact-lang#16 from arashnm80/patch-1
eb8b471 
Update content.md
@howardpen9
Merge pull request tact-lang#20 from SC-One/dev_patch
19288b3 
Message correction
@howardpen9
Updates
9b69403
@howardpen9
Merge pull request tact-lang#22 from tact-lang/howard-patch-9-content
b5e61a2 
Updates
@howardpen9
Updates. [0.6.2] - 2023-10-30
6c9ca93
@howardpen9
Merge pull request tact-lang#23 from tact-lang/howard-patch-9-content
770837d 
Updates. [0.6.2] - 2023-10-30
@anton-trunov
Fix comments for shl/shr
c75ac50
@howardpen9
Merge pull request tact-lang#27 from tact-lang/fix-shr-shl
736ed59 
Fix comments for shl/shr
@mhbdev
Replace overrides with override in a contract (tact-lang#26)
334313f 
`overrides` used to be `override` in earlier Tact versions
@anton-trunov
fix: remove overrides leftovers (tact-lang#29)
c6e8f6c
@ProgramCrafter
Fixed address bit length (tact-lang#8)
7e85f62 
Addresses in Tact are stored just like in FunC, that is, they take 267 bits
anton-trunov
anton-trunov previously approved these changes Nov 27, 2023
View reviewed changes
Copy link
Member

@anton-trunov anton-trunov left a comment

Choose a reason for hiding this comment

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

Thanks for the fix! If you can rebase your PR, I'm happy to merge it

@anton-trunov anton-trunov self-assigned this Nov 27, 2023
@beerlincur
Copy link
Author

Thanks for the fix! If you can rebase your PR, I'm happy to merge it

hello! trying to rebase onto your main branch. facing numerous merge conflicts in build-result files. trying to Accept Your changes, but it shows errors and conflicts about some deleted files anyway.

@anton-trunov
Copy link
Member

A workaround here would be to just have the changes in the markdown files. I'll regenerate the rest of the files in a separate PR

@beerlincur
Revert "FIXED double "need to" on "If statements" page [builded]"
0c45422 
This reverts commit 58a3455.
@beerlincur
FIXED double "need to" on "If statements" page
996de3c
@beerlincur
FIXED double "need to" on "If statements" page [builded]
cd57972
@beerlincur
Revert "FIXED double "need to" on "If statements" page [builded]"
13b3706 
This reverts commit 58a3455.
@beerlincur
Merge remote-tracking branch 'origin/main'
fe564ec 
# Conflicts:
#	docs/04-loops.html
#	docs/_app/immutable/entry/(examples)-04-if-statements-page.svelte.7ab9cd84.js
#	src/routes/(examples)/04-if-statements/content.md
@beerlincur
Copy link
Author

A workaround here would be to just have the changes in the markdown files. I'll regenerate the rest of the files in a separate PR

reverted my [builded] commit and rebased it. could you, please, take a look at result?

@anton-trunov
Copy link
Member

Looks like something went wrong with the rebase:
image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anton-trunov anton-trunov anton-trunov left review comments

At least 1 approving review is required to merge this pull request.

Assignees

@anton-trunov anton-trunov

Labels
bugfix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@beerlincur @anton-trunov @howardpen9 @talkol @arashnm80 @SC-One @mhbdev @ProgramCrafter