|
|
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 |
|
|
|
6c683db8e9
|
Fix errors and add database impl
|
2023-04-23 19:14:04 +04:00 |
|
|
|
d075650fc4
|
Add configs and MessageInfo
|
2023-04-21 18:57:07 +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 |
|
|
|
055e45b191
|
second part lab work
|
2023-04-10 13:35:57 +04:00 |
|
|
|
003c54db7d
|
Add implementer
|
2023-04-09 23:25:46 +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 |
|
|
|
5c55c2584c
|
Add Client models
|
2023-03-26 16:43:18 +04:00 |
|
|
|
56ad2da264
|
Report Logic
|
2023-03-12 20:56:37 +04:00 |
|
|
|
ae4eef9254
|
add new models for store
|
2023-02-13 15:18:58 +04:00 |
|
|
|
3e25205bf6
|
Switch product to sushi
|
2023-01-30 18:27:32 +04:00 |
|
|
|
a87d95c92b
|
Add Models and Contracts
|
2023-01-30 18:15:58 +04:00 |
|
