Merge branch 'master' into kfu-m-24-1/eng-it-lean

Merge pull request 'edit data events' (#74 ) from sberhubproject into master
Reviewed-on: #74
2025-01-31 15:54:22 +03:00 · 2025-01-31 15:05:41 +03:00 · 2025-01-31 15:02:49 +03:00 · 2025-01-31 14:44:35 +03:00 · 2025-01-31 14:42:36 +03:00 · 2025-01-31 13:43:18 +03:00
1343 changed files with 8672 additions and 1252 deletions
--- a/server/routers/old/basket/auth.js
+++ b/server/routers/old/basket/auth.js
--- a/server/routers/old/basket/categories.js
+++ b/server/routers/old/basket/categories.js
--- a/server/routers/old/basket/controller.js
+++ b/server/routers/old/basket/controller.js
--- a/server/routers/old/basket/dashboard.js
+++ b/server/routers/old/basket/dashboard.js
--- a/server/routers/old/basket/index.js
+++ b/server/routers/old/basket/index.js
--- a/server/routers/old/basket/json/auth/sign-in.json
+++ b/server/routers/old/basket/json/auth/sign-in.json
--- a/server/routers/old/basket/json/categories/add/success.json
+++ b/server/routers/old/basket/json/categories/add/success.json
--- a/server/routers/old/basket/json/categories/current/success.json
+++ b/server/routers/old/basket/json/categories/current/success.json
--- a/server/routers/old/basket/json/dashboard/common/error.json
+++ b/server/routers/old/basket/json/dashboard/common/error.json
--- a/server/routers/old/basket/json/dashboard/common/success.json
+++ b/server/routers/old/basket/json/dashboard/common/success.json
--- a/server/routers/old/basket/json/dashboard/list/empty.json
+++ b/server/routers/old/basket/json/dashboard/list/empty.json
--- a/server/routers/old/basket/json/dashboard/list/error.json
+++ b/server/routers/old/basket/json/dashboard/list/error.json
--- a/server/routers/old/basket/json/dashboard/list/success.json
+++ b/server/routers/old/basket/json/dashboard/list/success.json
--- a/server/routers/old/basket/json/landing/error.json
+++ b/server/routers/old/basket/json/landing/error.json
--- a/server/routers/old/basket/json/landing/success.json
+++ b/server/routers/old/basket/json/landing/success.json
--- a/server/routers/old/basket/json/listItem/item/error.json
+++ b/server/routers/old/basket/json/listItem/item/error.json
--- a/server/routers/old/basket/json/listItem/item/success.json
+++ b/server/routers/old/basket/json/listItem/item/success.json
--- a/server/routers/old/basket/json/listItem/shoppingList/error.json
+++ b/server/routers/old/basket/json/listItem/shoppingList/error.json
--- a/server/routers/old/basket/json/listItem/shoppingList/success.json
+++ b/server/routers/old/basket/json/listItem/shoppingList/success.json
--- a/server/routers/old/basket/key.js
+++ b/server/routers/old/basket/key.js
--- a/server/routers/old/basket/landing.js
+++ b/server/routers/old/basket/landing.js
--- a/server/routers/old/basket/listItem.js
+++ b/server/routers/old/basket/listItem.js
--- a/server/routers/old/bushou/episodes/success.json
+++ b/server/routers/old/bushou/episodes/success.json
--- a/.bzr/legacy/bushou/images.tar
+++ b/.bzr/legacy/bushou/images.tar
--- a/server/routers/old/bushou/index.js
+++ b/server/routers/old/bushou/index.js
--- a/server/routers/old/bushou/radicals/success.json
+++ b/server/routers/old/bushou/radicals/success.json
--- a/server/routers/old/bushou/tokenize/success.json
+++ b/server/routers/old/bushou/tokenize/success.json
--- a/server/routers/old/car-wash/auth/index.js
+++ b/server/routers/old/car-wash/auth/index.js
--- a/server/routers/old/car-wash/auth/login/error.json
+++ b/server/routers/old/car-wash/auth/login/error.json
--- a/server/routers/old/car-wash/auth/login/index.js
+++ b/server/routers/old/car-wash/auth/login/index.js
--- a/server/routers/old/car-wash/auth/login/success.json
+++ b/server/routers/old/car-wash/auth/login/success.json
--- a/server/routers/old/car-wash/auth/logrec/error.json
+++ b/server/routers/old/car-wash/auth/logrec/error.json
--- a/server/routers/old/car-wash/auth/logrec/index.js
+++ b/server/routers/old/car-wash/auth/logrec/index.js
--- a/server/routers/old/car-wash/auth/logrec/success.json
+++ b/server/routers/old/car-wash/auth/logrec/success.json
--- a/server/routers/old/car-wash/auth/passrec/error.json
+++ b/server/routers/old/car-wash/auth/passrec/error.json
--- a/server/routers/old/car-wash/auth/passrec/index.js
+++ b/server/routers/old/car-wash/auth/passrec/index.js
--- a/server/routers/old/car-wash/auth/passrec/success.json
+++ b/server/routers/old/car-wash/auth/passrec/success.json
--- a/server/routers/old/car-wash/auth/registration/dooble.json
+++ b/server/routers/old/car-wash/auth/registration/dooble.json
--- a/server/routers/old/car-wash/auth/registration/dooblephone.json
+++ b/server/routers/old/car-wash/auth/registration/dooblephone.json
--- a/server/routers/old/car-wash/auth/registration/error.json
+++ b/server/routers/old/car-wash/auth/registration/error.json
--- a/server/routers/old/car-wash/auth/registration/index.js
+++ b/server/routers/old/car-wash/auth/registration/index.js
--- a/server/routers/old/car-wash/auth/registration/success.json
+++ b/server/routers/old/car-wash/auth/registration/success.json
--- a/server/routers/old/car-wash/carousel/carousel-en.json
+++ b/server/routers/old/car-wash/carousel/carousel-en.json
--- a/server/routers/old/car-wash/carousel/carousel-ru.json
+++ b/server/routers/old/car-wash/carousel/carousel-ru.json
--- a/server/routers/old/car-wash/carousel/index.js
+++ b/server/routers/old/car-wash/carousel/index.js
--- a/server/routers/old/car-wash/index.js
+++ b/server/routers/old/car-wash/index.js
--- a/server/routers/old/car-wash/map/index.js
+++ b/server/routers/old/car-wash/map/index.js
--- a/server/routers/old/car-wash/map/map-info-en.json
+++ b/server/routers/old/car-wash/map/map-info-en.json
--- a/server/routers/old/car-wash/map/map-info-ru.json
+++ b/server/routers/old/car-wash/map/map-info-ru.json
--- a/server/routers/old/car-wash/prices/index.js
+++ b/server/routers/old/car-wash/prices/index.js
--- a/server/routers/old/car-wash/prices/prices-en.json
+++ b/server/routers/old/car-wash/prices/prices-en.json
--- a/server/routers/old/car-wash/prices/prices-ru.json
+++ b/server/routers/old/car-wash/prices/prices-ru.json
--- a/server/routers/old/coder/catalog/cardData.json
+++ b/server/routers/old/coder/catalog/cardData.json
--- a/server/routers/old/coder/catalog/error.json
+++ b/server/routers/old/coder/catalog/error.json
--- a/server/routers/old/coder/catalog/index.js
+++ b/server/routers/old/coder/catalog/index.js
--- a/server/routers/old/coder/controllers.js
+++ b/server/routers/old/coder/controllers.js
--- a/server/routers/old/coder/forum/categories.json
+++ b/server/routers/old/coder/forum/categories.json
--- a/server/routers/old/coder/forum/error.json
+++ b/server/routers/old/coder/forum/error.json
--- a/server/routers/old/coder/forum/index.js
+++ b/server/routers/old/coder/forum/index.js
--- a/server/routers/old/coder/forum/topic-comments.json
+++ b/server/routers/old/coder/forum/topic-comments.json
--- a/server/routers/old/coder/forum/topic-list.json
+++ b/server/routers/old/coder/forum/topic-list.json
--- a/server/routers/old/coder/forum/topic-tags.json
+++ b/server/routers/old/coder/forum/topic-tags.json
--- a/server/routers/old/coder/forum/topic.json
+++ b/server/routers/old/coder/forum/topic.json
--- a/server/routers/old/coder/forum/users.json
+++ b/server/routers/old/coder/forum/users.json
--- a/server/routers/old/coder/index.js
+++ b/server/routers/old/coder/index.js
--- a/server/routers/old/coder/topic/dynamic-programming.json
+++ b/server/routers/old/coder/topic/dynamic-programming.json
--- a/server/routers/old/coder/topic/dynamic-programming/arrays-and-strings.json
+++ b/server/routers/old/coder/topic/dynamic-programming/arrays-and-strings.json
--- a/server/routers/old/coder/topic/dynamic-programming/dynamic-programming.json
+++ b/server/routers/old/coder/topic/dynamic-programming/dynamic-programming.json
--- a/server/routers/old/coder/topic/dynamic-programming/linked-list.json
+++ b/server/routers/old/coder/topic/dynamic-programming/linked-list.json
--- a/server/routers/old/coder/topic/dynamic-programming/overview.json
+++ b/server/routers/old/coder/topic/dynamic-programming/overview.json
--- a/server/routers/old/coder/topic/error.json
+++ b/server/routers/old/coder/topic/error.json
--- a/server/routers/old/coder/topic/index.js
+++ b/server/routers/old/coder/topic/index.js
--- a/server/routers/old/easy-project/auth.js
+++ b/server/routers/old/easy-project/auth.js
--- a/server/routers/old/easy-project/constants.js
+++ b/server/routers/old/easy-project/constants.js
--- a/server/routers/old/easy-project/db.js
+++ b/server/routers/old/easy-project/db.js
--- a/server/routers/old/easy-project/index.js
+++ b/server/routers/old/easy-project/index.js
--- a/server/routers/old/easy-project/middlewares/auth-middleware.js
+++ b/server/routers/old/easy-project/middlewares/auth-middleware.js
--- a/server/routers/old/easy-project/projects.js
+++ b/server/routers/old/easy-project/projects.js
--- a/server/routers/old/easy-project/tasks.js
+++ b/server/routers/old/easy-project/tasks.js
--- a/server/routers/old/easy-project/users.js
+++ b/server/routers/old/easy-project/users.js
--- a/server/routers/old/easy-project/utils.js
+++ b/server/routers/old/easy-project/utils.js
--- a/server/routers/old/edateam/auth.js
+++ b/server/routers/old/edateam/auth.js
--- a/server/routers/old/edateam/controllers.js
+++ b/server/routers/old/edateam/controllers.js
--- a/server/routers/old/edateam/index.js
+++ b/server/routers/old/edateam/index.js
--- a/server/routers/old/edateam/json/homepage-data/success.json
+++ b/server/routers/old/edateam/json/homepage-data/success.json
--- a/server/routers/old/edateam/json/recipe-data/success.json
+++ b/server/routers/old/edateam/json/recipe-data/success.json
--- a/server/routers/old/edateam/json/userpage-data/success.json
+++ b/server/routers/old/edateam/json/userpage-data/success.json
--- a/server/routers/old/edateam/key.js
+++ b/server/routers/old/edateam/key.js
--- a/server/routers/old/edateam/main.js
+++ b/server/routers/old/edateam/main.js
--- a/server/routers/old/edateam/user.js
+++ b/server/routers/old/edateam/user.js
--- a/server/routers/old/epja-2023-2/example/index.js
+++ b/server/routers/old/epja-2023-2/example/index.js
--- a/server/routers/old/epja-2023-2/example/news.json
+++ b/server/routers/old/epja-2023-2/example/news.json
--- a/server/routers/old/epja-2023-2/index.js
+++ b/server/routers/old/epja-2023-2/index.js
--- a/server/routers/old/epja-2023-2/pen-plotter/index.js
+++ b/server/routers/old/epja-2023-2/pen-plotter/index.js
--- a/server/routers/old/epja-2023-2/pen-plotter/paths.js
+++ b/server/routers/old/epja-2023-2/pen-plotter/paths.js
--- a/server/routers/old/epja-2023-2/pen-plotter/profiles/Andrei
+++ b/server/routers/old/epja-2023-2/pen-plotter/profiles/Andrei
--- a/server/routers/old/epja-2023-2/pen-plotter/profiles/Andrei
+++ b/server/routers/old/epja-2023-2/pen-plotter/profiles/Andrei
--- a/server/routers/old/epja-2023-2/pen-plotter/profiles/Andrei
+++ b/server/routers/old/epja-2023-2/pen-plotter/profiles/Andrei
--- a/server/routers/old/epja-2023-2/pen-plotter/profiles/Andrei
+++ b/server/routers/old/epja-2023-2/pen-plotter/profiles/Andrei
--- a/server/routers/old/epja-2023-2/pen-plotter/profiles/Andrei
+++ b/server/routers/old/epja-2023-2/pen-plotter/profiles/Andrei
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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: #74	2025-01-31 15:05:41 +03:00
admin	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: #73	2025-01-31 14:44:35 +03:00
admin	7358faef1d	delete function delay	2025-01-31 14:42:36 +03:00
nekitboy1998	c000106ec8	Merge pull request '[feat] add chgk api' (#71 ) from sber_web into master Reviewed-on: #71	2025-01-31 13:43:18 +03:00
Max	da84344a63	[feat] add chgk api	2025-01-31 13:35:11 +03:00
Sergey_Moryakov	ff15a48414	Merge pull request '[feat][refactor] add events and edit users' (#70 ) from sberhubproject into master Reviewed-on: #70	2025-01-29 21:25:59 +03:00
admin	367c0de6fb	[feat][refactor] add events and edit users	2025-01-29 15:50:53 +03:00
Primakov Alexandr Alexandrovich	3c89d8b9a8	Merge pull request 'feat: add get master with orders' (#68 ) from feat/get-master into master Reviewed-on: #68	2025-01-26 11:02:24 +03:00
ilnaz	bdc8d9a8e0	feat: add get master with orders Some checks failed platform/multy-stub/pipeline/head There was a failure building this commit Details	2025-01-26 00:41:48 +03:00
Kamila Nazirova	8814c2a64b	Merge pull request 'kazan-explore multy stub changes' (#67 ) from kazan-explore into master Reviewed-on: #67	2025-01-24 23:02:53 +03:00
Kamila Nazirova	298a82e0ae	kazan-explore multy stub changes	2025-01-24 23:02:25 +03:00
Kamila Nazirova	a86eb0d4ef	Merge pull request 'kazan-explore multy stub changes' (#66 ) from kazan-explore into master Reviewed-on: #66	2025-01-24 22:42:50 +03:00
Kamila Nazirova	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: #65	2025-01-24 16:54:00 +03:00
DmitrySR	4b77958a92	esc stubs fix2 Some checks failed platform/multy-stub/pipeline/head There was a failure building this commit Details	2025-01-24 16:52:46 +03:00
rossetero	b36ee36e3a	Merge pull request 'esc stubs fix?' (#64 ) from esc-stubs into master Reviewed-on: #64	2025-01-24 16:44:45 +03:00
DmitrySR	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: #63	2025-01-24 16:31:13 +03:00
DmitrySR	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
ilnaz	e0618e431f	feat: add get date orders	2025-01-19 11:29:11 +03:00
ilnaz	1b93a8e2bb	fix: change get for orders v2	2025-01-19 10:23:48 +03:00
Primakov Alexandr Alexandrovich	b8dc15cbc6	Merge pull request 'feat: use stubs for orders data (#64 )' (#62 ) from feature/dry-wash-orders into master Reviewed-on: #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 87c1cbb19e90fb526930552cdd81b61d07b97800.	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
Andrey Ivlev	c86f84d037	merge: feature(freetracker): landing requests	2025-01-18 20:36:14 +03:00
Andrey Ivlev	b8bc2c83a3	Merge branch 'feature/freetracker-landing'	2025-01-18 20:32:00 +03:00
Andrey Ivlev	552457b5cb	feature(freetracker): landing requests All checks were successful platform/multy-stub/pipeline/head This commit looks good Details	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 Alexandr Alexandrovich	b9edd0091c	Merge pull request 'delete masters _id' (#60 ) from feature/arm-master-id into master Reviewed-on: #60	2025-01-13 17:26:46 +03:00
RustamRu	558245f876	delete masters _id Some checks failed platform/multy-stub/pipeline/head There was a failure building this commit Details	2025-01-12 11:12:24 +03:00
Primakov Alexandr Alexandrovich	a927727c1b	Merge pull request 'fix: change get for orders' (#59 ) from fix/orders-get into master Reviewed-on: #59	2025-01-12 10:43:08 +03:00
ilnaz	a9d9aa02da	fix: change get for orders Some checks failed platform/multy-stub/pipeline/head There was a failure building this commit Details	2025-01-12 10:40:50 +03:00
Kamila Nazirova	e7451aea5b	Merge pull request 'added stubs for kazan-explore sport quiz' (#58 ) from kazan-explore into master Reviewed-on: #58	2025-01-11 20:27:32 +03:00
Kamila Nazirova	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: #57	2024-12-31 10:12:39 +03:00
innoavvlasov	e73f7e2dc9	add auth in freetracker Some checks failed platform/multy-stub/pipeline/head There was a failure building this commit Details	2024-12-31 10:11:17 +03:00
admin	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: #56	2024-12-28 10:24:59 +03:00
Kamila Nazirova	2d1a4ba8db	Merge pull request 'fixing stub paths' (#55 ) from kazan-explore into master Reviewed-on: #55	2024-12-27 23:01:16 +03:00
Kamila Nazirova	9ed6808838	fixing stub paths	2024-12-27 22:55:08 +03:00
Kamila Nazirova	8bd3ccfce7	Merge pull request 'kazan-explore stubs changed, added translation' (#54 ) from kazan-explore into master Reviewed-on: #54	2024-12-27 22:41:23 +03:00
Kamila Nazirova	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: #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
Alice	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 Alexandr Alexandrovich	b3fd86da33	Merge pull request 'feat: add crud for Masters' (#52 ) from feature/crud-arm-master into master Reviewed-on: #52	2024-12-22 11:04:54 +03:00
ilnaz	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 Alexandr Alexandrovich	149d668bea	Merge pull request 'Обновил express до 5 версии + логгер' (#51 ) from update into master Reviewed-on: #51	2024-12-21 14:09:59 +03:00
Primakov Alexandr Alexandrovich	5d08c4c1c2	update version + logger All checks were successful platform/multy-stub/pipeline/head This commit looks good Details	2024-12-21 00:05:12 +03:00
Ruslan Zagitov	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: #50 Reviewed-by: nekitboy1998 <nekitboy1998@gmail.com>	2024-12-20 11:28:27 +03:00