Commit Graph

562 Commits

Author SHA1 Message Date
NikoM1k
5e69e922f5
Merge pull request #140 from apuc/tracker-mark
Tracker mark
2023-10-26 14:45:59 +03:00
Mikola
db0f0e1f24 marks 2023-10-26 14:45:14 +03:00
Mikola
5c72dae35a marks 2023-10-26 14:44:39 +03:00
NikoM1k
64374a4aff
Merge pull request #139 from apuc/tracker-mark
Tracker mark
2023-10-25 16:33:54 +03:00
Mikola
1fc6cc3f73 marks 2023-10-25 16:33:26 +03:00
Mikola
fc9d18a380 marks 2023-10-25 16:33:08 +03:00
Mikola
33b70c7fbd marks 2023-10-24 22:58:45 +03:00
Mikola
c4a4fa1333 marks 2023-10-24 22:49:12 +03:00
MaxOvs19
76b2c4622f fixed calendar periods 2023-10-24 19:41:59 +03:00
MaxOvs19
e670e2a9a7 Fixed archive 2023-10-23 17:26:47 +03:00
MaxOvs19
66f815f4f0 Update my task 2023-10-23 16:42:12 +03:00
MaxOvs19
8b170fe43d new design tasks 2023-10-20 19:15:04 +03:00
MaxOvs19
4be52d429c Fixed pages 2023-10-19 19:19:45 +03:00
MaxOvs19
c8ee505543 Finish work archive 2023-10-13 21:42:18 +03:00
MaxOvs19
cc38b06bdf Merge branch 'main' of https://github.com/apuc/outstaffing-react into fix-tracker-and-statistics 2023-10-13 17:49:45 +03:00
Mikola
2af61e5a7a traсker 2023-10-13 14:39:01 +03:00
Mikola
356104b475 traker 2023-10-13 14:38:11 +03:00
MaxOvs19
f051508071 Merge branch 'main' of https://github.com/apuc/outstaffing-react into fix-tracker-and-statistics 2023-10-12 15:31:39 +03:00
Mikola
95ba471e1f calendar range days 2023-10-12 12:50:17 +03:00
Mikola
8b49a3a7c2 calendar range days 2023-10-12 12:50:02 +03:00
MaxOvs19
40133b72a3 working in archive page 2023-10-11 19:56:36 +03:00
MaxOvs19
b226ee88bd Merge branch 'main' of https://github.com/apuc/outstaffing-react into fix-tracker-and-statistics 2023-10-11 12:22:00 +03:00
MaxOvs19
be411ffef2 Fixed archive and select modal 2023-10-10 19:29:08 +03:00
Mikola
ff2bd020e8 calendar range days 2023-10-10 19:21:46 +03:00
Mikola
58b8119569 calendar range days 2023-10-10 19:21:34 +03:00
Mikola
644c89f376 calendar range days 2023-10-10 16:32:30 +03:00
Mikola
b16888fdb4 calendar range days 2023-10-10 16:31:40 +03:00
Mikola
3a832cc78d tracker fix 2023-10-10 14:22:43 +03:00
Mikola
882ec997e3 reports date range 2023-10-06 17:47:14 +03:00
Mikola
490c021ab2 reports date range 2023-10-06 17:41:26 +03:00
Mikola
38586b5209 reports date range 2023-10-06 17:40:53 +03:00
MaxOvs19
a604824f84 Mobile adaptation 2023-10-05 18:49:16 +03:00
MaxOvs19
aba12694bf Fixed statistics page 2023-10-03 18:26:07 +03:00
MaxOvs19
986c0833f7 Finish page statistics 2023-10-03 18:03:32 +03:00
MaxOvs19
6b6432330b Added new page statistics 2023-10-02 21:26:06 +03:00
MaxOvs19
c155462ab4 Fixed project cart 2023-10-02 18:10:40 +03:00
Mikola
a3ff812b8a tracker tasks create modal 2023-09-13 17:46:56 +03:00
Mikola
a84672f76f tracker tasks create modal 2023-09-13 17:45:31 +03:00
Mikola
8ed1859e93 tracker tasks 2023-09-11 18:29:45 +03:00
Mikola
3b773e0008 tracker tasks 2023-09-11 18:28:56 +03:00
Mikola
617ca5af6e tracker tasks 2023-09-08 19:03:38 +03:00
45438da61c tracker tasks 2023-08-31 01:58:48 +03:00
a66bea4462 tracker tasks 2023-08-31 01:58:35 +03:00
86d29475aa tracker tasks 2023-08-30 17:02:50 +03:00
5fa069d84d tracker tasks 2023-08-30 17:02:32 +03:00
433fc88f99 fix 2023-08-11 22:44:54 +03:00
4f0d0d9634 fix 2023-08-11 22:39:04 +03:00
d159f7bee1 company page 2023-08-11 20:38:22 +03:00
9028339c30 company page 2023-08-11 20:38:12 +03:00
0406af40b8 fixes 2023-08-10 18:57:06 +03:00
1687a71d8b fixes 2023-08-10 18:56:50 +03:00
595b7c986b adaptive 2023-08-07 15:58:52 +03:00
95ec6c4954 adaptive 2023-08-07 15:58:16 +03:00
8e6eb29f5c adaptive 2023-08-07 15:53:18 +03:00
34bf7b55df adaptive 2023-08-07 15:52:58 +03:00
03071a7f91 adaptive 2023-08-04 23:24:18 +03:00
3db87fca20 adaptive 2023-08-04 23:24:04 +03:00
d62d321c93 adaptive 2023-08-03 18:47:19 +03:00
2e4f15717b adaptive 2023-08-03 18:47:04 +03:00
85773bd7af adaptive 2023-08-02 23:20:53 +03:00
7d663cae09 tracker fixes 2023-07-26 13:52:23 +03:00
3f9841fb6d tracker fixes 2023-07-26 13:51:56 +03:00
fa582a8bfc reset and confirm modals 2023-07-18 16:20:55 +03:00
e0b289c3fd reset and confirm modals 2023-07-18 16:20:40 +03:00
7c7ea86c8c modal accept with notifications 2023-07-14 03:03:49 +03:00
001920a840 modal accept with notifications 2023-07-14 03:03:33 +03:00
242f298bee task files 2023-07-13 15:55:25 +03:00
f87100138b task files 2023-07-13 15:55:09 +03:00
d92578c517 task files 2023-07-13 15:49:34 +03:00
524e773cc4 file 2023-07-13 15:49:07 +03:00
c6f9d4722a file 2023-07-13 03:42:24 +03:00
c308e0fd58 file 2023-07-13 03:42:12 +03:00
2090677b3d file 2023-07-13 02:45:32 +03:00
68d5a7ebcc file 2023-07-13 02:45:20 +03:00
f8d7abdeba file 2023-07-13 02:03:53 +03:00
4f613f492e file 2023-07-13 02:03:40 +03:00
8b9351e3f7 task deadLine 2023-07-07 17:38:31 +03:00
b8ef0119d0 task deadLine 2023-07-07 17:38:19 +03:00
d0a29e7ee8 Tracker Auth 2023-07-07 01:21:07 +03:00
49729ddd6b Tracker Auth 2023-07-07 01:20:57 +03:00
c3ef01ee35 tracker fixes 2023-07-07 00:46:58 +03:00
7f0dc9612b tracker fixes 2023-07-07 00:46:40 +03:00
e6689c315d trackerIntro 2023-07-04 22:26:15 +03:00
ad7874b500 trackerIntro 2023-07-04 22:26:00 +03:00
f6c7609b1c tasks 2023-07-04 16:19:58 +03:00
6e4d2c1dc2 tasks 2023-07-04 16:19:46 +03:00
1515d72e4f executor filter tasks 2023-07-03 22:10:04 +03:00
b5d205abc9 executor filter tasks 2023-07-03 22:07:58 +03:00
5af01a63ed executor filter tasks 2023-07-03 22:07:44 +03:00
d48957746f tracker-tasks 2023-06-29 19:19:13 +03:00
e58a576be9 tracker-tasks 2023-06-29 19:18:58 +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
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
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
b200a7a4a2 ckeditor 2023-06-26 13:24:20 +03:00
1c8af369f3 ckeditor 2023-06-26 13:24:02 +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
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
bd82169b6a priority tasks 2023-06-15 21:46:52 +03:00
cf5d1760f7 fix 2023-06-13 12:02:59 +03:00
abefc8ce51 fix 2023-06-13 00:50:34 +03:00
46391d0d35 fix 2023-06-12 23:52:05 +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
4e0a44e5a4 add comments to tasks 2023-06-01 03:21:41 +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
c55a697f6b timer with comments 2023-05-30 03:32:16 +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
MaxOvs19
3b605280b2 Moving components out of a folder UI 2023-05-29 09:37:18 +03:00
MaxOvs19
85accc3111 Added ui btn and fixed Modals 2023-05-26 19:59:42 +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
0667b435ac Convert personal img in svg 2023-05-25 10:57:57 +03:00
MaxOvs19
3be7d42cfc Delete old files 2023-05-24 19:59:30 +03:00
MaxOvs19
f88b22cb84 Fixed full components 2023-05-24 19:23:24 +03:00
MaxOvs19
70b3845755 Fixed prod 2023-05-24 16:10:32 +03:00
683377fb6a task add users 2023-05-24 16:04:36 +03:00
MaxOvs19
2ad78834f3 Fixed copmonents 2023-05-24 15:34:43 +03:00
MaxOvs19
08f7d13f01 Fixed img in components 2023-05-24 13:49:09 +03:00
NikoM1k
2aa2b15d2d
Merge pull request #94 from apuc/tracker-connect-back
task add users
2023-05-24 01:44:35 +03:00
b9301ecce3 task add users 2023-05-24 01:43:30 +03:00
NikoM1k
43d6e8b4f4
Merge pull request #93 from apuc/tracker-connect-back
task add users
2023-05-24 01:24:22 +03:00
18506ce90b task add users 2023-05-24 01:23:51 +03:00
NikoM1k
5c47c78599
Merge pull request #92 from apuc/tracker-connect-back
task add users
2023-05-24 01:21:40 +03:00
60354a3d09 task add users 2023-05-24 01:20:53 +03:00
NikoM1k
5af1562917
Merge pull request #91 from apuc/tracker-connect-back
Tracker connect back
2023-05-23 23:03:03 +03:00
c55376ecb3 tracker 2023-05-23 23:02:39 +03:00