Commit Graph

543 Commits

Author SHA1 Message Date
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
MaxOvs19
0b734c1a34 Fixed conflicts 2023-05-23 17:15:12 +03:00
Victor
1e101b7f4c remove unused 2023-05-23 16:45:03 +03:00
MaxOvs19
c62ae06d20 Bugs fixed 2023-05-18 19:52:37 +03:00
MaxOvs19
973f140451 Pull from main page 2023-05-18 18:40:40 +03:00
MaxOvs19
152d4a257f Finish working in report page 2023-05-18 18:38:02 +03:00
MaxOvs19
b45dc0283c Fixed nextDay 2023-05-18 18:21:20 +03:00
MaxOvs19
0de6c43fe1 Fixed switch in back 2023-05-18 17:42:29 +03:00
a443bad839 tracker 2023-05-17 23:18:46 +03:00
f9ebddd606 fixes 2023-05-17 02:51:31 +03:00
MaxOvs19
61d52fae50 Fixed route in view 2023-05-16 21:09:28 +03:00
MaxOvs19
34be4eec32 Fixed button in report 2023-05-16 19:20:37 +03:00
MaxOvs19
23ec3bbdad Update from main branch 2023-05-16 10:24:07 +03:00
56ef7061fa tasks edit 2023-05-16 00:24:52 +03:00
65874161c7 Merge branch 'main' into tracker-connect-back 2023-05-15 21:24:25 +03:00
906dd0ec90 fix 2023-05-15 21:23:42 +03:00
52b166e1c2 tasks 2023-05-15 21:09:31 +03:00
MaxOvs19
21fe443d05 Fixed report page 2023-05-12 12:44:28 +03:00
MaxOvs19
fb0ce999f6 Working in calendar 2023-05-11 19:54:15 +03:00
b10ce79a32 fix 2023-05-10 12:35:00 +03:00
MaxOvs19
83f0c67017 added store modal tracker 2023-05-10 12:23:35 +03:00
e1ac3bc70e fix 2023-05-09 01:13:55 +03:00
b94ea09c54 all completed tasks 2023-05-09 01:02:44 +03:00
MaxOvs19
776c53cbbd Fixed modal edit clumn 2023-05-08 16:57:35 +03:00
46a8373d00 editProjectName 2023-05-08 00:41:39 +03:00
MaxOvs19
ce939e6322 Finished fixed modal 2023-05-05 16:10:25 +03:00
MaxOvs19
f32a8f64e5 delete modal create, and fixed modal add 2023-05-05 14:48:45 +03:00
d8a7eb55f5 tracker-connect 2023-05-05 00:50:48 +03:00
2fec7f4d28 Merge branch 'main' into tracker-connect-back 2023-05-04 18:43:08 +03:00
8787ebd07a tracker hover fix 2023-05-04 18:42:55 +03:00
MaxOvs19
7667de9b8b pull in main 2023-05-04 18:38:56 +03:00
MaxOvs19
87fb04e422 Fixed modalSelect 2023-05-04 09:49:39 +03:00
MaxOvs19
bb027d003f Added modal in project tiket 2023-05-03 22:06:19 +03:00
efca4f0818 tracker hover fix 2023-05-03 20:26:09 +03:00
cd732dcc9d tracker-connect-back 2023-05-03 20:01:23 +03:00
MaxOvs19
553ac3e75d Fixed state modal 2023-05-03 16:47:20 +03:00
fd49f9df68 tracker-connect-back 2023-05-02 21:02:36 +03:00
MaxOvs19
43acfe2b79 Fixed conflict 2023-05-02 20:29:10 +03:00
3aaab67a97 tracker-connect-back 2023-05-02 19:41:51 +03:00
d0506441b8 tracker-connect 2023-05-02 18:51:19 +03:00
MaxOvs19
b21e6b1818 Finished working in blog 2023-05-02 15:27:24 +03:00
9152aa1adc tracker-connect 2023-04-28 18:29:13 +03:00
MaxOvs19
a3570668f1 Added Article pages and fixed SideBar 2023-04-28 18:07:34 +03:00
879a42f3b4 Удаление таски с колонки 2023-04-28 16:15:46 +03:00
eeca39671a tracker-connect 2023-04-28 14:56:59 +03:00
9c08b0f24f fix path 2023-04-27 21:22:48 +03:00
c2ca9eb373 fix 2023-04-27 21:19:34 +03:00
c1f1cf8879 frequently-asked-questions page 2023-04-27 21:15:55 +03:00
MaxOvs19
26eedabe0f Added CardArticle comp 2023-04-27 20:59:03 +03:00
MaxOvs19
36bba6c5a1 Create new page Blog 2023-04-27 15:13:14 +03:00
2ecc569710 Merge branch 'main' into tracker-connect-back 2023-04-27 14:51:19 +03:00
88162816c5 tracker 2023-04-27 14:51:01 +03:00
MaxOvs19
0c079c2ea2 Fixed sideBar 2023-04-27 13:37:41 +03:00
MaxOvs19
93c4565e26 fixed decs components 2023-04-27 12:54:54 +03:00
MaxOvs19
256e9cf0b7 Fixed Auth 2023-04-27 12:46:18 +03:00
MaxOvs19
3fa9f636c1 Fixed Errorbonary 2023-04-27 12:11:09 +03:00
MaxOvs19
8553adcf08 Fixed catalog pages and added modal 2023-04-26 21:29:50 +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
37d8ab385d merge branch and partnerRequest candidate 2023-04-19 22:42:46 +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
9c847c3502 fix id 2023-04-19 20:22:49 +03:00
f2d7730214 quiz + lk-candidate 2023-04-19 20:22:06 +03:00
7ae079e6bb Merge remote-tracking branch 'origin/update-modal-app' into candidate-area 2023-04-18 14:00:55 +03:00
5067746178 partnerRequests 2023-04-18 13:58:36 +03:00
MaxOvs19
ab2ff123a0 Finished project menu 2023-04-14 15:52:21 +03:00
MaxOvs19
e19ee11560 added new modal settings 2023-04-13 22:10:20 +03:00
MaxOvs19
b91c8acd0c Fixed candidate pages 2023-04-13 16:10:35 +03:00
MaxOvs19
2e7375f18e Added new modal Aspt and fixed pages/modals 2023-04-12 22:20:05 +03:00
MaxOvs19
1e4e79897a Finished update modal for tracker 2023-04-12 18:22:25 +03:00
MaxOvs19
19865fb9e3 Added new ModalAdd 2023-04-10 21:22:22 +03:00
418b268425 fixes 2023-04-10 18:55:37 +03:00
d0eda91f91 fixes 2023-04-10 18:49:30 +03:00
57e877c5f2 fixes 2023-04-10 18:31:51 +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
2b65b42494 fixes 2023-04-10 18:12:36 +03:00
MaxOvs19
ae3416c4b2 Fixed auth page and adaptation freeDev 2023-04-10 18:08:41 +03:00
2e13c16c27 select skills on partnerRequest 2023-04-09 05:05:33 +03:00
MaxOvs19
943bc1abea Added page in free worker 2023-04-07 21:49:09 +03:00
911d095120 new footer 2023-04-05 20:13:38 +03:00
ccab602ae4 fixes 2023-04-05 19:38:38 +03:00
4e61ea043d candidate auth 2023-04-04 19:07:19 +03:00
MaxOvs19
8bd7bb7535 Fixed settings page and modals 2023-04-03 14:37:27 +03:00
615606d3e6 new tracker 2023-03-30 15:07:05 +03:00
MaxOvs19
9bab7d17cd Fixed modal and added new img 2023-03-29 19:43:49 +03:00
MaxOvs19
df9e1d5a23 Added modal registr 2023-03-28 20:42:18 +03:00
c1eb60d3ab Merge remote-tracking branch 'origin/parthners-area-fix-modal' into parthners-area 2023-03-28 14:42:58 +03:00
MaxOvs19
76334aec99 Fixed auth page and tracker 2023-03-27 19:08:01 +03:00
dedf0588b1 partner catalog and no requests block 2023-03-27 16:30:35 +03:00
5f4dc3a5f2 partner catalog and no requests block 2023-03-27 16:03:24 +03:00
MaxOvs19
fc51fbdb09 Added func create new tiket 2023-03-24 19:26:27 +03:00
MaxOvs19
a21063663c Fixed modal 2023-03-23 21:18:48 +03:00
d07b9473c4 fixes 2023-03-23 16:49:28 +03:00
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
6419b9dd97 fixes 2023-03-23 16:43:37 +03:00
48bd4059df partner employees 2023-03-23 16:18:57 +03:00
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
MaxOvs19
8b8dda215f Fixed sidebar, AuthBox, and modalError 2023-03-22 15:33:12 +03:00
MaxOvs19
84e55a0f54 Fixed slider, auth pages and modal 2023-03-21 21:26:38 +03:00
ab93a26abf fix 2023-03-20 14:40:24 +03:00
eb30ede5c0 fix 2023-03-20 14:38:52 +03:00
653af43f52 partner treaties 2023-03-20 14:00:10 +03:00
MaxOvs19
7ca1239002 Finish update modal error 2023-03-20 13:05:27 +03:00
MaxOvs19
2bc8457af7 Added modal error 2023-03-17 21:50:11 +03:00
MaxOvs19
3a65009ec9 Finished this page 2023-03-17 20:02:53 +03:00
c12d00872a partners-area 2023-03-17 14:29:00 +03:00
a437eb2fd8 partner-area 2023-03-17 14:01:26 +03:00
MaxOvs19
44af2ee09d Added page settings 2023-03-16 21:41:01 +03:00
9a048a2c7c Merge remote-tracking branch 'origin/update-page-auth' into parthners-area 2023-03-16 17:35:41 +03:00
7498f89940 partner-area 2023-03-16 15:10:53 +03:00
MaxOvs19
cc2b0f144a Fixed styles 2023-03-14 18:49:45 +03:00
MaxOvs19
021c07f0c6 Finished adaptation for mobile 2023-03-14 18:07:45 +03:00
ca9702ecb7 tracker 2023-03-13 23:33:12 +03:00
MaxOvs19
9cb9eb0abb finished working 2023-03-13 19:30:06 +03:00
MaxOvs19
93ebf0ed83 Added buttons change 2023-03-13 18:35:26 +03:00
MaxOvs19
b17386ba48 Adaptation slider in mobile 2023-03-10 19:58:47 +03:00
MaxOvs19
cb937dd790 Added slider for Dev and Partners auth page 2023-03-10 18:12:25 +03:00
MaxOvs19
fd3ff67915 Fixed header auth 2023-03-10 12:15:03 +03:00