70 Commits

Author SHA1 Message Date
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
654099623a day3_commit.1.2_temp 2025-02-20 12:44:11 +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
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
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
d7474c88a2 day2_commit.1.14_strings_edited 2025-02-19 14:29:37 +03:00
85a5c82d8c day2_commit_10_fixed_alotofbugs_added_admin_logic 2025-02-19 14:12:47 +03:00
0f38f4797a day2_commit.1.13_manifest_edited 2025-02-19 14:11:14 +03:00
233f9bc174 day2_commit.1.13_fragment_login_edited_p2 2025-02-19 14:07:37 +03:00
3792a48f5b day2_commit.1.12_fragment_login_edited 2025-02-19 13:57:16 +03:00
651b2ec439 day2_commit.1.11_strings_edited_and_add_land_orientation_for_login_and)qr_scan_result 2025-02-19 12:47:40 +03:00
4410d2970d day2_commit.1.10_merged 2025-02-19 12:21:40 +03:00
bc159d38a0 Merge branch 'refs/heads/Frontend' into Frontend_UI
# Conflicts:
#	app/src/main/res/values/strings.xml
2025-02-19 12:18:32 +03:00
1d9207a5f5 day2_commit_9_fixed_gradle_part2_and_add_AdminPanel 2025-02-19 12:12:50 +03:00
05efbd0003 day2_commit_1.9_strings_and_fragment_qr_scan_result_edited 2025-02-19 12:02:51 +03:00
b1d2318d08 day2_commit_8.2_fixed_buttons2_added_RV_test 2025-02-19 11:57:50 +03:00
c5fd7ffe21 day2_commit_8.1_fixed_buttons_added_RV_test 2025-02-19 11:56:58 +03:00
5323532ad1 day2_commit_7.1_gone_buttons 2025-02-19 11:29:54 +03:00
52194be6e2 day2_commit_7_gone_buttons 2025-02-19 11:28:43 +03:00
59013160f4 day2_commit_5_UI_merged_ui/ux 2025-02-19 11:24:32 +03:00
ef8eb6b431 Merge branch 'Frontend_UI' into Frontend 2025-02-19 11:22:52 +03:00
861da763cd day2_commit_1.8_fragment_main_edited 2025-02-19 11:20:47 +03:00
b08ab102ad day2_commit_1.7_fragment_main_edited 2025-02-19 11:16:38 +03:00
cfe46a3317 day2_commit_1.6_fragment_main_edited 2025-02-19 11:14:58 +03:00
1a887da8c7 day2_commit_4_UI_fixed_crash_app_when_backend_off 2025-02-19 11:12:23 +03:00
2ec434ea1d day2_commit_1.5_fragment_main_edited 2025-02-19 11:12:01 +03:00