56 Commits

Author SHA1 Message Date
SunZar
a7de8a2898 feat: last release3 2025-02-20 17:03:53 +03:00
SunZar
116eb2f04b Merge remote-tracking branch 'origin/main'
# Conflicts:
#	app/src/main/res/layout/fragment_profile.xml
2025-02-20 16:56:19 +03:00
SunZar
b862af7143 feat: last 2025-02-20 16:55:34 +03:00
SunZar
078adc232b xml refactor2 release release2 2025-02-20 16:49:15 +03:00
SunZar
7ab97d1209 Merge remote-tracking branch 'origin/main' 2025-02-20 16:39:08 +03:00
68c14eefbd xml refactor 2025-02-20 16:38:56 +03:00
SunZar
04c8c99dfb Merge remote-tracking branch 'origin/main' 2025-02-20 16:38:21 +03:00
c92765855d xml refactor 2025-02-20 16:38:07 +03:00
371aef11f2 Merge remote-tracking branch 'origin/main' 2025-02-20 15:54:23 +03:00
8701a43136 link to visualization added 2025-02-20 15:54:08 +03:00
bc48b83103 fix LoginFragment 2025-02-20 15:36:25 +03:00
1daf04e716 added qr drawable 2 2025-02-20 14:58:42 +03:00
SunZar
6cf20482b5 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	app/src/main/java/ru/myitschool/work/domain/UserRepository.java
2025-02-20 14:50:13 +03:00
a3544d6fd6 added qr drawable 2025-02-20 14:49:51 +03:00
SunZar
7b3f9ea54c added qr drawable 2025-02-20 14:49:18 +03:00
SunZar
1ac6044dc6 feat: History is working, small changes in Login 2025-02-20 14:44:33 +03:00
SunZar
1132651be6 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	app/src/main/java/ru/myitschool/work/data/UserRepositoryImpl.java
#	app/src/main/java/ru/myitschool/work/data/dto/UserDto.java
#	app/src/main/java/ru/myitschool/work/domain/entities/UserEntity.java
2025-02-20 14:44:10 +03:00
SunZar
d5a49dfa1e feat: History is working, small changes in Login 2025-02-20 14:42:33 +03:00
6edfdf475e added Admin 2025-02-20 14:41:08 +03:00
SunZar
ae7a743d41 feat: commit for sync 2025-02-20 11:18:36 +03:00
SunZar
386d2a0577 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	app/src/main/java/ru/myitschool/work/data/dto/HistoryDto.java
2025-02-20 10:54:11 +03:00
SunZar
04b26f8eaf feat: Added history (RecyclerView) and fixed bugs 2025-02-20 10:53:37 +03:00
86cbb6b87d added ProfileFragment ProfileViewModel Utils
fragment_profile.xml
2025-02-20 10:53:20 +03:00
9e0f181f56 added fragment_admin.xml 2025-02-20 10:03:26 +03:00
SunZar
8f683c1f0c feat: Changed Login and UserApi 2025-02-19 18:58:38 +03:00
1b160281e3 feat: fixed UserRepositoryImpl 2025-02-19 18:04:53 +03:00
SunZar
d0229e9515 feat: Sync and fix problems with navigation 2025-02-19 16:52:17 +03:00
SunZar
dc5c724263 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	app/src/main/java/ru/myitschool/work/ui/InformationFragment.java
#	app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.java
#	app/src/main/res/layout/fragment_information.xml
#	app/src/main/res/layout/fragment_login.xml
2025-02-19 16:50:18 +03:00
290de5f6cd feat: Sync and fix problems with navigation 2025-02-19 16:36:03 +03:00
1344f247b1 feat: All entity and UserApi added 2025-02-19 16:07:16 +03:00
SunZar
430e0bfcdf feat: All entity and UserApi added 2025-02-19 15:32:43 +03:00
SunZar
148df734a9 feat: All needed DTO added 2025-02-19 12:38:25 +03:00
7802d39417 add History Adapter 2025-02-19 11:02:09 +03:00
a29cdbb5d5 I hope that is first and final commit 2024-12-06 22:02:45 +08:00
d2a9b7504b Initial commit 2024-12-06 19:42:46 +08:00
1875f3d59f Обновить README.md 2024-11-26 18:23:37 +00:00
Анастасия Таразевич
7bf5942995 Обновить README.md 2024-11-20 01:57:35 +00:00
Анастасия Таразевич
e50eacbe60 Обновить README.md 2024-11-20 00:36:07 +00:00
9b127361c5 add network config 2024-11-19 01:38:45 +07:00
vladimir-shperling
1df9f8982d Merge remote-tracking branch 'upstream/main' 2024-11-05 21:17:37 +00:00
b723b77676 Обновить .gitea/workflows/automerge-with-core.yaml 2024-11-05 21:02:05 +00:00
64136bae70 Обновить app/src/main/java/ru/myitschool/work/core/Constants.kt 2024-11-05 18:16:20 +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
5b8bd8f818 Добавить README.md 2024-10-29 18:57:04 +00:00
8864761bdd Add kapt 2024-10-29 20:33:19 +07:00
4c051cd158 Add template 2024-10-29 20:31:23 +07: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