Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development Progress - week 01 #46

Merged
merged 15 commits into from
Jun 4, 2023
Merged

Development Progress - week 01 #46

merged 15 commits into from
Jun 4, 2023

Conversation

rayapetkova
Copy link
Collaborator

Merging changes from Experimental to Development

rayapetkova and others added 7 commits May 29, 2023 23:50
- Added all photos
- Made one common function in pyqt5-gui - main_menu_dev
 - changes from main_menu_dev transfered to main_menu file (@rayapetkova ac3d5f8)
 - new subcategories window call with one single function
 - top layout buttons size changed (fixed heigth)
 - relantionship between files fixed (main > login/register > main_menu > subcategories)
 - code cleaning/refactoring

Co-Authored-By: Raya Petkova <[email protected]>
Merge `raya_development` with `experimental`
Merge `alex_development` into `experimental`
Copy link
Member

@karastoyanov karastoyanov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes from previous personal branches are approved.

⚠️ Check the last meeting notes and proceed working on experimental branch

 - update user settings groupbox/layout added
 - on call, categories groupbox is being removed and user settings
   replaces it
karastoyanov

This comment was marked as resolved.

karastoyanov and others added 3 commits June 3, 2023 11:17
- Added 3 subcategories for the category Food - Meat, Fruits, Vegetables (forgot to do it the last time)
- Added a new image for a background to the subcategories menu
@karastoyanov karastoyanov changed the title 🚧[Work In Progress] Development Progress - week 01 Development Progress - week 01 Jun 4, 2023
@karastoyanov karastoyanov merged commit 8fb835e into development Jun 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request maintenance Maintenance
Projects
Development

Successfully merging this pull request may close these issues.

3 participants