Commit Graph

591 Commits

Author SHA1 Message Date
7cf3052e18 Merge branch 'staging' into 'main'
промокоды запрашиваются с токеном, убран вечный цикл промокодов

See merge request frontend/admin!99
2024-07-20 16:41:48 +00:00
937ac87c9d промокоды запрашиваются с токеном, убран вечный цикл промокодов 2024-07-20 16:19:50 +03:00
7355b53b63 Update admin.conf 2024-07-19 15:08:09 +00:00
7642bfe360 -- 2024-07-15 20:21:43 +03:00
7a3ae40e5a -- 2024-07-15 15:15:54 +03:00
faacbcdcff -- 2024-07-15 13:30:54 +03:00
70b54a48fb Merge remote-tracking branch 'origin/staging' 2024-07-15 12:23:50 +03:00
c1aa6ab1f9 Merge branch 'dev' into 'staging'
отображение ошибки при ошибке декремента привилегии

See merge request frontend/admin!98
2024-07-07 17:22:29 +00:00
1b2a7347a4 отображение ошибки при ошибке декремента привилегии 2024-07-07 20:21:57 +03:00
a0ef7a987c Merge branch 'dev' into 'staging'
Dev

See merge request frontend/admin!97
2024-06-25 20:41:33 +00:00
a21cdc48b2 --1 версия кнопки декремента привилегии юзеру 2024-06-25 23:40:57 +03:00
fa26515652 customer v1.0.0 2024-06-09 19:54:40 +03:00
3e7a1c9ac7 Update admin.conf 2024-06-08 16:16:14 +00:00
1f13249f78 Merge branch 'dev' into 'staging'
heruvym version

See merge request frontend/admin!96
2024-06-03 01:04:22 +00:00
Tamara
7ffdf5dda3 heruvym version 2024-06-03 02:23:41 +03:00
1aad139ee1 Merge branch 'dev' into 'staging'
timeweb.cloud

See merge request frontend/admin!95
2024-06-02 04:15:41 +00:00
d88723bc33 timeweb.cloud 2024-06-02 07:08:46 +03:00
fa5dc3a797 Merge branch 'dev' into 'staging'
Dev

See merge request frontend/admin!94
2024-06-02 03:36:38 +00:00
41673945b2 Merge branch 'api' into 'dev'
refactor: requests decomposed

See merge request frontend/admin!92
2024-06-02 03:35:01 +00:00
bf517a2689 Update 2 files
- /deployments/docker-compose.yaml
- /Dockerfile
2024-05-31 21:04:00 +00:00
bcdc5efcbf Update admin.conf 2024-05-28 13:41:26 +00:00
IlyaDoronin
7d8b1d1aa8 fix: conflicts resolved 2024-05-23 15:03:03 +03:00
IlyaDoronin
e181767278 refactor: requests 2024-05-23 15:01:51 +03:00
cda66148c3 Merge branch 'dev' into 'staging'
Dev

See merge request frontend/admin!93
2024-05-22 21:22:33 +00:00
e2002cbd94 verification/v1.0.0 2024-05-23 00:19:36 +03:00
IlyaDoronin
2264fef8aa refactor: requests 2024-05-22 16:48:38 +03:00
IlyaDoronin
dc23829a49 refactor: requests decomposed 2024-05-21 17:10:02 +03:00
Илья
6c29900ee4 Merge branch 'linter' into 'dev'
feat: prettier

See merge request frontend/admin!90
2024-05-21 08:58:31 +00:00
IlyaDoronin
5ccffb8196 fix: conflicts resolved 2024-05-21 11:53:09 +03:00
IlyaDoronin
16901608af feat: eslint and format code 2024-05-21 10:41:31 +03:00
851515806e Update admin.conf 2024-05-20 19:21:33 +00:00
Tamara
dddc5a6b35 редактирование промокода 2024-05-15 01:21:07 +03:00
874a19fa4e Merge branch 'dev' into 'staging'
Dev

See merge request frontend/admin!91
2024-05-10 11:06:58 +00:00
9a07609e64 Merge branch 'filter-promocodes' into dev 2024-05-10 14:06:26 +03:00
IlyaDoronin
b0e1b4a4a6 feat: prettier 2024-05-10 12:12:57 +03:00
1ff862142c Update admin.conf 2024-05-08 19:05:41 +00:00
39977d8b34 Merge branch 'staging' into 'main'
Staging

See merge request frontend/admin!88
2024-05-08 18:36:52 +00:00
ba0046319d Merge branch 'dev' into 'staging'
Dev

See merge request frontend/admin!87
2024-05-08 18:15:23 +00:00
2da2ddb726 Merge branch 'media-link' into 'dev'
feat: new media link

See merge request frontend/admin!86
2024-05-08 18:12:49 +00:00
IlyaDoronin
887bcccd55 fix 2024-05-08 15:33:44 +03:00
IlyaDoronin
5a27ada250 feat: new media link 2024-05-08 15:31:35 +03:00
IlyaDoronin
495278c1e0 Merge branch 'dev' of penahub.gitlab.yandexcloud.net:frontend/admin into dev 2024-05-08 15:17:46 +03:00
Tamara
02b6ec79e8 фильтры активности промокодов и их статистики 2024-05-08 05:10:07 +03:00
d49208b56f Merge remote-tracking branch 'origin/staging' 2024-05-07 01:20:13 +03:00
58dcdad1e3 Merge branch 'dev' into 'staging'
шильдик в рублях х2, to это конец дня, from это начало

See merge request frontend/admin!85
2024-05-05 22:49:07 +00:00
b99f414393 шильдик в рублях х2, to это конец дня, from это начало 2024-05-06 01:47:46 +03:00
7ab3d9e95b Merge branch 'dev' into 'staging'
шильдик в рублях

See merge request frontend/admin!84
2024-05-05 00:56:51 +00:00
56a3a63960 шильдик в рублях 2024-05-05 03:55:29 +03:00
d3c72f2e0b статистика промокодов рубли в копейки 2024-05-04 02:30:10 +03:00
05d6a823fa Merge branch 'dev' into staging 2024-05-04 01:51:18 +03:00