Compare commits

...
Author SHA1 Message Date
Sergey_Moryakov 25eee8adf5 fix
platform/multy-stub/pipeline/head There was a failure building this commit
2025-02-08 13:10:58 +03:00
julyashap 88552eb04f Merge pull request 'Uncomment dogsitters app' (#97) from dsf-fix into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/97
2025-02-08 12:49:30 +03:00
julyashap ab92c99321 Uncomment dogsitters app
platform/multy-stub/pipeline/head There was a failure building this commit
2025-02-08 12:47:43 +03:00
Alisenok 02963de893 Merge pull request 'Изменение путей запросов' (#96) from dogsitters-finder-3 into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/96
2025-02-08 12:41:38 +03:00
Alisenok 48550416d9 Изменение путей запросов
platform/multy-stub/pipeline/head There was a failure building this commit
2025-02-08 12:40:39 +03:00
aa 878c5ffd68 Merge pull request 'изменение админ панели' (#95) from gamehub into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/95
2025-02-08 11:45:19 +03:00
aaeii 6e37fe93f7 изменение админ панели
platform/multy-stub/pipeline/head There was a failure building this commit
2025-02-08 11:44:00 +03:00
Primakov Alexandr Alexandrovich 72a2667549 1.2.1 2025-02-08 10:39:49 +03:00
Primakov Alexandr Alexandrovich 39db7b4d26 fix 2025-02-08 10:39:45 +03:00
aa ff25c0ecb9 Merge pull request 'fix path' (#93) from gamehub into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/93
2025-02-08 10:34:05 +03:00
aaeii f1a93bffb5 fix path 2025-02-08 10:33:24 +03:00
aa aa231d4f43 Merge pull request 'upd json' (#92) from gamehub into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/92
2025-02-08 09:59:04 +03:00
aaeii f254d57db4 upd json 2025-02-08 09:57:34 +03:00
julyashap 106f835934 Merge pull request 'dogsitters-finder' (#91) from dogsitters-finder into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/91
2025-02-08 04:50:31 +03:00
julyashap f9b30a4cfd Merge branch 'master' into dogsitters-finder
platform/multy-stub/pipeline/head There was a failure building this commit
2025-02-08 04:45:56 +03:00
julyashap 5e4a99529d Add backend and db settings 2025-02-08 04:44:17 +03:00
julyashap 4d585002d7 Add backend and DB settings 2025-02-08 04:38:22 +03:00
Alisenok b073fe3fdf Merge pull request 'Изменены запросы и добавлены новые' (#89) from dogsitters-finder-2 into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/89
2025-02-08 02:39:15 +03:00
Alisenok 312cc229d8 Изменены запросы и добавлены новые
platform/multy-stub/pipeline/head There was a failure building this commit
2025-02-08 02:23:22 +03:00
nekitboy1998 11b1d670d0 Merge pull request 'small fixes in kfu-m-24-1/eng-it-lean' (#88) from kfu-m-24-1/eng-it-lean into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/88
2025-02-07 12:26:56 +03:00
Ruslan Zagitov 522ea36bb9 fix: delete broken dicitonary
platform/multy-stub/pipeline/head There was a failure building this commit
2025-02-07 00:32:53 +03:00
Ruslan Zagitov 8be391c8e1 fix: /units 2025-02-07 00:30:46 +03:00
Ruslan Zagitov ea80304c21 fix: /users 2025-02-07 00:08:03 +03:00
aa 771f75ef08 Merge pull request 'add new game, add link' (#87) from gamehub into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/87
2025-02-05 22:26:15 +03:00
aaeii edf9b2c82b add new game, add link 2025-02-05 22:24:05 +03:00
Ruslan Zagitov 8c3bf8a8ed fix 2025-02-05 19:34:45 +03:00
qosquo a88d3657bf Merge pull request 'kfu-m-24-1/eng-it-lean quick fix' (#86) from kfu-m-24-1/eng-it-lean into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/86
2025-02-05 19:33:51 +03:00
Ruslan Zagitov 1656ce8690 Merge branch 'master' into kfu-m-24-1/eng-it-lean 2025-02-05 19:25:39 +03:00
Ruslan Zagitov 7cdbec53ee fix 2025-02-05 18:55:22 +03:00
nekitboy1998 eee00f0797 Merge pull request 'feat: kfu-m-24-1/eng-it-lean add /users endpoint; small features in /units' (#85) from kfu-m-24-1/eng-it-lean into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/85
2025-02-05 13:54:09 +03:00
Ruslan Zagitov 33845b743d feat: add /users endpoint; update /units 2025-02-05 13:53:11 +03:00
Ruslan Zagitov 059139e213 feat: add /users endpoint; update /units 2025-02-05 13:45:49 +03:00
Ruslan Zagitov 005e7a0ac9 chore: add dictionaries 2025-02-05 13:25:11 +03:00
RustamandRustamRu 9ee59256a9 feat: generate order number (#69)
Добавил генерацию номера заказа при создании

Co-authored-by: RustamRu <kagapov.rustam@gmail.com>
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/69
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>
2025-02-02 15:11:59 +03:00
aa c2784dcf45 Merge pull request 'gamehub' (#76) from gamehub into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/76
2025-02-01 16:20:44 +03:00
Kamila 64ed9b8eda Merge pull request 'kazan-explore culture quiz' (#84) from kazan-explore into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/84
2025-02-01 15:18:40 +03:00
Kamila e9814f36bf kazan-explore culture quiz
platform/multy-stub/pipeline/head This commit looks good
2025-02-01 15:17:54 +03:00
Sergey_Moryakov 0bd883df59 Merge pull request 'delete verification user' (#83) from sberhubproject into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/83
2025-02-01 14:17:43 +03:00
nthngnwhr 1657b0c5e9 Merge pull request 'feat (connectme): add request for city' (#82) from connectme-request into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/82
2025-02-01 14:15:36 +03:00
Sergey_Moryakov a9673b260f delete verification user 2025-02-01 14:15:33 +03:00
khisametdinov 8ee5ca5528 feat (connectme): add request for city
platform/multy-stub/pipeline/head There was a failure building this commit
2025-02-01 11:53:10 +03:00
Sergey_Moryakov e1e335098e Merge pull request '[feat] add interaction telegram bot' (#81) from sberhubproject into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/81
2025-02-01 11:20:30 +03:00
Sergey_Moryakov 619975d1e0 [feat] add interaction telegram bot 2025-02-01 11:19:41 +03:00
Sergey_Moryakov f29bc83d56 Merge pull request '[feat][refactor] add Gigachat and edit data users' (#80) from sberhubproject into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/80
2025-02-01 09:39:46 +03:00
Sergey_Moryakov 61347d1aee [feat][refactor] add Gigachat and edit data users 2025-02-01 09:38:54 +03:00
Kamila ac7a99ef15 Merge pull request 'kazan-explore services data fixed' (#79) from kazan-explore into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/79
2025-02-01 03:43:02 +03:00
Kamila eb3f1f7e3f kazan-explore services data fixed 2025-02-01 03:42:16 +03:00
Kamila 3e02ea5843 Merge pull request 'kazan-explore services data added' (#78) from kazan-explore into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/78
2025-02-01 03:27:43 +03:00
Kamila d06aeeb246 kazan-explore services data added 2025-02-01 03:19:45 +03:00
Sergey_Moryakov e331f69885 Merge pull request '[refactor] edit data interests' (#77) from sberhubproject into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/77
2025-02-01 01:10:39 +03:00
Sergey_Moryakov 23f1277edb [refactor] edit data interests 2025-02-01 01:09:22 +03:00
aaeii 801f9ac1e3 new games-in-cart 2025-01-31 20:18:27 +03:00
nekitboy1998 16bffcafa6 Merge pull request 'feat: add vercel/ai package; gigachat api; refactor dictionaries; add units put request' (#72) from kfu-m-24-1/eng-it-lean into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/72
2025-01-31 18:37:55 +03:00
Kamila 922909397d Merge pull request 'kazan-explore changes' (#75) from kazan-explore into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/75
2025-01-31 18:03:08 +03:00
Kamila 233192ba01 kazan-explore changes 2025-01-31 18:00:56 +03:00
Ruslan Zagitov f72d5220de fix: delete broken dictionary 2025-01-31 16:02:07 +03:00
Ruslan Zagitov 30af0fb1dd Merge branch 'master' into kfu-m-24-1/eng-it-lean 2025-01-31 15:54:22 +03:00
Sergey_Moryakov 854e249100 Merge pull request 'edit data events' (#74) from sberhubproject into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/74
2025-01-31 15:05:41 +03:00
Sergey_Moryakov eddad1cc3f edit data events 2025-01-31 15:02:49 +03:00
Sergey_Moryakov c96e435344 Merge pull request 'delete function delay' (#73) from sberhubproject into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/73
2025-01-31 14:44:35 +03:00
Sergey_Moryakov 7358faef1d delete function delay 2025-01-31 14:42:36 +03:00
Ruslan Zagitov 68de877b06 refactor: /dictionaries endpoint 2025-01-31 13:59:40 +03:00
nekitboy1998 c000106ec8 Merge pull request '[feat] add chgk api' (#71) from sber_web into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/71
2025-01-31 13:43:18 +03:00
Max da84344a63 [feat] add chgk api 2025-01-31 13:35:11 +03:00
Ruslan Zagitov daf5bf7970 chore: install vercel/ai package; remove gigachat/ai static file; requests from /gigachat endpoint are not require SSL 2025-01-31 13:26:34 +03:00
Ruslan Zagitov 4ef941d62f fix: unit router PUT request 2025-01-30 12:41:00 +03:00
Ruslan Zagitov 16fda2e7ed feat: add gigachat api 2025-01-30 12:24:47 +03:00
Sergey_Moryakov ff15a48414 Merge pull request '[feat][refactor] add events and edit users' (#70) from sberhubproject into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/70
2025-01-29 21:25:59 +03:00
Sergey_Moryakov 367c0de6fb [feat][refactor] add events and edit users 2025-01-29 15:50:53 +03:00
primakov 3c89d8b9a8 Merge pull request 'feat: add get master with orders' (#68) from feat/get-master into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/68
2025-01-26 11:02:24 +03:00
237x237 bdc8d9a8e0 feat: add get master with orders
platform/multy-stub/pipeline/head There was a failure building this commit
2025-01-26 00:41:48 +03:00
aaeii cbbb376fd6 update json gamehub: fix format 2025-01-25 23:24:34 +03:00
aaeii faaec7c718 update json gamehub: fix price 2025-01-25 23:16:03 +03:00
Kamila 8814c2a64b Merge pull request 'kazan-explore multy stub changes' (#67) from kazan-explore into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/67
2025-01-24 23:02:53 +03:00
Kamila 298a82e0ae kazan-explore multy stub changes 2025-01-24 23:02:25 +03:00
Kamila a86eb0d4ef Merge pull request 'kazan-explore multy stub changes' (#66) from kazan-explore into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/66
2025-01-24 22:42:50 +03:00
Kamila 335179ad26 kazan-explore multy stub changes 2025-01-24 22:39:25 +03:00
rossetero a1d331b5b4 Merge pull request 'esc stubs fix2' (#65) from esc-stubs into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/65
2025-01-24 16:54:00 +03:00
rossetero 4b77958a92 esc stubs fix2
platform/multy-stub/pipeline/head There was a failure building this commit
2025-01-24 16:52:46 +03:00
rossetero b36ee36e3a Merge pull request 'esc stubs fix?' (#64) from esc-stubs into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/64
2025-01-24 16:44:45 +03:00
rossetero 48ffee1a78 esc stubs fix? 2025-01-24 16:42:42 +03:00
rossetero 6e0934e585 Merge pull request 'esc stubs' (#63) from esc-stubs into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/63
2025-01-24 16:31:13 +03:00
rossetero 846db377ef esc stubs 2025-01-24 15:00:11 +03:00
Primakov Alexandr Alexandrovich 3e8a8997b9 1.2.0 2025-01-19 22:47:53 +03:00
Primakov Alexandr Alexandrovich 04bce4b90f todo-app: patch & delete tidi item 2025-01-19 22:47:47 +03:00
Primakov Alexandr Alexandrovich 3d935af6f1 fix get comments to unknown user 2025-01-19 22:35:22 +03:00
Primakov Alexandr Alexandrovich 0d5dc115b6 1.1.2 2025-01-19 22:23:25 +03:00
Primakov Alexandr Alexandrovich 15cfc129a5 todo-app: wome routes without jwt 2025-01-19 22:23:19 +03:00
Primakov Alexandr Alexandrovich 270fe51500 move old to legacy folder 2025-01-19 21:13:33 +03:00
Primakov Alexandr Alexandrovich 8a2afc3f1b 1.1.1 2025-01-19 21:05:16 +03:00
Primakov Alexandr Alexandrovich d824844ae5 populate author of comments 2025-01-19 21:05:08 +03:00
Primakov Alexandr Alexandrovich f95a26acbb todo-app: get item by id 2025-01-19 20:44:26 +03:00
237x237 e0618e431f feat: add get date orders 2025-01-19 11:29:11 +03:00
237x237 1b93a8e2bb fix: change get for orders v2 2025-01-19 10:23:48 +03:00
primakov b8dc15cbc6 Merge pull request 'feat: use stubs for orders data (#64)' (#62) from feature/dry-wash-orders into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/62
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>
2025-01-19 10:11:41 +03:00
RustamRu 949416d2a3 feat: use stubs for orders data (#64) 2025-01-18 23:02:45 +03:00
RustamRu 1ec9f1a7ec Revert "feat: use stubs for orders data (#64)"
This reverts commit 87c1cbb19e.
2025-01-18 23:00:20 +03:00
RustamRu 17c63e6fe0 Merge branch 'master' of ssh://85.143.175.152:222/bro-students/multy-stub 2025-01-18 22:58:00 +03:00
RustamRu 87c1cbb19e feat: use stubs for orders data (#64) 2025-01-18 22:57:56 +03:00
pulemetik.ai c86f84d037 merge: feature(freetracker): landing requests 2025-01-18 20:36:14 +03:00
pulemetik.ai b8bc2c83a3 Merge branch 'feature/freetracker-landing' 2025-01-18 20:32:00 +03:00
pulemetik.ai 552457b5cb feature(freetracker): landing requests
platform/multy-stub/pipeline/head This commit looks good
2025-01-18 20:28:22 +03:00
aaeii 909f7e4de9 update gamehub gamepage, categories 2025-01-18 19:48:02 +03:00
Primakov Alexandr Alexandrovich 86b79a7f49 comments 2025-01-18 17:45:16 +03:00
Primakov Alexandr Alexandrovich d2d8b63aba fix item create 2025-01-18 17:16:35 +03:00
Primakov Alexandr Alexandrovich 0dcf961cce todo CR todo list 2025-01-18 17:08:09 +03:00
Primakov Alexandr Alexandrovich 38bc0c55c8 1.1.0 2025-01-18 16:52:14 +03:00
Primakov Alexandr Alexandrovich 9fb4219418 todo list get list 2025-01-18 16:52:10 +03:00
Primakov Alexandr Alexandrovich fb644b6f7b create todo list 2025-01-18 16:50:58 +03:00
Primakov Alexandr Alexandrovich d88e680413 todo auth 2025-01-18 15:44:14 +03:00
Primakov Alexandr Alexandrovich 8b7f43d15a mode todo in todo folder 2025-01-17 19:51:33 +03:00
primakov b9edd0091c Merge pull request 'delete masters _id' (#60) from feature/arm-master-id into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/60
2025-01-13 17:26:46 +03:00
RustamRu 558245f876 delete masters _id
platform/multy-stub/pipeline/head There was a failure building this commit
2025-01-12 11:12:24 +03:00
primakov a927727c1b Merge pull request 'fix: change get for orders' (#59) from fix/orders-get into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/59
2025-01-12 10:43:08 +03:00
237x237 a9d9aa02da fix: change get for orders
platform/multy-stub/pipeline/head There was a failure building this commit
2025-01-12 10:40:50 +03:00
Kamila e7451aea5b Merge pull request 'added stubs for kazan-explore sport quiz' (#58) from kazan-explore into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/58
2025-01-11 20:27:32 +03:00
Kamila 5cc580c3c5 added stubs for kazan-explore sport quiz 2025-01-11 20:25:17 +03:00
innoavvlasov 3fe62ec268 Merge pull request 'add auth in freetracker' (#57) from freetracker-add-auth into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/57
2024-12-31 10:12:39 +03:00
1345 changed files with 16485 additions and 1503 deletions

No files matched your search

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loaded 100 of 1345 files, more files were not shown because too many files have changed in this diff. Show more