Compare commits

..
284 Commits
Author SHA1 Message Date
RustamRu 1bf68cea08 Merge branch 'master' of ssh://85.143.175.152:222/bro-students/multy-stub
platform/multy-stub/pipeline/head There was a failure building this commit
2025-03-20 12:30:28 +03:00
RustamRu 110e8300a1 feat: dry-wash, use car color in ai prompt 2025-03-20 12:30:22 +03:00
237x237 f3566361fb Merge pull request 'feat: rewrite the request to receive orders from the masters' (#110) from feat/filter-master into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/110
2025-03-17 23:44:19 +03:00
237x237 a63a229b64 feat: rewrite the request to receive orders from the masters
platform/multy-stub/pipeline/pr-master There was a failure building this commit
platform/multy-stub/pipeline/head There was a failure building this commit
2025-03-17 23:41:07 +03:00
237x237 8944508308 Merge pull request 'feat: make the time of the master to be taken from the body' (#109) from feat/filter-master into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/109
2025-03-17 21:07:21 +03:00
237x237 775f24cffa feat: make the time of the master to be taken from the body 2025-03-17 21:05:48 +03:00
RustamRu 78b72b0edc feat: add GigaChat model retrieval for enhanced image analysis 2025-03-14 08:34:16 +03:00
RustamRu 333fe79c8b fix: change carColor type to Mixed for improved flexibility 2025-03-12 17:56:46 +03:00
RustamRu 9d10c8501a Merge branch 'master' of ssh://85.143.175.152:222/bro-students/multy-stub 2025-03-12 17:41:54 +03:00
RustamRu d64ece382a fix: update car color validation to handle both string and number types 2025-03-12 17:41:48 +03:00
Primakov Alexandr Alexandrovich f91f821f86 fix navigation elements 2025-03-12 09:12:09 +03:00
Primakov Alexandr Alexandrovich b5301f948a Еще правки с урлами и верстка 2025-03-12 00:37:32 +03:00
Primakov Alexandr Alexandrovich dd589790c2 fix путей 2025-03-12 00:29:55 +03:00
Primakov Alexandr Alexandrovich 1fcc5ed70d init Questionnaire 2025-03-11 23:50:50 +03:00
RustamRu 41dbe81001 Merge branch 'master' of ssh://85.143.175.152:222/bro-students/multy-stub 2025-03-09 11:04:07 +03:00
RustamRu 7b685ad99e feat: add dynamic system prompt for car image analysis 2025-03-09 11:04:01 +03:00
237x237 2f1e1dc040 Merge pull request 'feature/master-date' (#108) from feature/master-date into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/108
2025-03-09 09:43:26 +03:00
RustamRu 70e8a6877c change car img size limit 2025-03-04 19:04:38 +03:00
RustamRu 87fd3121f9 fix: get img value data 2025-03-03 20:41:55 +03:00
RustamRu 4f9434163e Merge branch 'master' of ssh://85.143.175.152:222/bro-students/multy-stub 2025-03-03 20:14:06 +03:00
RustamRu 350d452a7b fix file convert to base64 2025-03-03 20:13:51 +03:00
237x237 9a0669df13 feat: add find by id 2025-03-03 20:08:28 +03:00
RustamRu c0883fc2bc add get token, fix prompt
platform/multy-stub/pipeline/pr-master There was a failure building this commit
platform/multy-stub/pipeline/head There was a failure building this commit
2025-03-03 19:49:11 +03:00
237x237 566bce4663 feat: delete image
platform/multy-stub/pipeline/pr-master There was a failure building this commit
platform/multy-stub/pipeline/head There was a failure building this commit
2025-03-03 19:46:10 +03:00
237x237 c828718498 feat: add today filter 2025-03-03 19:36:56 +03:00
RustamRu 69c280b266 evaluate with ai car dirtiness by image 2025-03-03 18:21:32 +03:00
237x237 6794b01ac8 feat: add fetch image
ms-devops/pipeline/head There was a failure building this commit
2025-02-23 12:32:53 +03:00
primakov 1cb586f55a Merge pull request 'feat: upload car image' (#106) from feature/dry/wash-car-image-upload into master
ms-devops/pipeline/head There was a failure building this commit
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/106
2025-02-23 12:22:27 +03:00
RustamRu df21879c0d feat: upload car image
ms-devops/pipeline/head There was a failure building this commit
ms-devops/pipeline/pr-master There was a failure building this commit
2025-02-22 16:58:58 +03:00
Primakov Alexandr Alexandrovich 30c9c86c93 Merge branch 'master' of ssh://85.143.175.152:222/bro-students/multy-stub 2025-02-10 22:19:46 +03:00
Primakov Alexandr Alexandrovich 2925d0f17b fix eslint 2025-02-10 22:19:01 +03:00
Primakov Alexandr Alexandrovich 752dabd015 fix eslint 2025-02-10 22:13:55 +03:00
Primakov Alexandr Alexandrovich 815f11d5bc add nav router 2025-02-10 22:07:54 +03:00
julyashap 02eb0e60b7 Merge pull request 'Fix paths' (#105) from dsf-fix-1 into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/105
2025-02-08 14:55:33 +03:00
julyashap a64ac93935 Fix paths
platform/multy-stub/pipeline/head There was a failure building this commit
2025-02-08 14:54:57 +03:00
julyashap 66a48d1c7e Merge pull request 'Add queries to dogsitter-viewing' (#104) from dsf-fix-1 into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/104
2025-02-08 14:34:34 +03:00
julyashap 26c66f16b4 Add queries to dogsitter-viewing 2025-02-08 14:33:29 +03:00
julyashap 02e50bb2f9 Merge pull request 'Update users.json' (#103) from dsf-fix-1 into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/103
2025-02-08 14:26:13 +03:00
julyashap fadc62c8f0 Update users.json 2025-02-08 14:25:29 +03:00
julyashap 4759f6f7ee Merge pull request 'Uncomment dogsitters app' (#102) from dsf-fix-1 into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/102
2025-02-08 13:45:14 +03:00
julyashap 14f2164a82 Uncomment dogsitters app 2025-02-08 13:44:34 +03:00
julyashap 14ef1f9bad Merge pull request 'Fix export' (#101) from dsf-fix-1 into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/101
2025-02-08 13:28:29 +03:00
julyashap dc99318ff0 Fix export 2025-02-08 13:27:38 +03:00
julyashap d2fc5f4d5c Merge pull request 'Fix dogsitters backend' (#100) from dsf-fix-1 into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/100
2025-02-08 13:17:00 +03:00
julyashap 938bd48fff Fix dogsitters backend 2025-02-08 13:15:02 +03:00
nekitboy1998 96f819dc91 Merge pull request 'fix' (#99) from sberhubproject into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/99
2025-02-08 13:12:46 +03:00
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 d2b2a29d3d Merge pull request 'Remove backend files' (#98) from dsf-fix-1 into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/98
2025-02-08 13:10:27 +03:00
julyashap 1cf71261d1 Remove backend files 2025-02-08 13:08:55 +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
innoavvlasov e73f7e2dc9 add auth in freetracker
platform/multy-stub/pipeline/head There was a failure building this commit
2024-12-31 10:11:17 +03:00
Sergey_Moryakov 571c43c33c add sberhubproject 2024-12-28 11:02:11 +03:00
nekitboy1998 61c847b58c Merge pull request 'kfu-m-24-1/eng-it-lean' (#56) from kfu-m-24-1/eng-it-lean into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/56
2024-12-28 10:24:59 +03:00
Ruslan Zagitov 4d621c8bbe chore: add new dictionary 2024-12-27 23:32:54 +03:00
Ruslan Zagitov ab8a9ebc99 feat: add '/units' endpoints; add 'put' and 'delete' requests to '/dictionaries' endpoint 2024-12-27 23:15:26 +03:00
Kamila 2d1a4ba8db Merge pull request 'fixing stub paths' (#55) from kazan-explore into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/55
2024-12-27 23:01:16 +03:00
Kamila 9ed6808838 fixing stub paths 2024-12-27 22:55:08 +03:00
Kamila 8bd3ccfce7 Merge pull request 'kazan-explore stubs changed, added translation' (#54) from kazan-explore into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/54
2024-12-27 22:41:23 +03:00
Kamila 9818550b29 kazan-explore stubs changed, added translation 2024-12-27 22:15:06 +03:00
aaeii fe8a477b27 Merge branch 'master' of https://git.bro-js.ru/bro-students/multy-stub 2024-12-27 21:30:20 +03:00
aaeii 12af9b7c10 добавили окно с просмотром игр 2024-12-27 21:29:26 +03:00
Alisenok 1871f3f96a Merge pull request 'Добавлены стабы для двуфакторной авторизации' (#53) from dogsitters-finder into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/53
2024-12-26 23:21:53 +03:00
Alisenok 05be7c4a26 Merge branch 'master' into dogsitters-finder 2024-12-26 23:21:24 +03:00
aaeii 46c8147172 fixed json gamehub 2024-12-25 02:26:03 +03:00
Alisenok 271f7cab7d Добавлены стабы для двуфакторной авторизации 2024-12-25 00:43:36 +03:00
aaeii 50e105b851 gamehub stubs 2024-12-24 16:34:43 +03:00
aaeii da201720c0 gamehub stubs 2024-12-23 23:56:43 +03:00
primakov b3fd86da33 Merge pull request 'feat: add crud for Masters' (#52) from feature/crud-arm-master into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/52
2024-12-22 11:04:54 +03:00
237x237 276ef4033b feat: add crud for Masters 2024-12-21 21:33:07 +03:00
Primakov Alexandr Alexandrovich a520692bc5 log dir ignore 2024-12-21 14:17:55 +03:00
Primakov Alexandr Alexandrovich a327c9caeb ignore logs 2024-12-21 14:17:38 +03:00
Primakov Alexandr Alexandrovich 9a8fddee3b empty logs dir 2024-12-21 14:15:00 +03:00
primakov 149d668bea Merge pull request 'Обновил express до 5 версии + логгер' (#51) from update into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/51
2024-12-21 14:09:59 +03:00
Primakov Alexandr Alexandrovich 5d08c4c1c2 update version + logger
platform/multy-stub/pipeline/head This commit looks good
2024-12-21 00:05:12 +03:00
qosquo 2356259823 Merge pull request 'feat: add kfu-m-24-1 stubs folder; include eng-it-lean stubs api' (#50) from kfu-m-24-1/eng-it-lean into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/50
Reviewed-by: nekitboy1998 <nekitboy1998@gmail.com>
2024-12-20 11:28:27 +03:00
qosquo 872c921a53 feat: add kfu-m-24-1 stubs folder; include eng-it-lean stubs api 2024-12-19 19:51:07 +03:00
primakov 10b5207f9a Merge pull request 'feat: add fetch masters and add model' (#49) from feature/dry-wash-masters into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/49
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>
2024-12-15 20:02:41 +03:00
primakov 2ede62bcd8 Merge pull request 'added mock backend for sdk team' (#39) from sergepolin/multy-stub:sdk-team into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/39
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>
2024-12-15 19:59:22 +03:00
237x237 1788f90cde feat: add fetch masters and add model
platform/multy-stub/pipeline/head This commit looks good
2024-12-15 17:53:45 +03:00
dqriakh a37f7ea8a8 Merge pull request 'dhs-testing stubs' (#48) from dhs-testing into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/48
2024-12-14 10:36:37 +03:00
dqriakh 18b63bed21 dhs-testing stubs
platform/multy-stub/pipeline/head This commit looks good
2024-12-14 10:33:28 +03:00
pulemetik.ai 707c3be3ec Merge pull request 'feat: freetracker dashboard-performer stubs' (#46) from feat/freetracker into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/46
2024-12-13 22:07:47 +03:00
pulemetik.ai 3d52ef9d4c feat: freetracker dashboard-performer stubs
platform/multy-stub/pipeline/head This commit looks good
2024-12-13 22:05:42 +03:00
237x237 42944af2d3 Merge pull request 'feat: add dry wash json' (#44) from feature/dry-wash-arm into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/44
2024-12-08 11:52:50 +03:00
237x237 f0f6b78cd0 feat: add dry wash json 2024-12-08 11:50:39 +03:00
WlfromB 7c35f17008 fix require server.index.js 2024-12-07 09:55:00 +03:00
WlfromB 0208e29ae3 old edateam stubs 2024-12-07 09:49:53 +03:00
Primakov Alexandr Alexandrovich 4d5cd104ad Merge branch 'master' of ssh://85.143.175.152:222/bro-students/multy-stub 2024-12-01 21:55:32 +03:00
Primakov Alexandr Alexandrovich 6702473053 up mongo version 2024-12-01 21:47:55 +03:00
julyashap 52083097a2 Merge pull request 'dogsitter-finder' (#43) from dogsitter-finder into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/43
2024-11-30 16:06:15 +03:00
julyashap f7ac265e3b Replace users.json to users/ folder
platform/multy-stub/pipeline/head This commit looks good
2024-11-30 16:04:59 +03:00
julyashap d46841c21f Update paths to json files 2024-11-30 14:54:07 +03:00
primakov c95b015094 Merge pull request 'Update stubs DogsittersFinder' (#42) from dogsitter-finder into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/42
2024-11-30 14:40:32 +03:00
julyashap 940349af29 Update stubs DogsittersFinder 2024-11-30 12:16:27 +03:00
Kamila 268824c108 Added multy stub for project kazan-explore 2024-11-26 19:49:01 +03:00
Primakov Alexandr Alexandrovich 550554a7a5 docker compose by tag 2024-11-25 22:40:47 +03:00
Alisenok f5a8585845 Merge pull request 'Перемещена папка dogsitters-finder в routes. Добавлен путь в index.js' (#41) from dogsitters-finder-3 into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/41
2024-11-25 21:22:24 +03:00
Alisenok 1e67f25066 Перемещена папка dogsitters-finder в routes. Добавлен путь в index.js 2024-11-25 20:42:38 +03:00
sergepolin 359a136dbf added mock backend for sdk team 2024-10-19 01:32:36 +03:00
primakov bbc315e270 Merge pull request 'get count by modelname' (#38) from feature/check-jenkins into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/38
2024-10-16 11:57:57 +03:00
Primakov Alexandr Alexandrovich fbb5d26c8f get count by modelname
platform/multy-stub/pipeline/head This commit looks good
2024-10-16 11:55:42 +03:00
primakov 9d3edcf0dd Merge pull request 'check' (#37) from feature/check-jenkins into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/37
2024-10-16 11:38:09 +03:00
Primakov Alexandr Alexandrovich 57eb548d6c verbose 2024-10-16 11:37:47 +03:00
Primakov Alexandr Alexandrovich 34d2889c1d fix 2024-10-16 11:24:59 +03:00
Primakov Alexandr Alexandrovich afc782f50f check 2024-10-16 11:15:18 +03:00
Primakov Alexandr Alexandrovich ff6e688206 fix 2024-10-16 11:12:16 +03:00
Primakov Alexandr Alexandrovich 4b0d9b4dbc mongoose + tests 2024-10-16 11:06:23 +03:00
nekitboy1998 2cfcd7347b Merge pull request 'fix plantsRouter' (#35) from nekitboy1998-patch-1 into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/35
2024-10-15 14:43:38 +03:00
nekitboy1998 c1fe275532 fix plantsRouter 2024-10-15 14:43:06 +03:00
nekitboy1998 de46e9bf50 Merge pull request 'eecliptica' (#34) from eecliptica into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/34
2024-10-15 14:11:57 +03:00
bogap 76558a7eef remove imports 2024-10-15 14:08:47 +03:00
bogap 4bf3d662ec a 2024-10-15 13:38:49 +03:00
bogap 637939e9af corrected 2024-10-15 13:36:13 +03:00
bogap 02891fe301 corrected 2024-10-12 23:03:52 +03:00
nekitboy1998 6015bce32f Merge pull request 'Cats backend routes' (#30) from cats into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/30
2024-10-12 13:23:38 +03:00
mishablin 528b37246b Const file for token 2024-10-12 13:23:16 +03:00
mishablin 0c693e1bac Cats backend routes 2024-10-12 13:04:51 +03:00
nekitboy1998 c77aa76645 Merge pull request 'fixed a route for epja-2024-1' (#29) from enterfront into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/29
2024-10-12 12:08:41 +03:00
Nikolai Petukhov 8a0ea25029 fixed a route for epja-2024-1 2024-10-12 12:06:52 +03:00
nekitboy1998 6fb3f3f921 Merge pull request 'enterfront' (#28) from enterfront into master
Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/28
2024-10-12 11:33:43 +03:00
Nikolai Petukhov 89c9d7f901 fixed error code 2024-10-12 11:21:47 +03:00
Nikolai Petukhov b215e22f53 fixed const key, logs, deleted example 2024-10-12 11:17:21 +03:00
Nikolai Petukhov f13ae33cb4 added a route for epja-2024-1 2024-10-10 13:06:58 +03:00
Nikolai Petukhov 18a1095cf0 enterfront 2024-10-10 12:02:52 +03:00
Primakov Alexandr Alexandrovich 3e27c0110c docker compose up script fix 2024-08-23 16:38:07 +03:00
prdcsi c2ada9072f Merge pull request 'school-stage stubs' (#27) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/27
2024-06-03 23:26:56 +03:00
prdcsi 1bd1d2b279 school-stage stubs 2024-06-03 23:26:23 +03:00
prdcsi 7b1ce2ae83 Merge pull request 'school-stage stubs' (#26) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/26
2024-06-03 23:20:29 +03:00
prdcsi de22881c28 school-stage stubs 2024-06-03 23:19:56 +03:00
prdcsi 20d370f120 Merge pull request 'school-stage stubs' (#25) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/25
2024-06-03 19:02:09 +03:00
prdcsi 85986d1844 school-stage stubs 2024-06-03 19:00:44 +03:00
prdcsi dccf769477 Merge pull request 'school-stage stubs' (#24) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/24
2024-06-02 20:31:21 +03:00
prdcsi d088ef7af8 school-stage stubs 2024-06-02 20:30:51 +03:00
prdcsi fad8cdfe08 Merge pull request 'school-stage stubs' (#23) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/23
2024-06-02 20:26:27 +03:00
prdcsi a55e6d2ab2 school-stage stubs 2024-06-02 20:25:51 +03:00
prdcsi eb6da8aa1b Merge pull request 'school-stage stubs' (#22) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/22
2024-06-02 20:16:40 +03:00
prdcsi 19a55f57c0 school-stage stubs 2024-06-02 20:15:01 +03:00
guzel b649e86a43 Merge pull request 'stubs-kazan-explore' (#21) from stubs-kazan-explore into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/21
2024-06-02 15:28:00 +03:00
guzelkha c53f016eec Merge branch 'stubs-kazan-explore' of ssh://85.143.175.152:222/bro-students/multy-stub into stubs-kazan-explore 2024-06-02 15:23:45 +03:00
guzelkha 0a7cbc3434 stubs-kazan-explore change 2024-06-02 15:23:16 +03:00
Liliya Vasilova 279650db25 change stubs kazan-explore 2024-06-02 15:15:34 +03:00
Kamila 2d45b4af72 Change trip schedule stub 2024-06-02 14:15:35 +03:00
Kamila bd4de9d7ba Merge pull request 'Add trip schedule stubs kazan-explore' (#20) from stubs-kazan-explore into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/20
2024-06-02 13:20:37 +03:00
Kamila 10dbe5c147 Add trip schedule stubs kazan-explore 2024-06-02 13:18:35 +03:00
Kamila 435f17ee22 Merge pull request 'Add stubs kazan-explore' (#19) from stubs-kazan-explore into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/19
2024-06-01 20:40:27 +03:00
Kamila 677dc3dc29 Add stubs kazan-explore 2024-06-01 20:37:32 +03:00
Kamila 88e3fe4172 Merge pull request 'Add stubs kazan-explore' (#18) from stubs-kazan-explore into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/18
2024-06-01 20:34:05 +03:00
Kamila 21dcc8bbec Add stubs kazan-explore 2024-06-01 20:32:45 +03:00
Kamila 4778dba7ed Merge pull request 'stubs-kazan-explore' (#17) from stubs-kazan-explore into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/17
2024-06-01 20:25:16 +03:00
Kamila 07a02ade1f Add stubs kazan-explore 2024-06-01 20:22:43 +03:00
Kamila 311846f92d Add stubs kazan-explore 2024-06-01 19:53:28 +03:00
dqriakh ebd561098f Merge pull request 'small changes' (#16) from dhs-testing into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/16
2024-06-01 14:14:00 +03:00
dqriakh b4372eb53a small changes 2024-06-01 14:12:54 +03:00
prdcsi bdb6b4ca3e Merge pull request 'schoo;-stage stubs' (#15) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/15
2024-06-01 09:54:28 +03:00
prdcsi 426cb70eb6 schoo;-stage stubs 2024-06-01 09:53:26 +03:00
prdcsi 61441e21b8 Merge pull request 'school-stage stubs' (#14) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/14
2024-06-01 09:51:42 +03:00
prdcsi a6f61ba033 school-stage stubs 2024-06-01 09:51:14 +03:00
prdcsi 8588a7fa38 Merge pull request 'school-stage stubs' (#13) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/13
2024-06-01 00:40:16 +03:00
prdcsi c35185ea32 school-stage stubs 2024-06-01 00:39:43 +03:00
prdcsi 78a332732d Merge pull request 'api' (#12) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/12
2024-06-01 00:01:29 +03:00
prdcsi 5f54355b97 api 2024-06-01 00:00:00 +03:00
prdcsi 4efbb56905 Merge pull request 'school-stage stubs' (#10) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/10
2024-05-31 23:56:37 +03:00
dqriakh 50c6286190 Merge pull request 'edit tests data' (#11) from dhs-testing into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/11
2024-05-31 23:32:50 +03:00
dqriakh de29da93ba edit tests data 2024-05-31 23:31:21 +03:00
prdcsi 7cdd7e790f school-stage stubs 2024-05-31 22:04:23 +03:00
prdcsi 569b1b0d9e Merge pull request 'school-stage stubs' (#9) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/9
2024-05-31 18:03:52 +03:00
prdcsi 272961c583 school-stage stubs 2024-05-31 18:01:50 +03:00
prdcsi 63284d6c08 Merge pull request 'school-stage-branch' (#8) from school-stage-branch into master
Reviewed-on: https://git.inno-js.ru/bro-students/multy-stub/pulls/8
2024-05-31 16:49:59 +03:00
1448 changed files with 33264 additions and 2364 deletions

No files matched your search

File renamed without changes.
File renamed without changes.
@@ -1,7 +1,7 @@
const ObjectId = require('mongodb').ObjectID const ObjectId = require('mongodb').ObjectID
const getHash = require('pbkdf2-password')() const getHash = require('pbkdf2-password')()
const { getDB } = require('../../utils/mongo') const { getDB } = require('../../../utils/mongo')
const USERS_COLLECTION = 'users' const USERS_COLLECTION = 'users'
const LISTS_COLLECTION = 'lists' const LISTS_COLLECTION = 'lists'
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.
@@ -1,4 +1,4 @@
const { getDB } = require('../../utils/mongo') const { getDB } = require('../../../utils/mongo')
let db = null let db = null
File renamed without changes.
@@ -1,6 +1,6 @@
const router = require('express').Router(); const router = require('express').Router();
const { getResponse } = require('../../../utils/common'); const { getResponse } = require('../../../../utils/common');
const { const {
getTags, getTags,
connect, connect,
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,7 +1,7 @@
const { v4: uuid } = require('uuid') const { v4: uuid } = require('uuid')
const ObjectId = require('mongodb').ObjectID const ObjectId = require('mongodb').ObjectID
const { getDB } = require('../../utils/mongo') const { getDB } = require('../../../utils/mongo')
const { _idToId, checkDB, _idToIdArray, filterId } = require('./utils') const { _idToId, checkDB, _idToIdArray, filterId } = require('./utils')
let db = null let db = null
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,6 +1,6 @@
const ObjectId = require('mongodb').ObjectId; const ObjectId = require('mongodb').ObjectId;
const getHash = require('pbkdf2-password')(); const getHash = require('pbkdf2-password')();
const { getDB } = require('../../utils/mongo'); const { getDB } = require('../../../utils/mongo');
const USERS_COLLECTION = 'users'; const USERS_COLLECTION = 'users';
const RECIPES_COLLECTION = 'recipes_collection'; const RECIPES_COLLECTION = 'recipes_collection';
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loaded 100 of 1448 files, more files were not shown because too many files have changed in this diff. Show more