ASWI - Pokročilé softwarové inženýrství » ASWI 2023 » Mobilní aplikace k digitalizovanému inventáři sbírky Rudolfa II. (Kryl) - One team to rule them all

Merge branch 'dev' into 'main'

Released version v2.0

See merge request aswi/aswi-2023/aswi2023one-team-to-rule-them-all!26

Switched to live backend, address fixed
re #10896

Switched to live backend, prebuild run
re #10896

Merge branch 'bug-fixes' into 'dev'

Fixing bugs

See merge request aswi/aswi-2023/aswi2023one-team-to-rule-them-all!25

Merge remote-tracking branch 'origin/Redesign-and-PlanView' into bug-fixes

1. Conflicts:
2. src/components/item/ItemTabBar.tsx
3. src/components/item/ItemView.tsx

re #10917: Zoomable Image, drag, zoom

re #10917: ZoomableImage init

re #10917: ItemView design fix

NEW: KeyboardAvoidingView added for notes
re #10896

Merge remote-tracking branch 'origin/Redesign-and-PlanView' into bug-fixes

1. Conflicts:
2. src/components/item/ItemTabBar.tsx
3. src/components/item/ItemView.tsx

FIX: colors fix
re #10896

FIX: colors fix
re #10896

re #10917 ItemView design fix

Merge branch 'dev' into 'Redesign-and-PlanView'

Merge dev into PlanView

See merge request aswi/aswi-2023/aswi2023one-team-to-rule-them-all!23

Merge dev into PlanView

FIX: checkAuth on homepage added
re #10896

FIX: image resize policy on ItemView
re #10873

Merge branch 'bug-fixes' into 'dev'

Menu design update

See merge request aswi/aswi-2023/aswi2023one-team-to-rule-them-all!22

Merge branch 'Redesign-and-PlanView' into 'dev'

Redesign and plan view

See merge request aswi/aswi-2023/aswi2023one-team-to-rule-them-all!21

re #10895: NoteViewPage: redesign, userRole rights

re #10895: NoteViewPage: Sort refactor

re #10895: ItemView: TabBar refactor

re #10895: ItemView: ItemObjects switching, display color

re #10895: ItemView redesign, refactor

re #10882: CastlePlan: Zoom to selected room