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

main #8

Closed
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: :main
Conversation 0 Commits 13 Files Changed 20
+917 -36
13 Commits
Author SHA1 Message Date
student-18211 3941641d1f Merge pull request 'My job and Egor's job' (#6) from student-15047/NTO-2025-Android-TeamTask:main into main
Android Test / validate-and-test (pull_request) Has been cancelled
Details 
Reviewed-on: student-18211/NTO-2025-Android-TeamTask#6
 2025-12-08 19:17:52 +00:00
student-15047 b11e010cdc completed user authorization with a saved user, and also optimized imports 2025-12-08 22:07:43 +03:00
student-15047 8a5fee532b I completed all the tasks assigned to me and combined my part of the project with Egor's part. 2025-12-08 21:22:55 +03:00
student-18211 d4fc4a929f 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 
Reviewed-on: student-18211/NTO-2025-Android-TeamTask#5
 2025-12-05 18:35:30 +00:00
student-15047 2d9682ebba merge upstream 2025-12-05 18:33:07 +00:00
student-15047 655baf713f I made the logic for moving between screens and added stubs 2025-12-05 21:32:25 +03:00
student-18211 32cdc2b3a6 Merge pull request 'add booking to main branch' (#4) from student-15047/NTO-2025-Android-TeamTask:main into main 
Reviewed-on: student-18211/NTO-2025-Android-TeamTask#4
 2025-12-05 17:24:18 +00:00
student-15047 f632ddbe2b Merge remote-tracking branch 'origin/main' 
# 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
 2025-12-05 18:31:20 +03:00
student-15047 f5ff5dbca8 I merge fork 2025-12-05 18:28:06 +03:00
student-15047 09e97f9d67 I configured the server connection and improved the logic 2025-12-04 23:19:42 +03:00
student-18211 47e9018b67 revert abc0f81356 
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
 2025-11-30 16:05:59 +00:00
student-18211 abc0f81356 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
 2025-11-30 16:04:45 +00:00
student-15047 2807368adb Added appearance and basic booking functionality 2025-11-30 17:52:39 +03:00