|
|
89d8794f55
|
day3_commit.1.5_push_to_main
Apk
|
2025-02-20 16:51:04 +03:00 |
|
|
|
60110e8e68
|
Merge branch 'Frontend'
|
2025-02-20 16:50:25 +03:00 |
|
|
|
3ed1bc84d7
|
day3_commit2_vse_slomalos231231
|
2025-02-20 16:49:59 +03:00 |
|
|
|
97fb903db3
|
day3_commit.1.4_push_to_main
|
2025-02-20 16:48:32 +03:00 |
|
|
|
636b2a22fc
|
Merge branch 'refs/heads/Frontend'
|
2025-02-20 16:48:21 +03:00 |
|
|
|
239f4f8a22
|
day3_commit2_vse_slomalos
|
2025-02-20 16:47:15 +03:00 |
|
|
|
018decb0e8
|
Merge branch 'Frontend_UI' into Frontend
|
2025-02-20 16:46:43 +03:00 |
|
|
|
537daa1072
|
Merge remote-tracking branch 'origin/Frontend' into Frontend
# Conflicts:
# app/src/main/java/ru/myitschool/work/api/ApiService.kt
# app/src/main/java/ru/myitschool/work/ui/Main/MainFragment.kt
# app/src/main/java/ru/myitschool/work/ui/qr/result/QrResult.kt
|
2025-02-20 16:42:46 +03:00 |
|
|
|
0eb8ec5872
|
day3_commit2_vse_slomalos
|
2025-02-20 16:41:48 +03:00 |
|
|
|
333d9d6227
|
day3_commit.1.3_push_to_main
TheDevs-front_1.0
|
2025-02-20 16:33:25 +03:00 |
|
|
|
44e17c69de
|
Merge branch 'Frontend_UI'
|
2025-02-20 16:32:30 +03:00 |
|
|
|
ebc2f1675b
|
day3_commit2_front_nice_backendDIIE
|
2025-02-20 15:46:37 +03:00 |
|
|
|
cabbe30c42
|
day3_commit2_qr_mini_fix_and_photo_img
|
2025-02-20 15:36:25 +03:00 |
|
|
|
1e8729f108
|
Merge remote-tracking branch 'origin/Frontend' into Frontend
|
2025-02-20 14:21:05 +03:00 |
|
|
|
e83718bce0
|
day3_commit2_qr_mini_fix
|
2025-02-20 14:20:07 +03:00 |
|
|
|
9a23befe71
|
day3_commit2_temp
|
2025-02-20 12:47:53 +03:00 |
|
|
|
654099623a
|
day3_commit.1.2_temp
|
2025-02-20 12:44:11 +03:00 |
|
|
|
cb5fbdd634
|
day3_commit2_added_qr_scan
|
2025-02-20 12:43:28 +03:00 |
|
|
|
9818c97148
|
day3_commit1_fixed_mainfragment
|
2025-02-20 12:18:31 +03:00 |
|
|
|
194a1dc466
|
day3_commit1_fixed_loginauth
|
2025-02-20 12:08:52 +03:00 |
|
|
|
8fc1f2decd
|
Merge branch 'Frontend_UI' into Frontend
# Conflicts:
# app/src/main/java/ru/myitschool/work/core/Constants.kt
|
2025-02-20 10:33:59 +03:00 |
|
|
|
bddcda4b72
|
Merge remote-tracking branch 'origin/Frontend' into Frontend
# Conflicts:
# app/build.gradle.kts
# app/src/main/java/ru/myitschool/work/api/ApiModule.kt
# app/src/main/java/ru/myitschool/work/api/ApiService.kt
# app/src/main/java/ru/myitschool/work/core/Constants.kt
# app/src/main/java/ru/myitschool/work/ui/Main/AdminFragment.kt
# app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.kt
|
2025-02-20 10:30:48 +03:00 |
|
|
|
c510b6d1fb
|
day3_commit1_fixed_loginauth
|
2025-02-20 10:28:54 +03:00 |
|
|
|
3f8e032428
|
day3_commit1_fixed_loginauth
|
2025-02-20 10:28:10 +03:00 |
|
|
|
cecbde25af
|
Merge remote-tracking branch 'origin/Frontend_UI' into Frontend_UI
|
2025-02-20 10:03:31 +03:00 |
|
|
|
3850be2eb5
|
day3_commit.1.1_add_close_button_at_admin_panel
|
2025-02-20 10:03:13 +03:00 |
|
|
|
cd32de6116
|
day2_commit_1_xml_з123123213
|
2025-02-19 19:00:09 +03:00 |
|
|
|
8535cf6370
|
day2_commit_1_xml_з123123213
|
2025-02-19 18:59:50 +03:00 |
|
|
|
a2a82383a2
|
revert c13d4c12d654ca07fc40bcad056b398f3c707795
revert day2_commit.1.100_temple
|
2025-02-19 15:55:26 +00:00 |
|
|
|
c13d4c12d6
|
day2_commit.1.100_temple
|
2025-02-19 18:53:35 +03:00 |
|
|
|
856b00e591
|
day2_commit.1.24_change_port
|
2025-02-19 18:22:16 +03:00 |
|
|
|
a6f5b89b00
|
day2_commit.1.23_fragment_login_edited
|
2025-02-19 18:11:21 +03:00 |
|
|
|
0cc5854451
|
day2_commit.1.22_add_landscape_for_admin_panel
|
2025-02-19 17:49:35 +03:00 |
|
|
|
f6d313e8a3
|
day2_commit.1.2
|
2025-02-19 17:45:25 +03:00 |
|
|
|
064a29139f
|
Merge remote-tracking branch 'origin/Frontend_UI'
|
2025-02-19 17:44:19 +03:00 |
|
|
|
65c2669c37
|
day2_commit.1.21_закругление_кнопок
|
2025-02-19 17:41:42 +03:00 |
|
|
|
d608af144b
|
Merge branch 'Frontend' into Frontend_UI
|
2025-02-19 17:33:56 +03:00 |
|
|
|
cc37714881
|
day2_commit.1.20_add_strings_for_admin_panel
|
2025-02-19 17:33:18 +03:00 |
|
|
|
a926e0f57c
|
day2_commit_1_xml_закругление кнопок
|
2025-02-19 17:30:44 +03:00 |
|
|
|
763eb5293c
|
day2_commit.1.19_strings_edited_and_add_landscape_for_fragment_main
|
2025-02-19 17:23:29 +03:00 |
|
|
|
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 |
|
|
|
644ff7ae02
|
day2_commit_1_//
|
2025-02-19 16:59:24 +03:00 |
|
|
|
907c1c5d1c
|
day2_commit_13_back_to_Json
|
2025-02-19 16:56:30 +03:00 |
|
|
|
78ac39a0fa
|
day2_commit.1.18_change_admin_screen
|
2025-02-19 16:50:18 +03:00 |
|
|
|
9ecbc6d6d6
|
Merge remote-tracking branch 'origin/Frontend_UI' into Frontend_UI
|
2025-02-19 16:46:56 +03:00 |
|
|
|
698f40a98d
|
day2_commit.1.17_update_qr_scan
|
2025-02-19 16:46:46 +03:00 |
|
|
|
87931483bc
|
day2_commit.1.17_landscape_for_qr_scan
|
2025-02-19 16:43:18 +03:00 |
|
|
|
e025e1eff7
|
Обновить README.md
|
2025-02-19 13:29:50 +00:00 |
|
|
|
94cda378ae
|
day2_commit.1.16
|
2025-02-19 15:58:15 +03:00 |
|
|
|
faadb231c3
|
day2_commit.1.15
|
2025-02-19 15:17:01 +03:00 |
|
