|
|
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 |
|
|
|
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 |
|
|
|
242352a50b
|
Add Client to storage filters
|
2023-03-26 17:19:08 +04:00 |
|
|
|
92139ca325
|
Add client to order
|
2023-03-26 17:15:42 +04:00 |
|
|
|
48e89f3b9f
|
Delete .idea
|
2023-03-15 21:43:56 +04:00 |
|
|
|
55c5aedfd2
|
ready lab work
|
2023-03-14 10:12:32 +04:00 |
|
|
|
b9747e4e18
|
b_logic + contracts
|
2023-03-12 20:49:40 +04:00 |
|
|
|
40a93a182a
|
2 hard lab
|
2023-03-11 21:23:26 +04:00 |
|
|
|
16d53bc9ec
|
Complete
|
2023-02-13 19:08:26 +04:00 |
|
|
|
8edde4a4fc
|
add project SushiBarFileImplements
|
2023-02-13 18:45:25 +04:00 |
|
