Commit Graph

87 Commits

Author SHA1 Message Date
Mikola
d8e34980f2 registration setting 2024-01-11 17:43:09 +03:00
Mikola
6e2a14d58e quiz 2023-12-12 11:22:53 +03:00
Mikola
178fd4362a Merge branch 'main' into quiz 2023-12-10 03:17:41 +03:00
Victor Batischev
d4eba820e0 remove auth for dev 2023-12-04 18:36:02 +03:00
MaxOvs19
8338414b1b Fixed Routes 2023-11-29 22:18:25 +03:00
MaxOvs19
f78e394834 fixed page auth 2023-11-28 22:03:56 +03:00
ec7d0716b3 quiz 2023-11-21 17:31:22 +03:00
MaxOvs19
6b6432330b Added new page statistics 2023-10-02 21:26:06 +03:00
9028339c30 company page 2023-08-11 20:38:12 +03:00
e0b289c3fd reset and confirm modals 2023-07-18 16:20:40 +03:00
001920a840 modal accept with notifications 2023-07-14 03:03:33 +03:00
49729ddd6b Tracker Auth 2023-07-07 01:20:57 +03:00
ad7874b500 trackerIntro 2023-07-04 22:26:00 +03:00
MaxOvs19
5865c59ba3 Moving components and creating jsconfig 2023-05-29 15:01:38 +03:00
MaxOvs19
3b605280b2 Moving components out of a folder UI 2023-05-29 09:37:18 +03:00
MaxOvs19
81129538ed Moving fonts 2023-05-25 17:26:51 +03:00
MaxOvs19
38f776019c Moving all images to assets 2023-05-25 16:42:37 +03:00
MaxOvs19
0b734c1a34 Fixed conflicts 2023-05-23 17:15:12 +03:00
MaxOvs19
fb0ce999f6 Working in calendar 2023-05-11 19:54:15 +03:00
MaxOvs19
43acfe2b79 Fixed conflict 2023-05-02 20:29:10 +03:00
d0506441b8 tracker-connect 2023-05-02 18:51:19 +03:00
MaxOvs19
a3570668f1 Added Article pages and fixed SideBar 2023-04-28 18:07:34 +03:00
c1f1cf8879 frequently-asked-questions page 2023-04-27 21:15:55 +03:00
MaxOvs19
36bba6c5a1 Create new page Blog 2023-04-27 15:13:14 +03:00
MaxOvs19
0c079c2ea2 Fixed sideBar 2023-04-27 13:37:41 +03:00
6c79e61e9d Merge remote-tracking branch 'origin/update-modal-app' into candidate-area
# Conflicts:
#	src/App.js
2023-04-25 16:12:28 +03:00
dd03bcb47c edit request 2023-04-21 01:07:09 +03:00
MaxOvs19
cb79f3c063 Added fullScreen ticket 2023-04-20 20:10:08 +03:00
f4ada281da Merge remote-tracking branch 'origin/lk_candidate' into candidate-area
# Conflicts:
#	src/App.js
#	src/components/Footer/footer.scss
#	src/components/ProfileHeader/ProfileHeader.js
#	src/pages/AuthForCandidate/authForCandidate.scss
2023-04-19 20:37:40 +03:00
f2d7730214 quiz + lk-candidate 2023-04-19 20:22:06 +03:00
b99d7a4cdd Merge remote-tracking branch 'origin/parthners-area-fix-tracker-modal' into candidate-area
# Conflicts:
#	src/App.js
#	src/pages/Tracker/Tracker.js
2023-04-10 18:20:55 +03:00
MaxOvs19
943bc1abea Added page in free worker 2023-04-07 21:49:09 +03:00
4e61ea043d candidate auth 2023-04-04 19:07:19 +03:00
5f4dc3a5f2 partner catalog and no requests block 2023-03-27 16:03:24 +03:00
850b0d1bb6 partner employees 2023-03-23 14:00:34 +03:00
eb30ede5c0 fix 2023-03-20 14:38:52 +03:00
653af43f52 partner treaties 2023-03-20 14:00:10 +03:00
MaxOvs19
44af2ee09d Added page settings 2023-03-16 21:41:01 +03:00
7498f89940 partner-area 2023-03-16 15:10:53 +03:00
31cc5acbe1 partner-personal-area 2023-02-27 16:50:32 +03:00
15ed4b8c1d partner bid page 2023-02-23 14:57:26 +03:00
e26b8cc22e personal area partner with fixes report 2023-02-21 19:05:04 +03:00
6b5eeb2942 fixes 2023-02-17 15:19:49 +03:00
80316d3ba8 Merge branch 'main' into webpack-5
# Conflicts:
#	src/components/ProfileCalendar/ProfileCalendar.js
#	src/hooks/useRequest.js
2023-01-25 16:52:34 +03:00
107a00b915 view ReportPage 2023-01-23 14:59:57 +03:00
642a8a9641 фиксы 2023-01-18 17:37:52 +03:00
6b0b5e991c Переписываю спорные решения
Фикс отправки отчета, проверка на массив в map в Description.js
2023-01-17 22:14:05 +03:00
907f3e830d Переписываю спорные решения 2023-01-16 20:42:27 +03:00
794a5fa44e Merge branch 'profileCalendar' into profilePage
# Conflicts:
#	src/App.js
#	src/components/ProfileCalendar/ProfileCalendar.js
#	src/components/ReportForm/ReportForm.js
#	src/pages/Profile.js
2023-01-16 19:20:49 +03:00
1d8b30370d Переписываю спорные решения 2023-01-16 19:12:44 +03:00