Commit Graph

49 Commits

Author SHA1 Message Date
nik.polishuk 5c742411d5 Merge branch 'main' into tracker-connect-back
# Conflicts:
#	src/assets/images/accept.png
#	src/assets/images/mainTaskCommentImg.png
#	src/components/Modal/TrackerModal/TrackerModal.jsx
#	src/components/UI/ModalTicket/ModalTicket.jsx
#	src/components/UI/TicketFullScreen/TicketFullScreen.jsx
#	src/pages/ProjectTracker/ProjectTracker.js
#	src/redux/projectsTrackerSlice.js
2023-06-12 22:22:51 +03:00
nik.polishuk f4b55a5d79 fix task modal and column priority 2023-06-09 03:19:09 +03:00
MaxOvs19 9e242ddf5d Added eslint 2023-05-31 11:24:46 +03:00
MaxOvs19 fc8fc33733 Added prettier format imports 2023-05-31 08:36:15 +03:00
NikoM1k 5af1562917 Merge pull request #91 from apuc/tracker-connect-back
Tracker connect back
2023-05-23 23:03:03 +03:00
nik.polishuk c55376ecb3 tracker 2023-05-23 23:02:39 +03:00
MaxOvs19 973f140451 Pull from main page 2023-05-18 18:40:40 +03:00
MaxOvs19 23ec3bbdad Update from main branch 2023-05-16 10:24:07 +03:00
nik.polishuk 56ef7061fa tasks edit 2023-05-16 00:24:52 +03:00
nik.polishuk 906dd0ec90 fix 2023-05-15 21:23:42 +03:00
MaxOvs19 fb0ce999f6 Working in calendar 2023-05-11 19:54:15 +03:00
MaxOvs19 83f0c67017 added store modal tracker 2023-05-10 12:23:35 +03:00
nik.polishuk 46a8373d00 editProjectName 2023-05-08 00:41:39 +03:00
nik.polishuk d8a7eb55f5 tracker-connect 2023-05-05 00:50:48 +03:00
MaxOvs19 553ac3e75d Fixed state modal 2023-05-03 16:47:20 +03:00
nik.polishuk d0506441b8 tracker-connect 2023-05-02 18:51:19 +03:00
nik.polishuk 9152aa1adc tracker-connect 2023-04-28 18:29:13 +03:00
Z1chi 879a42f3b4 Удаление таски с колонки 2023-04-28 16:15:46 +03:00
nik.polishuk eeca39671a tracker-connect 2023-04-28 14:56:59 +03:00
nik.polishuk dd03bcb47c edit request 2023-04-21 01:07:09 +03:00
nik.polishuk 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
dmitri.kravcov f2d7730214 quiz + lk-candidate 2023-04-19 20:22:06 +03:00
nik.polishuk 5067746178 partnerRequests 2023-04-18 13:58:36 +03:00
nik.polishuk fd372b47ae Merge remote-tracking branch 'origin/parthners-area-fix-modal' into parthners-area
# Conflicts:
#	src/pages/PartnerSettings/PartnerSettings.js
2023-03-23 16:47:15 +03:00
nik.polishuk 6419b9dd97 fixes 2023-03-23 16:43:37 +03:00
nik.polishuk 850b0d1bb6 partner employees 2023-03-23 14:00:34 +03:00
MaxOvs19 4d8f7e6c65 Added new reducer for tracker 2023-03-22 21:48:06 +03:00
nik.polishuk a2e768e5c0 change calendar month 2023-02-09 20:46:02 +03:00
Z1chi c60e1b43d2 Удалил старые запросы к апи, переписал страницу тестов на новый конструктор запроса. Обновил библиотеки, в том числе реакт до последней версии, переписал устаревший код с библиотек. 2023-02-02 18:10:44 +03:00
Z1chi 1d8b30370d Переписываю спорные решения 2023-01-16 19:12:44 +03:00
Z1chi 1234427b12 Убираю варнинги при сборке, прохожусь притером, сокращаю код 2023-01-10 18:48:02 +03:00
nik.polishuk d81110d7d5 change profile 2022-12-26 15:12:01 +03:00
dmitri.kravcov d220a39665 quiz 2022-05-27 20:08:40 +03:00
dmitri.kravcov f2962a7317 Merge branch 'documents' 2022-05-27 19:13:06 +03:00
dmitri.kravcov f7367dbdf2 quiz page 2022-03-18 16:39:13 +03:00
m1kolay 9f1179db39 add documents 2022-02-11 15:34:31 +02:00
kurpfish d4ec833a31 calendar routes 2021-12-07 09:58:19 +02:00
kurpfish 7891dccb59 logout fixes with role redirect 2021-08-20 17:33:29 +03:00
kurpfish 1f7af46032 filter fixes 2021-08-17 12:38:12 +03:00
kurpfish 596c54b002 sort fixes 2021-08-09 18:40:06 +03:00
kurpfish f0a92fd8f2 logout, hover transition and small fixes 2021-08-09 15:10:12 +03:00
kurpfish e4ec5fd091 added server auth and protected routes 2021-08-04 13:04:05 +03:00
Hope87 f2e769a71a fixed code 2021-07-09 14:01:11 +03:00
Hope87 55d1a63c94 revision form page 2021-07-09 11:29:02 +03:00
Hope87 e8b7fbb2f3 fixed code 2021-07-05 12:33:24 +03:00
Hope87 082ae23f49 add form page 2021-07-03 17:37:30 +03:00
Hope87 c44c1fe27c fixed code 2021-07-02 16:02:47 +03:00
Hope87 edd01168a5 fixed js code 2021-07-01 14:25:17 +03:00
Hope87 e90414b6b9 add redux 2021-06-30 17:21:55 +03:00