Skip to content

Check CI/CD#33

Merged
Sawolfer merged 108 commits intomainfrom
dev
Apr 4, 2025
Merged

Check CI/CD#33
Sawolfer merged 108 commits intomainfrom
dev

Conversation

@maksalena
Copy link
Copy Markdown
Collaborator

No description provided.

0ne1ce and others added 30 commits March 28, 2025 15:09
…ted for next merges with AddEventScreen. Some UI bug fixes.
Изменен путь к папке Managers.
…creen

Transition on AddEventScreen with Add button has been added.
* Finance table vc + nav bar and tab bar

* segments on debt screen

* Add modal view for group expense.

* add debt button

* Add transition to madal screen

* refactoring code

* Finance modal (#2)

* Add individual expense modal view logic

* Correct individual modal view logic

* Fix search bar appearance

* remake data struct

* reconstruct data

* debt logic reworked

* person struct update

* fix issues

* move models to root dir

* modify gitignore

---------

Co-authored-by: maksalena <maksalena04@mail.ru>
Co-authored-by: Timur Ibragimov <56789432+tttuuu13@users.noreply.github.com>
Sawolfer and others added 29 commits April 4, 2025 01:19
Add profile and fix design.
#Conflicts:
#	Friends/Models/Person.swift
#	Friends/Screens/EventScreen/EventViewController.swift
* lil fix

* auth
* lil fix

* auth

* UPD passwd

* fixed auth
* lil fix

* auth

* UPD passwd

* fixed auth

* fix user cache
… finance

# Conflicts:
#	Friends/Screens/ViewEventScreen/ViewModel/ViewEventViewModel.swift
@Sawolfer Sawolfer merged commit d117de6 into main Apr 4, 2025
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants