Olympic/NTO-2025-Android-TeamTask
6
0
Fork 23
Code Issues Pull Requests 6 Actions 1 Packages Projects Releases Wiki Activity

main #10

Open
student-18211 wants to merge 13 commits from student-18211/NTO-2025-Android-TeamTask:main into main
pull from: student-18211/NTO-2025-Android-TeamTask:main
merge into: Olympic:main
Conversation 0 Commits 13 Files Changed 20 +917 -36
student-18211 commented 2025-12-10 03:30:00 +00:00
First-time contributor
Copy Link
No description provided.
student-18211 added 13 commits 2025-12-10 03:30:01 +00:00
Added appearance and basic booking functionality 2807368adb
Merge pull request 'Added appearance and basic booking functionality' (#1) from student-15047/NTO-2025-Android-TeamTask:to-book into main abc0f81356 
Reviewed-on: student-18211/NTO-2025-Android-TeamTask#1
revert abc0f81356 47e9018b67 
revert Merge pull request 'Added appearance and basic booking functionality' (#1) from student-15047/NTO-2025-Android-TeamTask:to-book into main

Reviewed-on: student-18211/NTO-2025-Android-TeamTask#1
I configured the server connection and improved the logic 09e97f9d67
I merge fork f5ff5dbca8
Merge remote-tracking branch 'origin/main' f632ddbe2b 
# Conflicts:
#	app/src/main/java/ru/myitschool/work/ui/screen/NavigationGraph.kt
#	app/src/main/java/ru/myitschool/work/ui/screen/book/BookIntent.kt
#	app/src/main/java/ru/myitschool/work/ui/screen/book/BookScreen.kt
#	app/src/main/java/ru/myitschool/work/ui/screen/book/BookState.kt
#	app/src/main/java/ru/myitschool/work/ui/screen/book/BookViewModel.kt
#	app/src/main/res/values/strings.xml
Merge pull request 'add booking to main branch' (#4) from student-15047/NTO-2025-Android-TeamTask:main into main 32cdc2b3a6 
Reviewed-on: student-18211/NTO-2025-Android-TeamTask#4
I made the logic for moving between screens and added stubs 655baf713f
merge upstream 2d9682ebba
Merge pull request 'I made the logic for moving between screens and added stubs' (#5) from student-15047/NTO-2025-Android-TeamTask:main into main d4fc4a929f 
Reviewed-on: student-18211/NTO-2025-Android-TeamTask#5
I completed all the tasks assigned to me and combined my part of the project with Egor's part. 8a5fee532b
completed user authorization with a saved user, and also optimized imports b11e010cdc
Merge pull request 'My job and Egor's job' (#6) from student-15047/NTO-2025-Android-TeamTask:main into main
Some checks failed
Android Test / validate-and-test (pull_request) Has been cancelled
Details
3941641d1f 
Reviewed-on: student-18211/NTO-2025-Android-TeamTask#6
Some checks failed
Android Test / validate-and-test (pull_request) Has been cancelled
Details
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u main:student-18211-main
git checkout student-18211-main
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
a-limasov a-nepretimov a-tarazevich ci-bot d-murashov vladimir-shperling
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Olympic/NTO-2025-Android-TeamTask#10
Delete Branch "student-18211/NTO-2025-Android-TeamTask:main"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?