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
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: #5
2025-12-05 18:35:30 +00:00
2d9682ebba
merge upstream
2025-12-05 18:33:07 +00:00
655baf713f
I made the logic for moving between screens and added stubs
2025-12-05 21:32:25 +03:00
32cdc2b3a6
Merge pull request 'add booking to main branch' ( #4 ) from student-15047/NTO-2025-Android-TeamTask:main into main
...
Reviewed-on: #4
2025-12-05 17:24:18 +00:00
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
f5ff5dbca8
I merge fork
2025-12-05 18:28:06 +03:00
09e97f9d67
I configured the server connection and improved the logic
2025-12-04 23:19:42 +03:00
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: #1
2025-11-30 16:05:59 +00:00
abc0f81356
Merge pull request 'Added appearance and basic booking functionality' ( #1 ) from student-15047/NTO-2025-Android-TeamTask:to-book into main
...
Reviewed-on: #1
2025-11-30 16:04:45 +00:00
2807368adb
Added appearance and basic booking functionality
2025-11-30 17:52:39 +03:00
945b9d347d
revert 24aef2604a
...
revert Update .gitea/workflows/workflow.yml
2025-11-24 16:42:09 +00:00
24aef2604a
Update .gitea/workflows/workflow.yml
2025-11-24 15:01:25 +00:00
307364b2bc
Add allowed_changes.yml
2025-11-24 10:17:31 +00:00
063d2795d9
Add .gitea/workflows/workflow.yml
2025-11-24 10:03:33 +00:00
3057b7c4ad
Update buildSrc and gradle submodules
2025-11-22 12:52:57 +03:00
gitea-actions
c02b659182
Merge remote-tracking branch 'upstream/main'
2025-11-22 08:48:35 +00:00
9ed8b85334
Обновить README.md
2025-11-20 15:50:40 +00:00
a69c39441b
Add image
2025-11-20 18:50:06 +03:00
7430c6334a
Обновить README.md
2025-11-20 15:41:33 +00:00
41508b7ddb
Загрузить файлы в «img/sketch.png»
2025-11-20 15:38:23 +00:00
12fce70d85
Добавить README.md
2025-11-20 15:37:20 +00:00
dacbb0c96c
Initial commit
2025-11-20 18:10:32 +03:00
b723b77676
Обновить .gitea/workflows/automerge-with-core.yaml
2024-11-05 21:02:05 +00:00
04ae92b239
Drop windows like symbols
2024-11-05 05:13:04 +00:00
2f4de8efb6
Обновить .gitea/workflows/automerge-with-core.yaml
2024-11-04 14:15:28 +00:00
a43a36be40
Обновить .gitea/workflows/automerge-with-core.yaml
2024-10-29 11:33:52 +00:00
85b54d5e01
Rollback custom changes
2024-10-29 13:57:20 +07:00
41f6f04fb4
Add support AS Lady bug
2024-10-29 02:51:00 +07:00
220eb99921
Add kotlin init
2024-09-09 02:45:39 +07:00
3e6fe310e0
Update buildSrc
2024-05-17 04:00:58 +07:00
669f97b566
Enabled viewBinding by default
2024-03-10 17:55:17 +00:00
ed08b3245f
Change base url on submodules
2024-03-11 00:39:39 +07:00
2872bfe980
Clean gradle
2024-03-09 20:09:44 +00:00
3a4def3d33
Initial commit
2024-03-10 03:00:31 +07:00
