Commit Graph

194 Commits

Author SHA1 Message Date
508eed611e Update file index.ts 2023-06-15 11:32:35 +00:00
f535c739da Merge branch 'dev' into 'staging'
Update file index.ts

See merge request pena-services/hub_admin_backend_service!41
2023-06-13 15:53:20 +00:00
9c382ab12a Update file index.ts 2023-06-13 15:52:32 +00:00
e77860e96e Merge branch 'dev' into 'staging'
Dev

See merge request pena-services/hub_admin_backend_service!40
2023-06-13 15:03:25 +00:00
8ded0f2265 Update file index.ts 2023-06-13 15:02:26 +00:00
Kirill
bd7c6e2e21 Merge branch 'dev' into 'staging'
feat: optional tariff price

See merge request pena-services/hub_admin_backend_service!39
2023-06-11 11:33:46 +00:00
Kirill
79de4ae1ca feat: optional tariff price 2023-06-11 11:33:46 +00:00
Kirill
8ecd0e8982 feat: optional tariff price 2023-06-11 14:30:46 +03:00
Kirill
4406537b61 Merge branch 'staging' of ssh://penahub.gitlab.yandexcloud.net/pena-services/hub_admin_backend_service into dev 2023-06-11 14:28:04 +03:00
Kirill
a8b7bbc02a Merge branch 'dev' into 'staging'
feat: tariff pagination

See merge request pena-services/hub_admin_backend_service!38
2023-06-01 22:21:16 +00:00
Kirill
16e30f012f feat: tariff pagination 2023-06-01 22:21:16 +00:00
Kirill
c4d35c1d76 feat: tariff pagination 2023-06-02 01:19:03 +03:00
Kirill
6150933766 Merge branch 'dev' into 'staging'
feat: pagination tariff

See merge request pena-services/hub_admin_backend_service!37
2023-06-01 22:07:44 +00:00
Kirill
e90cbf763b feat: pagination tariff 2023-06-01 22:07:43 +00:00
Kirill
fe7e7a12a0 refactor: await 2023-06-02 01:06:29 +03:00
Kirill
aff778693e refactor: add pagination & void 2023-06-02 01:03:59 +03:00
Kirill
67ed2131a0 Merge branch 'dev' into 'staging'
fix: tariff helpers

See merge request pena-services/hub_admin_backend_service!36
2023-05-31 21:35:59 +00:00
Kirill
cee7c5aebd fix: tariff helpers 2023-06-01 00:34:52 +03:00
Kirill
712f203600 Merge branch 'dev' into 'staging'
feat: actualize tariff/privilege

See merge request pena-services/hub_admin_backend_service!35
2023-05-31 21:30:15 +00:00
Kirill
c25be23724 feat: actualize tariff/privilege 2023-06-01 00:29:11 +03:00
Kirill
0f19c54545 Merge branch 'dev' into 'staging'
fix: swagger schema

See merge request pena-services/hub_admin_backend_service!34
2023-05-31 19:54:10 +00:00
Kirill
df2dad0c54 fix: swagger schema 2023-05-31 22:51:37 +03:00
Kirill
dd0b617378 Merge branch 'dev' into 'staging'
fix(swagger): tariff model examples

See merge request pena-services/hub_admin_backend_service!33
2023-05-31 14:23:50 +00:00
Kirill
4308c63563 fix(swagger): tariff model examples 2023-05-31 17:19:19 +03:00
Kirill
29136ac17d Merge branch 'dev' into 'staging'
feat: update swagger tariff

See merge request pena-services/hub_admin_backend_service!32
2023-05-31 13:51:35 +00:00
Kirill
fd6fe6d5d6 feat: update swagger tariff 2023-05-31 16:43:26 +03:00
a9f5d62266 Merge branch 'dev' into 'staging'
Dev

See merge request pena-services/hub_admin_backend_service!31
2023-05-29 14:59:17 +00:00
d36f174c2a Merge branch 'staging' into 'dev'
# Conflicts:
#   deployments/dev/docker-compose.yaml
2023-05-29 14:56:45 +00:00
75b17d8b44 Merge branch 'tariff-model' into 'dev'
feat: change tariff model

See merge request pena-services/hub_admin_backend_service!30
2023-05-29 14:50:05 +00:00
Kirill
c1a70eaa8d feat: change tariff model 2023-05-29 09:20:39 +03:00
Kirill
d4009bef7d Merge branch 'dev' into 'staging'
feat: permissions & pagination

See merge request pena-services/hub_admin_backend_service!29
2023-05-12 04:07:59 +00:00
Kirill
3b1e2fb174 feat: permissions & pagination 2023-05-12 04:07:58 +00:00
Kirill
6621ae1ca5 feat: remove useless 2023-05-12 07:07:08 +03:00
Kirill
512f929fb8 Merge branch 'dev' of ssh://penahub.gitlab.yandexcloud.net/pena-services/hub_admin_backend_service into dev 2023-05-12 07:03:33 +03:00
Kirill
ff74d5ca74 feat: permissions & account paginations 2023-05-12 07:03:11 +03:00
8ff5d8aba8 Merge branch 'dev' into 'staging'
Update deployments/staging/docker-compose.yaml

See merge request pena-services/hub_admin_backend_service!28
2023-04-20 12:14:03 +00:00
0e77a4cf47 Update deployments/staging/docker-compose.yaml 2023-04-20 12:12:37 +00:00
Kirill
858136bf28 Merge branch 'dev' into 'staging'
fix: conflicts

See merge request pena-services/hub_admin_backend_service!27
2023-04-19 13:43:06 +00:00
Kirill
6fca987edf fix: conflicts 2023-04-19 16:41:32 +03:00
Kirill
5417777f10 Merge branch 'dev' into 'staging'
fix(handlers.user): get user by token

See merge request pena-services/hub_admin_backend_service!26
2023-04-19 13:30:22 +00:00
Kirill
462dc9ea90 Merge branch 'staging' into 'dev'
# Conflicts:
#   src/handlers/account/index.ts
2023-04-19 13:30:12 +00:00
Kirill
3f316abe42 feat: get account by token 2023-04-19 16:28:23 +03:00
Kirill
5d826a42d9 Merge branch 'dev' into 'staging'
fix(handlers/user): check user exists

See merge request pena-services/hub_admin_backend_service!25
2023-04-19 11:05:03 +00:00
Kirill
1f9ba592e2 fix(handlers/user): check user exists 2023-04-19 11:05:03 +00:00
Kirill
a20171a4f4 fix(handlers.user): get user exists check 2023-04-19 14:01:41 +03:00
f465b28b9a Merge branch 'dev' into 'staging'
Update src/configuration/constitute-mongo-uri.ts

See merge request pena-services/hub_admin_backend_service!24
2023-03-23 16:58:22 +00:00
73a575bb1e Update src/configuration/constitute-mongo-uri.ts 2023-03-23 16:57:57 +00:00
f9c3006d0a Merge branch 'dev' into 'staging'
Update src/configuration/constitute-mongo-uri.ts

See merge request pena-services/hub_admin_backend_service!23
2023-03-23 16:51:54 +00:00
1bd658cc67 Update src/configuration/constitute-mongo-uri.ts 2023-03-23 16:51:27 +00:00
1fc98237e1 Merge branch 'dev' into 'staging'
Update src/configuration/constitute-mongo-uri.ts

See merge request pena-services/hub_admin_backend_service!22
2023-03-23 11:13:12 +00:00