Skip to content
Snippets Groups Projects
Commit 45033026 authored by Harry Linrui Xu's avatar Harry Linrui Xu
Browse files

Merge branch 'master' into 'frontend-testing' 

# Conflicts:
#   src/main/java/no/ntnu/idatt1002/demo/controller/AddExpenseController.java
#   src/main/java/no/ntnu/idatt1002/demo/controller/AddIncomeController.java
#   src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java
#   src/main/java/no/ntnu/idatt1002/demo/controller/ExpensesController.java
#   src/main/java/no/ntnu/idatt1002/demo/controller/IncomeController.java
#   src/main/java/no/ntnu/idatt1002/demo/controller/MainMenuController.java
#   src/main/resources/Budget/Budget.budget
#   src/main/resources/Economics/Expense.register
#   src/main/resources/Economics/Income.register
#   src/main/resources/view/BudgetNew.fxml
#   src/main/resources/view/Expenses.fxml
parents 8b2872fb 757d85dd
No related branches found
No related tags found
8 merge requests!43Merging frontend-testing into master,!38"Made progressbar dynamic in accordance to spending. Added balance field....,!37Made the sub progress bars respond to changes in expense,!32Added input validation to add dialog boxes.,!30Redesigned scenes,!29Redesigned scenes,!28Redesigned scenes,!26Redesigned Main menu and expense/income windows
Pipeline #214057 passed
Stage: build
Stage: test
Stage: package
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment