Commit Graph

128 Commits

Author SHA1 Message Date
d83bee2e34 Merge branch 'expand_get_menu' of ssh://git.ma-al.com:8822/goc_daniel/b2b into test 2026-03-31 10:59:15 +02:00
Daniel Goc
8665c566ee added new category error, and some fixes 2026-03-31 10:52:36 +02:00
7bd1c5a9c9 Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into test 2026-03-31 09:33:42 +02:00
ec5ff123ac Merge pull request 'front-styles' (#38) from front-styles into main
Reviewed-on: #38
2026-03-31 07:30:33 +00:00
17317e778c Merge remote-tracking branch 'origin' into front-styles 2026-03-31 09:19:06 +02:00
0e9df17eab Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into test 2026-03-31 09:08:58 +02:00
94291ccc03 Merge pull request 'improved JWTToken update, added list-users endpoint, debug of getCountries' (#37) from list_users into main
Reviewed-on: #37
Reviewed-by: Marek Goc <goc_marek@ma-al.com>
2026-03-31 07:08:15 +00:00
91c5de1f67 fix: menu and routing 2026-03-30 16:39:14 +02:00
Daniel Goc
d0ce65c287 improved JWTToken update, added list-users endpoint, debug of getCountries 2026-03-30 16:19:26 +02:00
68f4850445 'routing, searching, fixes' 2026-03-30 01:04:25 +02:00
9ec329b1d6 fix products listing 2026-03-30 01:02:02 +02:00
ec05101037 fix meilisearch 2026-03-27 02:03:26 +01:00
29260080c2 Merge pull request 'fix top menu embeding struct' (#34) from routing into main
Reviewed-on: #34
2026-03-26 17:44:08 +00:00
9336cdfa28 fix top menu embeding struct 2026-03-26 18:43:23 +01:00
396e25b750 Merge pull request 'fix: routing/data table' (#33) from front-styles into main
Reviewed-on: #33
Reviewed-by: Marek Goc <goc_marek@ma-al.com>
2026-03-26 14:57:40 +00:00
faa990ca9b fix: add product description editing and saving functionality 2026-03-26 15:55:47 +01:00
3246ef4fb7 fix: routing/data table 2026-03-26 15:55:35 +01:00
21bea39e46 Merge pull request 'fix top menu' (#31) from routing into main
Reviewed-on: #31
Reviewed-by: Wiktor Dudzic <dudzic_wiktor@ma-al.com>
2026-03-26 12:53:41 +00:00
94cb8123d5 fix top menu 2026-03-26 13:51:38 +01:00
30c1278254 Merge pull request 'routing' (#30) from routing into main
Reviewed-on: #30
Reviewed-by: Wiktor Dudzic <dudzic_wiktor@ma-al.com>
2026-03-26 12:25:55 +00:00
c09e525736 add top menu 2026-03-26 13:22:10 +01:00
3c6fa077a0 Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into test 2026-03-26 08:18:32 +01:00
ca27cbea1c Merge branch 'routing' 2026-03-26 02:25:22 +01:00
af2b276599 add models generation and josn print 2026-03-26 02:22:14 +01:00
7c5a993623 presta models 2026-03-25 19:09:53 +01:00
fef83eb46b fix: add page cart 2026-03-25 15:56:52 +01:00
96383fce06 Merge remote-tracking branch 'origin' into front-styles 2026-03-25 15:54:00 +01:00
e7a7daa2e3 fix: sorting and filtering 2026-03-25 15:53:33 +01:00
8f37ecbac2 Merge pull request 'debug-session' (#28) from debug-session into main
Reviewed-on: #28
Reviewed-by: Marek Goc <goc_marek@ma-al.com>
2026-03-25 13:15:10 +00:00
Daniel Goc
d38095f912 Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b 2026-03-25 10:42:59 +01:00
Daniel Goc
f81eb84499 some debugging 2026-03-25 10:42:25 +01:00
7be02d1b6c Merge pull request 'test' (#27) from test into main
Reviewed-on: #27
2026-03-25 09:03:06 +00:00
5d1abafdd3 fix: errors 2026-03-25 09:42:09 +01:00
0c448c05c9 fix: product-list 2026-03-25 09:33:39 +01:00
e279899e49 Merge pull request 'filters' (#26) from filters into main
Reviewed-on: #26
2026-03-25 01:53:13 +00:00
e7adddb927 Merge branch 'test' of ssh://git.ma-al.com:8822/goc_daniel/b2b into filters 2026-03-25 02:51:36 +01:00
62aaa23164 update openapi 2026-03-25 02:33:06 +01:00
0f21ed1f81 filters 2026-03-25 02:33:06 +01:00
c13365916c filters 2026-03-25 02:33:06 +01:00
a96efacb3e Merge pull request 'carts' (#25) from carts into main
Reviewed-on: #25
Reviewed-by: Marek Goc <goc_marek@ma-al.com>
2026-03-25 01:32:49 +00:00
9ed1106ff4 filters 2026-03-25 02:23:12 +01:00
fb2bc94a42 filters 2026-03-24 19:16:02 +01:00
e570297011 fix: paginations 2026-03-24 16:13:27 +01:00
bb1cdee3f4 fix: paginations 2026-03-24 16:08:31 +01:00
Daniel Goc
d6fa655c21 add new endpoints 2026-03-24 15:44:31 +01:00
Daniel Goc
defdfc7b06 add carts 2026-03-24 14:47:20 +01:00
Daniel Goc
c464c02301 add carts 2026-03-24 14:46:38 +01:00
bdaf00ce45 Merge pull request 'fix products listing' (#24) from listing into main
Reviewed-on: #24
Reviewed-by: goc_daniel <goc_daniel@ma-al.com>
2026-03-24 13:46:05 +00:00
73cc936d56 fix products listing 2026-03-24 14:39:13 +01:00
3b80fa6dbe Merge branch 'routing' 2026-03-24 13:53:23 +01:00