Commit Graph

194 Commits

Author SHA1 Message Date
ee00fc3ac7 Update index.ts 2023-09-16 17:47:26 +00:00
5c94e5264f Merge branch 'dev' into 'staging'
Dev

See merge request pena-services/hub_admin_backend_service!62
2023-09-15 21:18:09 +00:00
3c7a95705e Merge branch 'naming' into 'dev'
ci(test): local testing

See merge request pena-services/hub_admin_backend_service!61
2023-09-15 21:12:03 +00:00
kroyzen
98b7451157 ci(test): local testing 2023-08-23 17:59:45 +03:00
928b368b8b Merge branch 'naming' into 'dev'
style: privilegies => privileges

See merge request pena-services/hub_admin_backend_service!60
2023-08-22 23:15:11 +00:00
kroyzen
c25f72a185 style: privilegies => privileges 2023-08-22 11:14:53 +03:00
62d3038a1e Merge branch 'dev' into 'staging'
Dev

See merge request pena-services/hub_admin_backend_service!59
2023-07-03 16:48:49 +00:00
b30590dbfb Merge branch 'staging' into 'dev'
# Conflicts:
#   src/handlers/privilege/index.ts
2023-07-03 16:48:37 +00:00
c7cc06aa61 Update file index.ts 2023-07-03 16:43:05 +00:00
Kirill
1990809cec Merge branch 'dev' into 'staging'
feat: price not required for privilege

See merge request pena-services/hub_admin_backend_service!58
2023-06-24 12:12:46 +00:00
Kirill
4f34378010 feat: price not required for privilege 2023-06-24 12:12:46 +00:00
Kirill
667fdce888 feat: price not required for privilege 2023-06-24 15:11:11 +03:00
Kirill
651f99d2c5 Merge branch 'dev' into 'staging'
feat: private tariff & remove duplicate bag

See merge request pena-services/hub_admin_backend_service!57
2023-06-22 13:29:48 +00:00
Kirill
c3fb5177bc feat: private tariff & remove duplicate bag 2023-06-22 13:29:48 +00:00
Kirill
989d1b1075 feat: private tariff 2023-06-22 16:25:31 +03:00
Kirill
ef7b1269ca fix: duplicates handler 2023-06-22 16:07:33 +03:00
08e15f5108 Merge branch 'dev' into 'staging'
Update file index.ts

See merge request pena-services/hub_admin_backend_service!56
2023-06-17 17:45:02 +00:00
6778592107 Update file index.ts 2023-06-17 17:44:19 +00:00
6be82fa7d5 Merge branch 'dev' into 'staging'
Update file index.ts

See merge request pena-services/hub_admin_backend_service!55
2023-06-17 17:36:55 +00:00
2951f7cde5 Update file index.ts 2023-06-17 17:35:56 +00:00
c5a6704961 Merge branch 'dev' into 'staging'
Update file index.ts

See merge request pena-services/hub_admin_backend_service!54
2023-06-17 17:06:09 +00:00
e24f5115bc Update file index.ts 2023-06-17 17:04:40 +00:00
f1e30336dc Merge branch 'dev' into 'staging'
Update file index.ts

See merge request pena-services/hub_admin_backend_service!53
2023-06-17 16:59:52 +00:00
7a138b49a5 Update file index.ts 2023-06-17 16:59:30 +00:00
65a694f351 Merge branch 'dev' into 'staging'
Update file index.ts

See merge request pena-services/hub_admin_backend_service!52
2023-06-17 16:53:00 +00:00
42613b5c89 Update file index.ts 2023-06-17 16:52:35 +00:00
0ec6a755ab Merge branch 'dev' into 'staging'
Update file index.ts

See merge request pena-services/hub_admin_backend_service!51
2023-06-17 16:46:47 +00:00
0b456a0460 Update file index.ts 2023-06-17 16:46:01 +00:00
08f08b8779 Merge branch 'dev' into 'staging'
Update file index.ts

See merge request pena-services/hub_admin_backend_service!50
2023-06-17 15:56:12 +00:00
59b11a573c Update file index.ts 2023-06-17 15:55:01 +00:00
c694f5fe1c Merge branch 'dev' into 'staging'
Update file index.ts

See merge request pena-services/hub_admin_backend_service!49
2023-06-17 15:28:26 +00:00
82bc70163d Update file index.ts 2023-06-17 15:27:29 +00:00
4adccd374b Merge branch 'dev' into 'staging'
Update file index.ts

See merge request pena-services/hub_admin_backend_service!48
2023-06-17 15:07:26 +00:00
cb2d80fbaf Update file index.ts 2023-06-17 15:06:44 +00:00
013fe877f2 Merge branch 'dev' into 'staging'
Update file index.ts

See merge request pena-services/hub_admin_backend_service!47
2023-06-17 14:03:08 +00:00
6a654eaf82 Update file index.ts 2023-06-17 14:02:42 +00:00
5b1d664649 Merge branch 'dev' into 'staging'
Update file index.ts

See merge request pena-services/hub_admin_backend_service!46
2023-06-16 21:02:25 +00:00
73261d6902 Update file index.ts 2023-06-16 21:02:02 +00:00
24dda5ecd4 Merge branch 'dev' into 'staging'
Update file index.ts

See merge request pena-services/hub_admin_backend_service!45
2023-06-16 20:52:37 +00:00
e7d3cea453 Update file index.ts 2023-06-16 20:51:40 +00:00
93bbcc3251 Merge branch 'dev' into 'staging'
Dev

See merge request pena-services/hub_admin_backend_service!44
2023-06-16 19:50:59 +00:00
93d8ad65d7 Merge branch 'staging' into 'dev'
# Conflicts:
#   src/handlers/tariff/index.ts
2023-06-16 19:50:41 +00:00
a46fd883b4 Update file index.ts 2023-06-16 19:47:52 +00:00
Kirill
e519a19aa1 Merge branch 'dev' into 'staging'
fix: use amount from request

See merge request pena-services/hub_admin_backend_service!43
2023-06-16 18:55:13 +00:00
Kirill
9b212aa529 fix: use amount from request 2023-06-16 18:55:13 +00:00
Kirill
87f253bbb9 fix: amount use from request 2023-06-16 21:53:20 +03:00
Kirill
b6cac94a61 Merge branch 'staging' of ssh://penahub.gitlab.yandexcloud.net/pena-services/hub_admin_backend_service into dev 2023-06-16 19:54:33 +03:00
Kirill
8bf35360cc fix: conflicts 2023-06-16 19:54:08 +03:00
Kirill
119adaaf39 feat(handlers/tariff): remove privilege find 2023-06-16 19:53:08 +03:00
866d821d9d Merge branch 'dev' into 'staging'
Update file index.ts

See merge request pena-services/hub_admin_backend_service!42
2023-06-15 11:34:09 +00:00