|
|
af8704eafe
|
Merge branch 'main' into tracker-connect-back
|
2023-06-26 12:57:33 +03:00 |
|
|
|
dc123e1fc7
|
Merge branch 'main' into tracker-connect-back
# Conflicts:
# src/components/Modal/TrackerModal/trackerModal.scss
# src/components/UI/ModalTicket/ModalTicket.jsx
|
2023-06-26 12:42:32 +03:00 |
|
MaxOvs19
|
256159dd0c
|
Fixed modals conflict
|
2023-06-26 12:10:49 +03:00 |
|
MaxOvs19
|
fc0226ad25
|
Pull of main
|
2023-06-26 11:05:30 +03:00 |
|
MaxOvs19
|
66ec2daea1
|
Fixed eslint
|
2023-06-26 10:56:39 +03:00 |
|
MaxOvs19
|
f95812ac35
|
Fixed styles modalTracker
|
2023-06-23 15:18:19 +03:00 |
|
MaxOvs19
|
bca8199a6a
|
Fixed modalTicket
|
2023-06-23 14:46:08 +03:00 |
|
MaxOvs19
|
fbf64f2b39
|
Fixed styles in tracker
|
2023-06-23 10:55:22 +03:00 |
|
|
|
fc6feca92d
|
correctProjectUsers
|
2023-06-22 19:43:12 +03:00 |
|
MaxOvs19
|
055225d747
|
Fixed buttons in tracker page
|
2023-06-22 19:18:41 +03:00 |
|
MaxOvs19
|
5ab7e65905
|
prettier fixed
|
2023-06-22 14:56:31 +03:00 |
|
MaxOvs19
|
9bc60434cc
|
Fixed modals btn
|
2023-06-22 14:53:35 +03:00 |
|
|
|
9b99da9261
|
fix
|
2023-06-12 23:30:18 +03:00 |
|
|
|
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 |
|
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 |
|
MaxOvs19
|
09babcb096
|
Fixed imports in pages
|
2023-05-30 10:54:47 +03:00 |
|
MaxOvs19
|
11b91ef627
|
Fixed imports all components
|
2023-05-30 10:10:34 +03:00 |
|
MaxOvs19
|
72f5b59719
|
Test imports
|
2023-05-29 18:30:16 +03:00 |
|
MaxOvs19
|
5865c59ba3
|
Moving components and creating jsconfig
|
2023-05-29 15:01:38 +03:00 |
|
