Commit Graph

442 Commits

Author SHA1 Message Date
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
NikoM1k
86e174c032
Merge pull request #60 from apuc/parthners-area
Parthners area
2023-03-20 15:10:59 +02: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
NikoM1k
2a48be66fa
Merge pull request #59 from apuc/parthners-area
partners-area
2023-03-17 13:29:31 +02:00
c12d00872a partners-area 2023-03-17 14:29:00 +03:00
NikoM1k
fa78267a42
Merge pull request #58 from apuc/parthners-area
Parthners area
2023-03-17 13:16:37 +02:00
NikoM1k
cd5d2f4404
Merge pull request #57 from apuc/parthners-area
partner-area
2023-03-17 13:02:30 +02: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
NikoM1k
e505646a39
Merge pull request #56 from apuc/tracker
Tracker
2023-03-13 22:34:42 +02: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
bf5873e5e8 drag and drop on tracker 2023-03-10 01:20:15 +03:00
MaxOvs19
ce2342ff5d Added header auth page 2023-03-09 19:38:56 +03:00
MaxOvs19
a11c85ad14 Work of sidebar finished 2023-03-09 18:44:31 +03:00
MaxOvs19
b4adb4bdd5 Working in sideBar 2023-03-08 20:01:57 +03:00
MaxOvs19
cb677a3f0b Added SideBar component 2023-03-08 13:27:02 +03:00
MaxOvs19
9e9a87dea0 Added modal in project 2023-03-08 11:36:34 +03:00
MaxOvs19
b80824088d Added modal to tracker 2023-03-07 19:40:52 +03:00
22e70549a9 fix 2023-03-07 19:07:31 +03:00
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
eaa0b2c3ac fix 2023-03-07 19:00:41 +03:00
MaxOvs19
c62a453e9d Create modal in projects 2023-03-07 18:05:52 +03:00
MaxOvs19
773786cca1 fixed tracker 2023-03-07 16:46:16 +03:00
MaxOvs19
30bb2ac7c0 delite TODO in tracker 2023-03-07 15:50:32 +03:00
MaxOvs19
84a7f267ff Modal ticket finished 2023-03-07 15:44:54 +03:00
MaxOvs19
792b8542c0 Modal - 90% 2023-03-07 15:18:11 +03:00
NikoM1k
c43170bf58
Merge pull request #55 from apuc/tracker
Tracker
2023-03-07 11:41:20 +02:00
8dbeb5bba5 tracker 2023-03-07 12:40:16 +03:00
MaxOvs19
06f6a99b07 Added description in modal 2023-03-06 20:08:39 +03:00