|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
IlyaDoronin
|
f073adc767
|
fix: tariff price
|
2024-05-01 17:22:08 +03:00 |
|
IlyaDoronin
|
a8182b1ab8
|
fix: statistics error
|
2024-05-01 15:13:08 +03:00 |
|
|
|
856a823727
|
--
|
2024-05-01 02:35:50 +03:00 |
|
|
|
12435b69b1
|
статистика, фром = дата - 4 недели
|
2024-05-01 01:27:57 +03:00 |
|
|
|
1c22333839
|
Merge branch 'statistics-refactoring' into 'dev'
refactor: statistics
See merge request frontend/admin!79
|
2024-04-30 18:28:43 +00:00 |
|
IlyaDoronin
|
9e4d13303e
|
refactor: promocode statistics
|
2024-04-30 18:30:24 +03:00 |
|
Илья
|
9fea38098b
|
Merge branch 'promo-stat' into 'statistics-refactoring'
Promo stat
See merge request frontend/admin!80
|
2024-04-30 11:31:22 +00:00 |
|
IlyaDoronin
|
e9ab16bd85
|
feat: updates
|
2024-04-30 14:30:59 +03:00 |
|
IlyaDoronin
|
6d67a11265
|
feat: schild pagination
|
2024-04-30 13:34:29 +03:00 |
|
Tamara
|
eb6cd2face
|
статистика промокода(без кодвордов, почищено)
|
2024-04-30 04:20:34 +03:00 |
|
Tamara
|
56f1a2f7ab
|
статистика промокода(без кодвордов)
|
2024-04-30 03:25:46 +03:00 |
|
IlyaDoronin
|
e42e8cc766
|
refactor: statistics
|
2024-04-29 17:49:31 +03:00 |
|
Tamara
|
ddd345b0d1
|
статистика промокода(без вывода в таблицу)
|
2024-04-29 16:29:52 +03:00 |
|
|
|
888fefae2b
|
Merge branch 'dev' into 'staging'
Dev
See merge request frontend/admin!78
|
2024-04-27 13:52:43 +00:00 |
|
|
|
8f7e0bfbdf
|
Merge branch 'promocodes-description' into 'dev'
feat: promocodes description
See merge request frontend/admin!77
|
2024-04-27 13:52:19 +00:00 |
|
IlyaDoronin
|
1dc7a83ac2
|
feat: promocodes description
|
2024-04-26 14:12:51 +03:00 |
|
|
|
4f9ae1c51d
|
Merge branch 'dev' into 'staging'
Dev
See merge request frontend/admin!76
|
2024-04-25 12:10:55 +00:00 |
|
Tamara
|
054a2c3f39
|
обновленная таблица статистики шильдика, отработка запроса при загрузке страницы
|
2024-04-25 05:35:08 +03:00 |
|
