|
|
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 |
|
|
|
3db1002d0f
|
Edit logics files
|
2023-04-23 19:30:07 +04:00 |
|
|
|
003c54db7d
|
Add implementer
|
2023-04-09 23:25:46 +04:00 |
|
|
|
665aaab1a6
|
additional class for store
|
2023-02-13 15:35:09 +04:00 |
|
|
|
10a579904a
|
add listImplenets
|
2023-01-30 23:13:26 +04:00 |
|
