Commit Graph

366 Commits

Author SHA1 Message Date
NikoM1k
f1a27627d8
Merge pull request #80 from apuc/tracker-connect-back
tracker-connect-back
2023-05-02 21:02:57 +03:00
fd49f9df68 tracker-connect-back 2023-05-02 21:02:36 +03:00
NikoM1k
bdd386cbbf
Merge pull request #77 from apuc/add-blog
Add blog page
2023-05-02 20:36:45 +03:00
MaxOvs19
43acfe2b79 Fixed conflict 2023-05-02 20:29:10 +03:00
NikoM1k
a5cb5a4e22
Merge pull request #79 from apuc/tracker-connect-back
tracker-connect-back
2023-05-02 19:42:29 +03:00
3aaab67a97 tracker-connect-back 2023-05-02 19:41:51 +03:00
NikoM1k
5dcf0c14c2
Merge pull request #78 from apuc/tracker-connect-back
Tracker connect back
2023-05-02 18:51:45 +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
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
37cfe0d771
Merge pull request #76 from apuc/fixed-sidebar
Fixed sideBar
2023-04-27 13:40:54 +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
NikoM1k
cf4aee9ab2
Merge pull request #75 from apuc/fixed-pages
Fixed pages Auth
2023-04-27 12:48:05 +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
NikoM1k
03bba43f67
Merge pull request #74 from apuc/candidate-area
Candidate area
2023-04-25 16:14:59 +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
NikoM1k
6af92a2f70
Merge pull request #73 from apuc/candidate-area
edit request
2023-04-21 01:07:32 +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
NikoM1k
ae9a2efd37
Merge pull request #72 from apuc/candidate-area
Candidate area
2023-04-19 22:43:23 +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
NikoM1k
69a3f9a1cf
Merge pull request #71 from apuc/candidate-area
Candidate area
2023-04-18 14:02:04 +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
NikoM1k
45b45a2872
Merge pull request #70 from apuc/candidate-area
fixes
2023-04-10 18:56:04 +03:00
418b268425 fixes 2023-04-10 18:55:37 +03:00
NikoM1k
9cfcd2ab32
Merge pull request #69 from apuc/candidate-area
fixes
2023-04-10 18:50:00 +03:00
d0eda91f91 fixes 2023-04-10 18:49:30 +03:00
NikoM1k
cdb1e373a3
Merge pull request #68 from apuc/candidate-area
Candidate area
2023-04-10 18:32:10 +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