sdarbinyan 97214c3a90 Merge branch 'back-office-integration' ...

# Conflicts:
#	src/app/pages/cart/cart.component.ts
#	src/app/pages/category/category.component.html
#	src/app/pages/category/category.component.ts
#	src/app/pages/item-detail/item-detail.component.html
#	src/app/pages/item-detail/item-detail.component.ts
#	src/app/pages/legal/company-details/en/company-details-en.component.html
#	src/app/pages/legal/company-details/hy/company-details-hy.component.html
#	src/app/pages/legal/company-details/ru/company-details-ru.component.html
#	src/app/pages/legal/public-offer/en/public-offer-en.component.html
#	src/app/pages/legal/public-offer/ru/public-offer-ru.component.html
#	src/app/pages/search/search.component.ts
#	src/app/services/api.service.ts

2026-03-24 00:18:13 +04:00

..

brands

translated lega

2026-02-28 15:43:22 +04:00

components

Merge branch 'back-office-integration'

2026-03-24 00:18:13 +04:00

config

Merge branch 'back-office-integration'

2026-03-24 00:18:13 +04:00

guards

added language routing system

2026-02-26 22:23:08 +04:00

i18n

integration new apis

2026-03-24 00:09:11 +04:00

interceptors

Merge branch 'back-office-integration'

2026-03-24 00:18:13 +04:00

models

integration new apis

2026-03-24 00:09:11 +04:00

pages

Merge branch 'back-office-integration'

2026-03-24 00:18:13 +04:00

pipes

changes and optimisations

2026-03-06 17:45:34 +04:00

services

Merge branch 'back-office-integration'

2026-03-24 00:18:13 +04:00

types

very first commit

2026-01-18 18:57:06 +04:00

utils

integration new apis

2026-03-24 00:09:11 +04:00

app.config.ts

updates

2026-03-01 02:43:14 +04:00

app.html

Merge branch 'back-office-integration'

2026-03-24 00:18:13 +04:00

app.routes.ts

added language routing system

2026-02-26 22:23:08 +04:00

app.scss

improvments are done

2026-02-19 01:23:25 +04:00

app.ts

created auth system

2026-02-28 17:18:24 +04:00