|
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
|
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
|
9bc60434cc
|
Fixed modals btn
|
2023-06-22 14:53:35 +03:00 |
|
|
bd82169b6a
|
priority tasks
|
2023-06-15 21:46:52 +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 |
|
|
f4b55a5d79
|
fix task modal and column priority
|
2023-06-09 03:19:09 +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 |
|
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
|
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
|
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
|
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 |
|
|
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
|
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
|
fb0ce999f6
|
Working in calendar
|
2023-05-11 19:54:15 +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 |
|