|
ee24f241db
|
Merge branch 'Frontend' into Frontend_UI
# Conflicts:
# app/src/main/AndroidManifest.xml
# app/src/main/java/ru/myitschool/work/ui/Main/AdminFragment.kt
# app/src/main/res/layout/fragment_main.xml
|
2025-02-19 17:05:06 +03:00 |
|
|
907c1c5d1c
|
day2_commit_13_back_to_Json
|
2025-02-19 16:56:30 +03:00 |
|
|
3da4b99cc0
|
day2_commit_12_MEGAFIX_MEEEEEGAAPI
|
2025-02-19 15:01:42 +03:00 |
|
|
c5be8a2114
|
day2_commit_11_MEGAFIX
|
2025-02-19 14:36:58 +03:00 |
|
|
85a5c82d8c
|
day2_commit_10_fixed_alotofbugs_added_admin_logic
|
2025-02-19 14:12:47 +03:00 |
|
|
4410d2970d
|
day2_commit.1.10_merged
|
2025-02-19 12:21:40 +03:00 |
|
|
1d9207a5f5
|
day2_commit_9_fixed_gradle_part2_and_add_AdminPanel
|
2025-02-19 12:12:50 +03:00 |
|
|
c5fd7ffe21
|
day2_commit_8.1_fixed_buttons_added_RV_test
|
2025-02-19 11:56:58 +03:00 |
|
|
1a887da8c7
|
day2_commit_4_UI_fixed_crash_app_when_backend_off
|
2025-02-19 11:12:23 +03:00 |
|
|
06b7ab6608
|
day2_commit_2_UI_added_password_cheak_and_basic_auth_(test)
|
2025-02-19 10:39:48 +03:00 |
|
|
682eb972cc
|
day1_commit_4_fixed_loginButton_Del_custom_UserName_Cheak
|
2025-02-18 17:34:18 +03:00 |
|
|
26a3f2ee2b
|
day1_commit_4_fixed_loginButton_added_customUserName_Cheak
|
2025-02-18 17:32:44 +03:00 |
|
|
5beb542341
|
aa
|
2025-02-18 18:44:09 +03:00 |
|