|
|
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 |
|
MaxOvs19
|
ce939e6322
|
Finished fixed modal
|
2023-05-05 16:10:25 +03:00 |
|
MaxOvs19
|
f32a8f64e5
|
delete modal create, and fixed modal add
|
2023-05-05 14:48:45 +03:00 |
|
|
|
d8a7eb55f5
|
tracker-connect
|
2023-05-05 00:50:48 +03:00 |
|
|
|
2fec7f4d28
|
Merge branch 'main' into tracker-connect-back
|
2023-05-04 18:43:08 +03:00 |
|
|
|
8787ebd07a
|
tracker hover fix
|
2023-05-04 18:42:55 +03:00 |
|
MaxOvs19
|
7667de9b8b
|
pull in main
|
2023-05-04 18:38:56 +03:00 |
|
MaxOvs19
|
87fb04e422
|
Fixed modalSelect
|
2023-05-04 09:49:39 +03:00 |
|
|
|
efca4f0818
|
tracker hover fix
|
2023-05-03 20:26:09 +03:00 |
|
|
|
cd732dcc9d
|
tracker-connect-back
|
2023-05-03 20:01:23 +03:00 |
|
MaxOvs19
|
553ac3e75d
|
Fixed state modal
|
2023-05-03 16:47:20 +03:00 |
|
|
|
fd49f9df68
|
tracker-connect-back
|
2023-05-02 21:02:36 +03:00 |
|
MaxOvs19
|
43acfe2b79
|
Fixed conflict
|
2023-05-02 20:29:10 +03:00 |
|
|
|
3aaab67a97
|
tracker-connect-back
|
2023-05-02 19:41:51 +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 |
|
|
|
9c08b0f24f
|
fix path
|
2023-04-27 21:22:48 +03:00 |
|
|
|
c2ca9eb373
|
fix
|
2023-04-27 21:19:34 +03:00 |
|
|
|
c1f1cf8879
|
frequently-asked-questions page
|
2023-04-27 21:15:55 +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
|
256e9cf0b7
|
Fixed Auth
|
2023-04-27 12:46:18 +03:00 |
|
MaxOvs19
|
8553adcf08
|
Fixed catalog pages and added modal
|
2023-04-26 21:29:50 +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 |
|
|
|
dd03bcb47c
|
edit request
|
2023-04-21 01:07:09 +03:00 |
|
MaxOvs19
|
cb79f3c063
|
Added fullScreen ticket
|
2023-04-20 20:10:08 +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 |
|
|
|
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
|
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 |
|
|
|
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 |
|
|
|
2b65b42494
|
fixes
|
2023-04-10 18:12:36 +03:00 |
|
|
|
2e13c16c27
|
select skills on partnerRequest
|
2023-04-09 05:05:33 +03:00 |
|
MaxOvs19
|
943bc1abea
|
Added page in free worker
|
2023-04-07 21:49:09 +03:00 |
|
|
|
ccab602ae4
|
fixes
|
2023-04-05 19:38:38 +03:00 |
|
|
|
4e61ea043d
|
candidate auth
|
2023-04-04 19:07:19 +03:00 |
|
MaxOvs19
|
8bd7bb7535
|
Fixed settings page and modals
|
2023-04-03 14:37:27 +03:00 |
|
|
|
615606d3e6
|
new tracker
|
2023-03-30 15:07:05 +03:00 |
|
|
|
c1eb60d3ab
|
Merge remote-tracking branch 'origin/parthners-area-fix-modal' into parthners-area
|
2023-03-28 14:42:58 +03:00 |
|
MaxOvs19
|
76334aec99
|
Fixed auth page and tracker
|
2023-03-27 19:08:01 +03:00 |
|
|
|
5f4dc3a5f2
|
partner catalog and no requests block
|
2023-03-27 16:03:24 +03:00 |
|
MaxOvs19
|
fc51fbdb09
|
Added func create new tiket
|
2023-03-24 19:26:27 +03:00 |
|
MaxOvs19
|
a21063663c
|
Fixed modal
|
2023-03-23 21:18:48 +03:00 |
|
|
|
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 |
|
|
|
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
|
3a65009ec9
|
Finished this page
|
2023-03-17 20:02:53 +03:00 |
|
|
|
c12d00872a
|
partners-area
|
2023-03-17 14:29:00 +03: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 |
|
|
|
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
|
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
|
a11c85ad14
|
Work of sidebar finished
|
2023-03-09 18:44:31 +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
|
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 |
|
|
|
8dbeb5bba5
|
tracker
|
2023-03-07 12:40:16 +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 |
|
|
|
fceaa1d190
|
new fixes
|
2023-03-01 23:40:23 +03:00 |
|
|
|
28a0c7f843
|
new fixes
|
2023-03-01 00:28:58 +03:00 |
|
|
|
31cc5acbe1
|
partner-personal-area
|
2023-02-27 16:50:32 +03:00 |
|
|
|
15ed4b8c1d
|
partner bid page
|
2023-02-23 14:57:26 +03:00 |
|
|
|
e26b8cc22e
|
personal area partner with fixes report
|
2023-02-21 19:05:04 +03:00 |
|
|
|
6b5eeb2942
|
fixes
|
2023-02-17 15:19:49 +03:00 |
|
|
|
c60e1b43d2
|
Удалил старые запросы к апи, переписал страницу тестов на новый конструктор запроса. Обновил библиотеки, в том числе реакт до последней версии, переписал устаревший код с библиотек.
|
2023-02-02 18:10:44 +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 |
|
|
|
df7587e048
|
preLoader and validate report form
|
2023-01-24 19:22:16 +03:00 |
|
|
|
ffae420834
|
preLoader and validate report form
|
2023-01-24 19:11:24 +03:00 |
|
|
|
0cae63237f
|
switch report date
|
2023-01-24 00:08:42 +03:00 |
|
|
|
52e7df0e7b
|
switch report date
|
2023-01-23 23:51:18 +03:00 |
|
|
|
107a00b915
|
view ReportPage
|
2023-01-23 14:59:57 +03:00 |
|
|
|
56f63dbed2
|
Переписываю спорные решения
Фикс отправки отчета, проверка на массив в map в Description.js
|
2023-01-20 16:20:06 +03:00 |
|
|
|
642a8a9641
|
фиксы
|
2023-01-18 17:37:52 +03:00 |
|
|
|
6b0b5e991c
|
Переписываю спорные решения
Фикс отправки отчета, проверка на массив в map в Description.js
|
2023-01-17 22:14:05 +03:00 |
|
|
|
d4fc723b25
|
Merge branch 'profileCalendar' into profilePage
|
2023-01-16 20:43:04 +03:00 |
|
|
|
907f3e830d
|
Переписываю спорные решения
|
2023-01-16 20:42:27 +03:00 |
|
|
|
50ab182135
|
fixes styles and routes
|
2023-01-16 20:38:33 +03:00 |
|
|
|
549e0eac74
|
Переписываю спорные решения
|
2023-01-16 19:57:55 +03:00 |
|
|
|
794a5fa44e
|
Merge branch 'profileCalendar' into profilePage
# Conflicts:
# src/App.js
# src/components/ProfileCalendar/ProfileCalendar.js
# src/components/ReportForm/ReportForm.js
# src/pages/Profile.js
|
2023-01-16 19:20:49 +03:00 |
|
|
|
1d8b30370d
|
Переписываю спорные решения
|
2023-01-16 19:12:44 +03:00 |
|
|
|
087a3a2eb8
|
calendar and styles fixes
|
2023-01-16 16:39:53 +03:00 |
|
|
|
50aae595e3
|
calendar and styles fixes
|
2023-01-16 16:39:33 +03:00 |
|
|
|
e15ce861a3
|
Переписываю спорные решения
|
2023-01-16 15:30:04 +03:00 |
|
|
|
6f6ab5c4ce
|
Переписываю спорные решения
|
2023-01-16 15:24:08 +03:00 |
|
|
|
6315a4e7bb
|
new design calendar and report
|
2023-01-13 15:53:07 +03:00 |
|
|
|
75de4983c9
|
Переписываю спорные решения
|
2023-01-13 13:02:48 +03:00 |
|
|
|
1234427b12
|
Убираю варнинги при сборке, прохожусь притером, сокращаю код
|
2023-01-10 18:48:02 +03:00 |
|
|
|
c4d44e3855
|
Подключил шрифты
|
2023-01-09 20:53:23 +03:00 |
|
|
|
4c636c424a
|
profilePage
|
2023-01-09 18:04:06 +03:00 |
|
|
|
731244905f
|
profilePage
|
2023-01-09 17:47:04 +03:00 |
|
|
|
3238bf221c
|
git fetch
|
2023-01-03 01:03:12 +03:00 |
|
|
|
cabd01ca43
|
profilePage
|
2022-12-28 09:45:26 +03:00 |
|
|
|
d81110d7d5
|
change profile
|
2022-12-26 15:12:01 +03:00 |
|
|
|
f2962a7317
|
Merge branch 'documents'
|
2022-05-27 19:13:06 +03:00 |
|
|
|
e9e3880ad3
|
quiz
|
2022-05-27 14:39:05 +03:00 |
|
|
|
f7367dbdf2
|
quiz page
|
2022-03-18 16:39:13 +03:00 |
|
m1kolay
|
9f1179db39
|
add documents
|
2022-02-11 15:34:31 +02:00 |
|
kurpfish
|
d4ec833a31
|
calendar routes
|
2021-12-07 09:58:19 +02:00 |
|
kurpfish
|
4629bc74a9
|
reports create, refactoring
|
2021-11-30 16:00:58 +02:00 |
|
kurpfish
|
2bc1fb3570
|
single report page and mobile avatar fix
|
2021-09-28 12:46:16 +03:00 |
|
kurpfish
|
3a01fce386
|
form page loader
|
2021-08-25 13:27:54 +03:00 |
|
kurpfish
|
11616b8a38
|
redirect to auth
|
2021-08-24 13:17:13 +03:00 |
|
kurpfish
|
1a19ae5160
|
form page footer fix and candidates empty list message
|
2021-08-23 17:36:28 +03:00 |
|
kurpfish
|
7891dccb59
|
logout fixes with role redirect
|
2021-08-20 17:33:29 +03:00 |
|
kurpfish
|
b7463dc44e
|
form page mobile
|
2021-08-19 17:36:53 +03:00 |
|
kurpfish
|
3ce8e17645
|
footer changed
|
2021-08-18 18:16:57 +03:00 |
|
kurpfish
|
288f060575
|
interview page and design fixes
|
2021-08-18 15:56:24 +03:00 |
|
kurpfish
|
f0a92fd8f2
|
logout, hover transition and small fixes
|
2021-08-09 15:10:12 +03:00 |
|
Hope87
|
082ae23f49
|
add form page
|
2021-07-03 17:37:30 +03:00 |
|
Hope87
|
c44c1fe27c
|
fixed code
|
2021-07-02 16:02:47 +03:00 |
|
Hope87
|
e90414b6b9
|
add redux
|
2021-06-30 17:21:55 +03:00 |
|
Hope87
|
800dc0f48c
|
fixed code
|
2021-06-29 17:58:15 +03:00 |
|
Hope87
|
169ffedb01
|
finished calendar mobile page
|
2021-06-21 17:41:26 +03:00 |
|
Hope87
|
6de87cae14
|
start calendar page
|
2021-06-16 17:51:25 +03:00 |
|
Hope87
|
0c3d99f039
|
add filter
|
2021-06-01 17:28:09 +03:00 |
|
Hope87
|
af21ce3693
|
fixed select component
|
2021-05-31 18:23:25 +03:00 |
|
Hope87
|
844cc7f9df
|
add second page
|
2021-05-31 13:40:49 +03:00 |
|
Hope87
|
c9d216558e
|
finished home page
|
2021-05-26 17:41:11 +03:00 |
|
Hope87
|
f772d1c0fa
|
first commit
|
2021-05-26 13:35:57 +03:00 |
|
