Commit Graph

938 Commits

Author SHA1 Message Date
Victor Batischev dea1eb6104 resolve 2024-04-22 17:03:14 +03:00
Victor Batischev ee20b49993 fix total hours 2024-04-22 17:01:37 +03:00
Victor Batischev 0e04e19c1b total day hours 2024-04-22 17:00:37 +03:00
nikita.gubar bd4bfacd66 Add Cards in Profile 2024-04-22 16:19:40 +03:00
nik.polishuk 1bdabd32bf Merge pull request 'landing' (#35) from landing into main
Reviewed-on: #35
2024-04-22 16:04:48 +03:00
victorbatischev 2d861de330 Merge pull request 'fixed/components' (#34) from fixed/components into main
Reviewed-on: #34
2024-04-22 14:05:18 +03:00
MaxOvs19 60aa8c7301 Merge branch 'main' of https://git.itguild.info/apuc/guild_front into fixed/components 2024-04-18 18:11:40 +03:00
Mikola 13df697614 stack projects 2024-04-18 16:42:54 +03:00
Mikola 79299d1177 stack projects 2024-04-18 16:42:18 +03:00
nik.polishuk 68a2df23c4 Merge pull request 'landing' (#33) from landing into main
Reviewed-on: #33
2024-04-18 15:27:03 +03:00
Mikola 291e6a4a5d landing footer 2024-04-17 18:58:54 +03:00
Mikola 0d436e71e4 landing footer 2024-04-17 18:58:39 +03:00
Mikola 7a55188904 stack 2024-04-17 18:54:45 +03:00
Mikola 3e80159c44 stack 2024-04-17 18:51:27 +03:00
nik.polishuk 363d43e04c Merge pull request 'landing' (#32) from landing into main
Reviewed-on: #32
2024-04-16 17:04:03 +03:00
Mikola a1da184bb0 Merge branch 'main' into landing
# Conflicts:
#	src/pages/roles/GuestPage.jsx
2024-04-16 17:02:36 +03:00
Mikola 066cd569d3 landing 2024-04-16 17:01:13 +03:00
Mikola 86a784bee2 landing 2024-04-16 17:00:44 +03:00
MaxOvs19 adf6ff4a1d Start fix table 2024-04-15 22:34:33 +03:00
MaxOvs19 9ffb981b67 Merge pull request 'fixed/components' (#31) from fixed/components into main
Reviewed-on: #31
2024-04-15 21:11:57 +03:00
MaxOvs19 0860591d28 Merge branch 'main' of https://git.itguild.info/apuc/guild_front into fixed/components 2024-04-15 21:09:17 +03:00
nikita.gubar 4a20d5e4fa WelcomePage fix 2024-04-15 16:21:41 +03:00
MaxOvs19 1434792d42 Fixed tracker card 2024-04-11 22:24:08 +03:00
MaxOvs19 ade31b767a Merge branch 'main' of https://git.itguild.info/apuc/guild_front into fixed/components 2024-04-11 21:06:34 +03:00
nikita.gubar fafab29d25 Add welcome to the registration 2024-04-11 16:22:03 +03:00
MaxOvs19 10ffb1f7f1 Create new component TrackerTagList 2024-04-09 21:09:06 +03:00
MaxOvs19 75cf13d945 Merge branch 'main' of https://git.itguild.info/apuc/guild_front into fixed/components 2024-04-08 21:17:56 +03:00
MaxOvs19 a3e39b75d8 Create new component 2024-04-08 21:05:33 +03:00
nikita.gubar 271374b6c6 + 2024-04-08 04:32:56 +03:00
nikita.gubar 811ef4f69d remake layout report for day 2024-04-08 04:30:59 +03:00
MaxOvs19 c532302f73 Delete new component 2024-04-05 22:09:20 +03:00
MaxOvs19 36bdaf15e5 Merge branch 'main' of https://git.itguild.info/apuc/guild_front into fixed/components 2024-04-05 21:35:19 +03:00
nik.polishuk 7400319650 Merge pull request 'partner categories table' (#30) from table-pagination into main
Reviewed-on: #30
2024-04-05 16:14:55 +03:00
Mikola 7580006e05 partner categories table 2024-04-05 16:11:46 +03:00
nikita.gubar 93d5ab015a Merge branch 'main' of https://git.itguild.info/apuc/guild_front 2024-04-04 17:32:36 +03:00
nikita.gubar 90274e8b17 Redesign calendar 2024-04-04 17:31:28 +03:00
MaxOvs19 9f98a0fea2 start fix tracker 2024-04-02 20:49:52 +03:00
MaxOvs19 1e950e9de0 Merge branch 'main' of https://git.itguild.info/apuc/guild_front into fixed/components 2024-04-02 20:04:21 +03:00
Victor Batischev a3bcfc7cf7 fix 2024-04-02 18:29:29 +03:00
Victor Batischev 140d4689fe fix project cards 2024-04-02 18:29:03 +03:00
kirill boyko b19e00d98f Merge branch 'main' of https://git.itguild.info/apuc/guild_front into main 2024-04-02 17:48:38 +03:00
MaxOvs19 3580e25457 Fixed modal 2024-04-01 20:41:29 +03:00
kirill boyko 9a0364e686 com 2024-03-31 20:40:54 +03:00
nik.polishuk 3e54f947b4 Merge pull request 'table-pagination' (#29) from table-pagination into main
Reviewed-on: #29
2024-03-31 20:39:59 +03:00
Mikola 35f76abe60 all tasks table 2024-03-31 20:38:16 +03:00
Mikola caaee74810 all tasks table 2024-03-31 20:38:01 +03:00
nikita.gubar c9dafd95a9 layout tracker 2024-03-22 16:31:59 +03:00
nikita.gubar c14590a0cb Editing columns, fix addition of participants,
commenting catalog
2024-03-20 12:59:52 +03:00
Victor Batischev 5ad50a8ed0 Merge branch 'main' of https://git.itguild.info/apuc/guild_front 2024-03-19 16:58:36 +03:00
Victor Batischev 56344fa26e fix naming 2024-03-19 16:58:26 +03:00