apuc/guild_front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
496 Commits 7 Branches 0 Tags
b5d205abc9d85f853b498058979a3d31d3482464
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
nik.polishuk b5d205abc9 executor filter tasks 2023-07-03 22:07:58 +03:00
nik.polishuk 5af01a63ed executor filter tasks 2023-07-03 22:07:44 +03:00
nik.polishuk d48957746f tracker-tasks 2023-06-29 19:19:13 +03:00
nik.polishuk e58a576be9 tracker-tasks 2023-06-29 19:18:58 +03:00
nik.polishuk 4180cb5858 tracker-tasks 2023-06-29 03:41:59 +03:00
nik.polishuk 6f534bb82b tracker-tasks 2023-06-29 03:41:18 +03:00
nik.polishuk 3131fbe1ef tracker-tasks 2023-06-29 02:27:08 +03:00
nik.polishuk 4db278fdbd tracker-tasks 2023-06-29 02:26:49 +03:00
nik.polishuk bd3e2288ed select executor on create task 2023-06-27 18:35:59 +03:00
nik.polishuk 7c622d63a1 select executor on create task 2023-06-27 18:35:44 +03:00
nik.polishuk 836d16691a select priority column, project persons avatars, copy links on button, executor on task 2023-06-27 17:14:22 +03:00
nik.polishuk e24a08210a select priority column, project persons avatars, copy links on button, executor on task 2023-06-27 17:12:58 +03:00
nik.polishuk b200a7a4a2 ckeditor 2023-06-26 13:24:20 +03:00
nik.polishuk 1c8af369f3 ckeditor 2023-06-26 13:24:02 +03:00
nik.polishuk ede41ed8ed Merge branch 'main' into tracker-connect-back 2023-06-26 12:58:07 +03:00
nik.polishuk af8704eafe Merge branch 'main' into tracker-connect-back 2023-06-26 12:57:33 +03:00
nik.polishuk 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
nik.polishuk fc6feca92d correctProjectUsers 2023-06-22 19:43:12 +03:00
nik.polishuk bd82169b6a priority tasks 2023-06-15 21:46:52 +03:00
nik.polishuk cf5d1760f7 fix 2023-06-13 12:02:59 +03:00
nik.polishuk abefc8ce51 fix 2023-06-13 00:50:34 +03:00
nik.polishuk 46391d0d35 fix 2023-06-12 23:52:05 +03:00
nik.polishuk 9b99da9261 fix 2023-06-12 23:30:18 +03:00
nik.polishuk 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
nik.polishuk 7cb0195f1d fix 2023-06-12 22:14:45 +03:00
nik.polishuk 714d33ac9a img 2023-06-10 04:08:14 +03:00
nik.polishuk f4b55a5d79 fix task modal and column priority 2023-06-09 03:19:09 +03:00
nik.polishuk 4e0a44e5a4 add comments to tasks 2023-06-01 03:21:41 +03:00
nik.polishuk c55a697f6b timer with comments 2023-05-30 03:32:16 +03:00
nik.polishuk 683377fb6a task add users 2023-05-24 16:04:36 +03:00
nik.polishuk b9301ecce3 task add users 2023-05-24 01:43:30 +03:00
nik.polishuk 18506ce90b task add users 2023-05-24 01:23:51 +03:00
nik.polishuk 60354a3d09 task add users 2023-05-24 01:20:53 +03:00
nik.polishuk c55376ecb3 tracker 2023-05-23 23:02:39 +03:00
nik.polishuk a443bad839 tracker 2023-05-17 23:18:46 +03:00
nik.polishuk f9ebddd606 fixes 2023-05-17 02:51:31 +03:00
nik.polishuk 56ef7061fa tasks edit 2023-05-16 00:24:52 +03:00
nik.polishuk 65874161c7 Merge branch 'main' into tracker-connect-back 2023-05-15 21:24:25 +03:00
nik.polishuk 906dd0ec90 fix 2023-05-15 21:23:42 +03:00
nik.polishuk 52b166e1c2 tasks 2023-05-15 21:09:31 +03:00
nik.polishuk e1ac3bc70e fix 2023-05-09 01:13:55 +03:00
nik.polishuk b94ea09c54 all completed tasks 2023-05-09 01:02:44 +03:00
nik.polishuk 46a8373d00 editProjectName 2023-05-08 00:41:39 +03:00
nik.polishuk d8a7eb55f5 tracker-connect 2023-05-05 00:50:48 +03:00
nik.polishuk 2fec7f4d28 Merge branch 'main' into tracker-connect-back 2023-05-04 18:43:08 +03:00
nik.polishuk 8787ebd07a tracker hover fix 2023-05-04 18:42:55 +03:00
nik.polishuk efca4f0818 tracker hover fix 2023-05-03 20:26:09 +03:00
nik.polishuk cd732dcc9d tracker-connect-back 2023-05-03 20:01:23 +03:00
nik.polishuk fd49f9df68 tracker-connect-back 2023-05-02 21:02:36 +03:00
nik.polishuk 3aaab67a97 tracker-connect-back 2023-05-02 19:41:51 +03:00
nik.polishuk d0506441b8 tracker-connect 2023-05-02 18:51:19 +03:00
nik.polishuk 9152aa1adc tracker-connect 2023-04-28 18:29:13 +03:00
nik.polishuk eeca39671a tracker-connect 2023-04-28 14:56:59 +03:00
nik.polishuk 2ecc569710 Merge branch 'main' into tracker-connect-back 2023-04-27 14:51:19 +03:00
nik.polishuk 88162816c5 tracker 2023-04-27 14:51:01 +03:00
nik.polishuk 6c79e61e9d Merge remote-tracking branch 'origin/update-modal-app' into candidate-area 
# Conflicts:
#	src/App.js
 2023-04-25 16:12:28 +03:00
nik.polishuk dd03bcb47c edit request 2023-04-21 01:07:09 +03:00
nik.polishuk 37d8ab385d merge branch and partnerRequest candidate 2023-04-19 22:42:46 +03:00
nik.polishuk 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
nik.polishuk 7ae079e6bb Merge remote-tracking branch 'origin/update-modal-app' into candidate-area 2023-04-18 14:00:55 +03:00
nik.polishuk 5067746178 partnerRequests 2023-04-18 13:58:36 +03:00
nik.polishuk 418b268425 fixes 2023-04-10 18:55:37 +03:00
nik.polishuk d0eda91f91 fixes 2023-04-10 18:49:30 +03:00
nik.polishuk 57e877c5f2 fixes 2023-04-10 18:31:51 +03:00
nik.polishuk 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
nik.polishuk 2b65b42494 fixes 2023-04-10 18:12:36 +03:00
nik.polishuk 2e13c16c27 select skills on partnerRequest 2023-04-09 05:05:33 +03:00
nik.polishuk 911d095120 new footer 2023-04-05 20:13:38 +03:00
nik.polishuk ccab602ae4 fixes 2023-04-05 19:38:38 +03:00
nik.polishuk 4e61ea043d candidate auth 2023-04-04 19:07:19 +03:00
nik.polishuk 615606d3e6 new tracker 2023-03-30 15:07:05 +03:00
nik.polishuk c1eb60d3ab Merge remote-tracking branch 'origin/parthners-area-fix-modal' into parthners-area 2023-03-28 14:42:58 +03:00
nik.polishuk dedf0588b1 partner catalog and no requests block 2023-03-27 16:30:35 +03:00
nik.polishuk 5f4dc3a5f2 partner catalog and no requests block 2023-03-27 16:03:24 +03:00
nik.polishuk d07b9473c4 fixes 2023-03-23 16:49:28 +03:00
nik.polishuk 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
nik.polishuk 6419b9dd97 fixes 2023-03-23 16:43:37 +03:00
nik.polishuk 48bd4059df partner employees 2023-03-23 16:18:57 +03:00
nik.polishuk 850b0d1bb6 partner employees 2023-03-23 14:00:34 +03:00
nik.polishuk ab93a26abf fix 2023-03-20 14:40:24 +03:00
nik.polishuk eb30ede5c0 fix 2023-03-20 14:38:52 +03:00
nik.polishuk 653af43f52 partner treaties 2023-03-20 14:00:10 +03:00
nik.polishuk c12d00872a partners-area 2023-03-17 14:29:00 +03:00
nik.polishuk a437eb2fd8 partner-area 2023-03-17 14:01:26 +03:00
nik.polishuk 9a048a2c7c Merge remote-tracking branch 'origin/update-page-auth' into parthners-area 2023-03-16 17:35:41 +03:00
nik.polishuk 7498f89940 partner-area 2023-03-16 15:10:53 +03:00
nik.polishuk ca9702ecb7 tracker 2023-03-13 23:33:12 +03:00
nik.polishuk bf5873e5e8 drag and drop on tracker 2023-03-10 01:20:15 +03:00
nik.polishuk 22e70549a9 fix 2023-03-07 19:07:31 +03:00
nik.polishuk cf0cf69a6e Merge remote-tracking branch 'origin/trecker-modal-tiсket' into tracker 
# Conflicts:
#	src/pages/Tracker/Tracker.js
#	src/pages/Tracker/tracker.scss
 2023-03-07 19:05:04 +03:00
nik.polishuk eaa0b2c3ac fix 2023-03-07 19:00:41 +03:00
nik.polishuk 8dbeb5bba5 tracker 2023-03-07 12:40:16 +03:00
nik.polishuk 6d113852c4 tracker 2023-03-03 18:49:02 +03:00
nik.polishuk fceaa1d190 new fixes 2023-03-01 23:40:23 +03:00
nik.polishuk 28a0c7f843 new fixes 2023-03-01 00:28:58 +03:00
nik.polishuk f4fb2d857a partner-personal-area 2023-02-27 16:57:33 +03:00
nik.polishuk 9f96ce6167 Merge branch 'main' into partner-personal-area 2023-02-27 16:50:52 +03:00
nik.polishuk 31cc5acbe1 partner-personal-area 2023-02-27 16:50:32 +03:00
nik.polishuk 15ed4b8c1d partner bid page 2023-02-23 14:57:26 +03:00
nik.polishuk e26b8cc22e personal area partner with fixes report 2023-02-21 19:05:04 +03:00