Commit Graph

744 Commits

Author SHA1 Message Date
e58a576be9 tracker-tasks 2023-06-29 19:18:58 +03:00
NikoM1k
6751a655ee
Merge pull request #110 from apuc/tracker-tasks
Tracker tasks
2023-06-29 03:42:49 +03:00
4180cb5858 tracker-tasks 2023-06-29 03:41:59 +03:00
6f534bb82b tracker-tasks 2023-06-29 03:41:18 +03:00
3131fbe1ef tracker-tasks 2023-06-29 02:27:08 +03:00
4db278fdbd tracker-tasks 2023-06-29 02:26:49 +03:00
NikoM1k
73bcd58d05
Merge pull request #109 from apuc/select-priority-column
Select priority column
2023-06-27 18:36:42 +03:00
bd3e2288ed select executor on create task 2023-06-27 18:35:59 +03:00
7c622d63a1 select executor on create task 2023-06-27 18:35:44 +03:00
NikoM1k
6ec8be4ecd
Merge pull request #108 from apuc/select-priority-column
select priority column, project persons avatars, copy links on button…
2023-06-27 17:16:47 +03:00
836d16691a select priority column, project persons avatars, copy links on button, executor on task 2023-06-27 17:14:22 +03:00
e24a08210a select priority column, project persons avatars, copy links on button, executor on task 2023-06-27 17:12:58 +03:00
NikoM1k
30353e45e5
Merge pull request #107 from apuc/ckeditor
Ckeditor
2023-06-26 13:25:05 +03:00
b200a7a4a2 ckeditor 2023-06-26 13:24:20 +03:00
1c8af369f3 ckeditor 2023-06-26 13:24:02 +03:00
NikoM1k
8493cd2df8
Merge pull request #104 from apuc/tracker-connect-back
correctProjectUsers
2023-06-26 12:59:01 +03:00
ede41ed8ed Merge branch 'main' into tracker-connect-back 2023-06-26 12:58:07 +03:00
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
0f63b597f2
Merge pull request #106 from apuc/fix-modal-and-effects
Fixed modals conflict
2023-06-26 12:13:08 +03:00
MaxOvs19
256159dd0c Fixed modals conflict 2023-06-26 12:10:49 +03:00
MaxOvs19
839d6002a8
Merge pull request #105 from apuc/fixed-err-eslint
Fixed err eslint
2023-06-26 11:07:17 +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
be8f006463
Merge pull request #103 from apuc/fix-modal-and-effects
Fix modal and effects
2023-06-23 15:19:31 +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
NikoM1k
07740c3369
Merge pull request #102 from apuc/tracker-connect-back
priority tasks
2023-06-15 21:47:24 +03:00
bd82169b6a priority tasks 2023-06-15 21:46:52 +03:00
NikoM1k
6abc3c2c0c
Merge pull request #101 from apuc/tracker-connect-back
fix
2023-06-13 12:03:15 +03:00
cf5d1760f7 fix 2023-06-13 12:02:59 +03:00
NikoM1k
3bedd23b4b
Merge pull request #100 from apuc/tracker-connect-back
fix
2023-06-13 00:51:47 +03:00
abefc8ce51 fix 2023-06-13 00:50:34 +03:00
NikoM1k
72ded765cd
Merge pull request #99 from apuc/tracker-connect-back
fix
2023-06-12 23:52:40 +03:00
46391d0d35 fix 2023-06-12 23:52:05 +03:00
NikoM1k
04beac5dbd
Merge pull request #98 from apuc/tracker-connect-back
Tracker connect back
2023-06-12 23:30:38 +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
7cb0195f1d fix 2023-06-12 22:14:45 +03:00
714d33ac9a img 2023-06-10 04:08:14 +03:00
f4b55a5d79 fix task modal and column priority 2023-06-09 03:19:09 +03:00
MaxOvs19
32d6bbc345
Merge pull request #97 from apuc/add-husky-eslint
Add husky and eslint
2023-06-02 19:47:41 +03:00
4e0a44e5a4 add comments to tasks 2023-06-01 03:21:41 +03:00
MaxOvs19
2c7c5c7d5c Added husky 2023-05-31 11:32:36 +03:00
MaxOvs19
9e242ddf5d Added eslint 2023-05-31 11:24:46 +03:00