|
0470485b64
|
Merge branch 'discounts-page' into 'dev'
fix discount creating page
See merge request frontend/admin!19
|
2023-05-24 18:20:23 +00:00 |
|
nflnkr
|
c65684bc32
|
fix discount creating page
|
2023-05-24 19:27:10 +03:00 |
|
ArtChaos189
|
7ee5df05f2
|
fix PutPrivilegies
|
2023-05-24 17:29:04 +03:00 |
|
ArtChaos189
|
7ef0ac60a8
|
fix PrivilegiesWrapper
|
2023-05-24 17:20:54 +03:00 |
|
ArtChaos189
|
9c0d831050
|
Настройка SettingRoles
|
2023-05-24 16:34:46 +03:00 |
|
ArtChaos189
|
ab603c35c2
|
fix PutPrivilegies
|
2023-05-24 14:15:57 +03:00 |
|
nflnkr
|
c1fb3865c6
|
fix tariff store
|
2023-05-23 15:23:04 +03:00 |
|
nflnkr
|
b856b21aa7
|
add change privilege price modal
|
2023-05-23 15:21:54 +03:00 |
|
nflnkr
|
286a670b27
|
change tariff type
|
2023-05-23 15:20:37 +03:00 |
|
nflnkr
|
1d7f3c5f11
|
fix auth buttons disable on submitting
|
2023-05-21 14:05:19 +03:00 |
|
|
a7f243fe65
|
сервисЮзерс принял тип any и обращается к users в props объекте
|
2023-05-19 15:20:33 +03:00 |
|
|
58fa8e8154
|
Merge branch 'dev' into 'main'
Dev
See merge request frontend/admin!17
|
2023-05-18 20:41:36 +00:00 |
|
nflnkr
|
2084b5619c
|
add discount de/activation
|
2023-05-18 23:31:36 +03:00 |
|
nflnkr
|
ae632f6edf
|
rename menu item
|
2023-05-18 23:27:46 +03:00 |
|
|
804ec6d5f4
|
Merge branch 'dev' into 'main'
Users: replacing table with dataGrid &&
See merge request frontend/admin!16
|
2023-05-18 18:28:57 +00:00 |
|
|
c74b09fa0a
|
Update file .gitignore
|
2023-05-18 00:10:29 +00:00 |
|
|
1229a5a4f1
|
Merge branch 'dev' into 'main'
Users: replacing table with dataGrid &&
See merge request frontend/admin!15
|
2023-05-17 17:08:37 +00:00 |
|
|
c8a5580fa7
|
Users: replacing table with dataGrid &&
|
2023-05-17 17:08:37 +00:00 |
|
|
fde2f8414f
|
fix: after rebase
|
2023-05-17 20:06:54 +03:00 |
|
nflnkr
|
208c7f69ff
|
fix fetch on scroll
|
2023-05-17 20:06:54 +03:00 |
|
nflnkr
|
bec307569c
|
fix api request
|
2023-05-17 20:06:54 +03:00 |
|
nflnkr
|
4e5c1edd66
|
refactor requests
|
2023-05-17 20:06:54 +03:00 |
|
ArtChaos189
|
028446f33d
|
Добавил закрытие импута по нажатие Enter и закртие по Escape
|
2023-05-17 20:06:54 +03:00 |
|
ArtChaos189
|
35a0a8c334
|
ЩДобавил аккардеон для привелегий
|
2023-05-17 20:06:54 +03:00 |
|
ArtChaos189
|
097c51d652
|
Domain replacement in gettingListManagers
|
2023-05-17 20:06:54 +03:00 |
|
ArtChaos189
|
769d29458c
|
Users: replacing table with dataGrid &&
replacement users when switching roles
|
2023-05-17 20:06:54 +03:00 |
|
|
5f6ea741f4
|
Merge branch 'dev' into 'main'
Users: replacing table with dataGrid &&
See merge request frontend/admin!14
|
2023-05-17 16:26:18 +00:00 |
|
|
080f9bde6e
|
Users: replacing table with dataGrid &&
|
2023-05-17 16:26:18 +00:00 |
|
|
7e8f012a07
|
Merge branch 'dev' into 'main'
Users: replacing table with dataGrid &&
See merge request frontend/admin!13
|
2023-05-17 13:08:02 +00:00 |
|
|
0a016c1835
|
Users: replacing table with dataGrid &&
|
2023-05-17 13:08:02 +00:00 |
|
|
28fdd70cab
|
Merge branch 'dev' into 'main'
Users: replacing table with dataGrid &&
See merge request frontend/admin!12
|
2023-05-16 16:57:44 +00:00 |
|
|
92e0f6327d
|
Users: replacing table with dataGrid &&
|
2023-05-16 16:57:44 +00:00 |
|
|
8008892b7b
|
Update file .gitlab-ci.yml
|
2023-05-08 16:44:02 +00:00 |
|
|
f78b2d98c0
|
Update file .gitlab-ci.yml
|
2023-05-08 16:36:18 +00:00 |
|
|
1254227e54
|
Merge branch 'dev' into 'main'
Dev
See merge request frontend/admin!11
|
2023-05-08 15:43:43 +00:00 |
|
|
751c962480
|
store/auth использует токен из зустанда
|
2023-05-08 17:34:50 +03:00 |
|
|
18029e8133
|
слияние dev и tickets
|
2023-05-08 10:29:47 +03:00 |
|
nflnkr
|
bff980dfc1
|
add fetch messages on scroll
|
2023-05-08 10:23:39 +03:00 |
|
nflnkr
|
03afb6afa6
|
fix word break
|
2023-05-08 09:54:25 +03:00 |
|
nflnkr
|
03e6d87a5d
|
refactor tickets state
|
2023-05-08 09:54:25 +03:00 |
|
|
89aea05dd4
|
+ withCredentials: true в конфиг axios
|
2023-05-07 10:37:30 +03:00 |
|
|
df97ae3411
|
--
|
2023-05-05 22:09:11 +03:00 |
|
|
9cb2548603
|
bearer для токена
|
2023-05-05 22:05:09 +03:00 |
|
ArtChaos189
|
d0c8569a3c
|
Получение списка менеджеров в админке
|
2023-05-05 15:49:18 +03:00 |
|
ArtChaos189
|
3bf2eee43d
|
Получение списка юзеров в адмике
|
2023-05-05 15:07:37 +03:00 |
|
ArtChaos189
|
c251a598cc
|
Создал ConditionalRender для рендера дочерних компонентов в зависмотси от роли
|
2023-04-21 16:08:33 +03:00 |
|
ArtChaos189
|
8eab3d22ab
|
Создал форму для удаления ролей
|
2023-04-21 10:25:12 +03:00 |
|
ArtChaos189
|
24202ed52c
|
create (axiosRoles , SettingRoles)
|
2023-04-20 18:42:18 +03:00 |
|
ArtChaos189
|
bb1d35367c
|
MakeRequest
|
2023-04-18 17:30:47 +03:00 |
|
ArtChaos189
|
162c676375
|
fix Chat
|
2023-04-18 14:06:23 +03:00 |
|