|
|
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 |
|
MaxOvs19
|
00a3fc0941
|
Added styles in modal
|
2023-03-06 17:34:40 +03:00 |
|
MaxOvs19
|
42db13cef8
|
Added modal ticket
|
2023-03-06 12:16:52 +03:00 |
|
|
|
6d113852c4
|
tracker
|
2023-03-03 18:49:02 +03:00 |
|
NikoM1k
|
bc2288e994
|
Merge pull request #54 from apuc/partner-personal-area
Partner personal area
|
2023-03-01 22:40:47 +02:00 |
|
|
|
fceaa1d190
|
new fixes
|
2023-03-01 23:40:23 +03:00 |
|
|
|
28a0c7f843
|
new fixes
|
2023-03-01 00:28:58 +03:00 |
|
NikoM1k
|
b568ec699e
|
Merge pull request #53 from apuc/partner-personal-area
partner-personal-area
|
2023-02-27 15:58:52 +02:00 |
|
|
|
f4fb2d857a
|
partner-personal-area
|
2023-02-27 16:57:33 +03:00 |
|
NikoM1k
|
fee74ff25b
|
Merge pull request #52 from apuc/partner-personal-area
Partner personal area
|
2023-02-27 15:52:57 +02:00 |
|
|
|
9f96ce6167
|
Merge branch 'main' into partner-personal-area
|
2023-02-27 16:50:52 +03:00 |
|
|
|
31cc5acbe1
|
partner-personal-area
|
2023-02-27 16:50:32 +03:00 |
|
|
|
760949f39a
|
Merge remote-tracking branch 'origin/main' into main
|
2023-02-27 14:08:09 +03:00 |
|
|
|
15ed4b8c1d
|
partner bid page
|
2023-02-23 14:57:26 +03:00 |
|
NikoM1k
|
21423e7dc4
|
Merge pull request #51 from apuc/partner-personal-area
personal area partner with fixes report
|
2023-02-21 18:05:36 +02:00 |
|
|
|
e26b8cc22e
|
personal area partner with fixes report
|
2023-02-21 19:05:04 +03:00 |
|
NikoM1k
|
740659e1f1
|
Merge pull request #50 from apuc/fixes-report
fixes
|
2023-02-17 14:20:30 +02:00 |
|
|
|
6b5eeb2942
|
fixes
|
2023-02-17 15:19:49 +03:00 |
|
NikoM1k
|
4da9497531
|
Merge pull request #49 from apuc/change-month
change calendar month
|
2023-02-09 19:49:18 +02:00 |
|
|
|
a2e768e5c0
|
change calendar month
|
2023-02-09 20:46:02 +03:00 |
|
|
|
dbfab55bd3
|
Merge remote-tracking branch 'origin/main' into main
# Conflicts:
# package-lock.json
|
2023-02-07 18:39:05 +03:00 |
|
|
|
df1e8707d1
|
Удалил старые запросы к апи, переписал страницу тестов на новый конструктор запроса. Обновил библиотеки, в том числе реакт до последней версии, переписал устаревший код с библиотек.
|
2023-02-07 18:38:23 +03:00 |
|
NikoM1k
|
59a85c1c7a
|
Merge pull request #48 from apuc/add-calendar-fixes
dataPicker on reportPage
|
2023-02-07 14:11:56 +02:00 |
|
|
|
b10d6bc326
|
dataPicker on reportPage
|
2023-02-07 15:11:11 +03:00 |
|
Z1chi
|
cc8ef27ec0
|
Merge pull request #47 from apuc/quiz-refactor
Удалил старые запросы к апи, переписал страницу тестов на новый конст…
|
2023-02-02 18:12:32 +03:00 |
|
|
|
c60e1b43d2
|
Удалил старые запросы к апи, переписал страницу тестов на новый конструктор запроса. Обновил библиотеки, в том числе реакт до последней версии, переписал устаревший код с библиотек.
|
2023-02-02 18:10:44 +03:00 |
|
|
|
f1628e5745
|
git ignore
|
2023-01-30 16:55:53 +03:00 |
|
Z1chi
|
fc7211f154
|
Merge pull request #46 from apuc/webpack-5
Webpack 5
|
2023-01-25 17:20:55 +03:00 |
|
|
|
a26693f94a
|
fixs, Убрал стейты для формы авторизации, переписал на форм дату
|
2023-01-25 17:17:57 +03:00 |
|
|
|
80316d3ba8
|
Merge branch 'main' into webpack-5
# Conflicts:
# src/components/ProfileCalendar/ProfileCalendar.js
# src/hooks/useRequest.js
|
2023-01-25 16:52:34 +03:00 |
|
|
|
5c8a8160bd
|
fixs, Убрал стейты для формы авторизации, переписал на форм дату
|
2023-01-25 16:50:36 +03:00 |
|
NikoM1k
|
84b2ceb355
|
Merge pull request #45 from apuc/viewReportPage
preLoader and validate report form
|
2023-01-24 18:23:18 +02:00 |
|
|
|
df7587e048
|
preLoader and validate report form
|
2023-01-24 19:22:16 +03:00 |
|
NikoM1k
|
5c1dbd0922
|
Merge pull request #44 from apuc/viewReportPage
preLoader and validate report form
|
2023-01-24 18:12:01 +02:00 |
|
|
|
ffae420834
|
preLoader and validate report form
|
2023-01-24 19:11:24 +03:00 |
|
NikoM1k
|
7e97b20341
|
Merge pull request #43 from apuc/viewReportPage
switch report date
|
2023-01-23 23:09:42 +02:00 |
|
|
|
0cae63237f
|
switch report date
|
2023-01-24 00:08:42 +03:00 |
|
NikoM1k
|
da75e68af9
|
Merge pull request #42 from apuc/viewReportPage
View report page
|
2023-01-23 22:52:05 +02:00 |
|
|
|
52e7df0e7b
|
switch report date
|
2023-01-23 23:51:18 +03:00 |
|
|
|
50f33071bb
|
change media patch
|
2023-01-23 15:25:29 +03:00 |
|
|
|
a64d2afcb1
|
change media patch
|
2023-01-23 15:24:16 +03:00 |
|
