Commit Graph

326 Commits

Author SHA1 Message Date
e961967a49 Merge remote-tracking branch 'refs/remotes/origin/front-styles' into front-styles 2026-04-02 15:28:00 +02:00
Daniel Goc
a4eb3b52cf change incoming HTML to HTML4 2026-04-02 15:24:34 +02:00
0ed9d792b6 feat: roles, permissions 2026-04-02 15:06:00 +02:00
7c69d56a48 fix: style 2026-04-02 14:24:00 +02:00
Daniel Goc
395d670298 add storage to .gitignore 2026-04-02 14:00:58 +02:00
Daniel Goc
7d4242abb1 move path to params 2026-04-02 13:52:50 +02:00
1494af985a Merge branch 'front-styles' of ssh://git.ma-al.com:8822/goc_daniel/b2b into translate 2026-04-02 11:42:43 +02:00
9513feba37 fix: style 2026-04-02 11:42:12 +02:00
551b5ef77d fix: translations 2026-04-02 11:41:44 +02:00
a7f69c854a Merge remote-tracking branch 'refs/remotes/origin/front-styles' into front-styles 2026-04-02 11:32:26 +02:00
Daniel Goc
9c7eb5ee4e Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into storage 2026-04-02 11:31:39 +02:00
Daniel Goc
833f4a5a07 deleting and uploading files 2026-04-02 11:26:58 +02:00
Daniel Goc
2bfe97f6fe bugfix 2026-04-02 10:38:19 +02:00
Daniel Goc
b9bc121d43 getting to upload 2026-04-02 10:27:14 +02:00
7e8e9897e1 fix: button showProduct 2026-04-02 09:01:26 +02:00
9c8ce43998 Merge branch 'front-styles' of ssh://git.ma-al.com:8822/goc_daniel/b2b into translate 2026-04-02 08:56:55 +02:00
3652a78783 fix: button showProduct 2026-04-02 08:56:31 +02:00
ecf51e92e8 fix: button showProduct 2026-04-02 08:56:05 +02:00
d0c055a819 fix: select for languages 2026-04-02 08:52:29 +02:00
272c6066fb Merge branch 'front-styles' of ssh://git.ma-al.com:8822/goc_daniel/b2b into translate 2026-04-01 16:19:36 +02:00
79730eb826 fix: save product descriptions 2026-04-01 16:19:02 +02:00
6846ffc0dc fix: sidebar 2026-04-01 16:16:03 +02:00
d8f71bd8ff Merge remote-tracking branch 'origin/translate' into front-styles 2026-04-01 13:42:00 +02:00
aa57d38bd6 fix: selects 2026-04-01 13:41:21 +02:00
f9ae1e491e fix: translate 2026-04-01 13:40:56 +02:00
Daniel Goc
b2acb8c922 storage 2026-04-01 13:30:54 +02:00
8bf5a1cf8b Merge branch 'front-styles' of ssh://git.ma-al.com:8822/goc_daniel/b2b into translate 2026-04-01 10:53:49 +02:00
b48a143b40 fix: default lang 2026-04-01 10:52:34 +02:00
729b54ca1a fix: currency/county 2026-04-01 10:52:08 +02:00
980fb1543b Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into translate 2026-04-01 09:36:56 +02:00
b829bf2185 fix: translate 2026-04-01 09:36:01 +02:00
cf4d14a3cb Merge pull request 'front-styles' (#44) from front-styles into main
Reviewed-on: #44
2026-04-01 07:32:26 +00:00
30eb82ba53 fix: categories 2026-04-01 09:10:38 +02:00
a2a2c35ab3 Merge remote-tracking branch 'origin' into front-styles 2026-04-01 09:10:18 +02:00
Daniel Goc
03f04b2f53 Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into user_teleport 2026-03-31 16:57:44 +02:00
Daniel Goc
55da953f32 add teleporting 2026-03-31 16:56:05 +02:00
684f910090 Merge pull request 'expand_get_menu' (#42) from expand_get_menu into main
Reviewed-on: #42
Reviewed-by: Marek Goc <goc_marek@ma-al.com>
2026-03-31 14:55:35 +00:00
5feaa9e15c Merge remote-tracking branch 'origin/expand_get_menu' into front-styles 2026-03-31 14:34:14 +02:00
Daniel Goc
04e2549a66 missing / in ImageLink 2026-03-31 14:30:47 +02:00
6428ddb527 Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into product-procedures 2026-03-31 13:42:27 +02:00
d6066e39ce Merge branch 'front-styles' of ssh://git.ma-al.com:8822/goc_daniel/b2b into translate 2026-03-31 12:49:25 +02:00
fb4f7048ab fix: requests 2026-03-31 12:44:02 +02:00
Daniel Goc
a3f01eca7c misspell fix 2026-03-31 12:27:31 +02:00
12f6249721 fix: requests 2026-03-31 12:22:21 +02:00
Daniel Goc
1fa6206b75 update openapi and add the exists_in_database flag to get-product 2026-03-31 12:00:30 +02:00
Daniel Goc
fa89723eb6 add get-breadcrumb endpoint 2026-03-31 11:40:57 +02:00
Daniel Goc
8665c566ee added new category error, and some fixes 2026-03-31 10:52:36 +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
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