|
|
a35d2e05c7
|
Merge branch 'LabWork_8' into LabWork_8_hard
# Conflicts:
# SushiBar/SushiBar/FormMails.cs
# SushiBar/SushiBar/FormMain.Designer.cs
# SushiBar/SushiBar/Program.cs
# SushiBar/SushiBarContracts/BindingModels/MessageInfoBindingModel.cs
# SushiBar/SushiBarContracts/ViewModels/MessageInfoViewModel.cs
# SushiBar/SushiBarDatabaseImplement/Models/Order.cs
# SushiBar/SushiBarDatabaseImplement/Models/Sushi.cs
# SushiBar/SushiBarFileImplement/Models/Message.cs
# SushiBar/SushibarListImplement/Models/Message.cs
|
2023-05-05 09:32:57 +04:00 |
|
|
|
3ba1703499
|
Complete lab 7 hard
|
2023-05-05 01:49:24 +04:00 |
|
|
|
d20613c3bb
|
Merge branch 'LabWork_7' into LabWork_7_hard
# Conflicts:
# SushiBar/SushiBar.sln
# SushiBar/SushiBar/FormMain.Designer.cs
# SushiBar/SushiBar/FormMain.cs
# SushiBar/SushiBarBusinessLogic/BusinessLogics/OrderLogic.cs
# SushiBar/SushiBarDatabaseImplement/Migrations/20230425050030_lab5hard.Designer.cs
# SushiBar/SushiBarFileImplement/DataFileSingleton.cs
# SushiBar/SushiBarRestApi/Controllers/ImplementerController.cs
# SushiBar/SushiBarRestApi/Program.cs
|
2023-05-04 23:41:52 +04:00 |
|
|
|
a1fd4cff58
|
Merge branch 'LabWork_6' into LabWork_6_hard
# Conflicts:
# SushiBar/SushiBar/FormMain.Designer.cs
# SushiBar/SushiBar/FormMain.cs
# SushiBar/SushiBarBusinessLogic/BusinessLogics/OrderLogic.cs
# SushiBar/SushiBarDatabaseImplement/SushiBarDatabase.cs
# SushiBar/SushiBarFileImplement/DataFileSingleton.cs
# SushiBar/SushibarListImplement/DataListSingleton.cs
|
2023-05-04 16:55:53 +04:00 |
|
|
|
be38e23ab5
|
Merge branch 'LabWork_5' into LabWork_5_hard
# Conflicts:
# SushiBar/SushiBar/FormMain.Designer.cs
# SushiBar/SushiBar/Program.cs
# SushiBar/SushiBarDatabaseImplement/SushiBarDatabase.cs
|
2023-04-24 21:59:30 +04:00 |
|
|
|
fe06793f3c
|
Back up and dm
|
2023-04-24 21:25:09 +04:00 |
|
|
|
2c4cb0dbb2
|
Complete lab 7
|
2023-04-24 00:10:19 +04:00 |
|
|
|
6c683db8e9
|
Fix errors and add database impl
|
2023-04-23 19:14:04 +04:00 |
|
|
|
8e73008033
|
Merge branch 'LabWork_4' into LabWork_4_hard
# Conflicts:
# SushiBar/SushiBar/FormMain.Designer.cs
# SushiBar/SushiBar/FormMain.cs
# SushiBar/SushiBar/Program.cs
|
2023-04-10 22:16:15 +04:00 |
|
|
|
bbf06c417e
|
complete lab work
|
2023-04-10 15:36:30 +04:00 |
|
|
|
003c54db7d
|
Add implementer
|
2023-04-09 23:25:46 +04:00 |
|
|
|
d8422b1ef1
|
Complete hard lab 3
|
2023-03-28 10:06:56 +04:00 |
|
|
|
c46aebdc08
|
Complete hard lab 3
|
2023-03-27 19:12:26 +04:00 |
|
|
|
bf2b86f897
|
complete lab 5
|
2023-03-27 16:31:19 +04:00 |
|
|
|
242352a50b
|
Add Client to storage filters
|
2023-03-26 17:19:08 +04:00 |
|
|
|
87f51db748
|
Database: add clients
|
2023-03-26 17:10:29 +04:00 |
|
|
|
55c5aedfd2
|
ready lab work
|
2023-03-14 10:12:32 +04:00 |
|
|
|
45235c7a82
|
add database
|
2023-02-27 17:07:02 +04:00 |
|
