Commit Graph

376 Commits

Author SHA1 Message Date
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