Commit Graph

100 Commits

Author SHA1 Message Date
Ino
6d12916f30 fix 2023-05-16 09:58:59 +04:00
Ino
0e26bcdf23 fix 2023-05-16 09:48:39 +04:00
52dae4891d Merge branch 'LabWork07_hard' into LabWork08_hard 2023-05-16 09:46:28 +04:00
Ino
877107540a fix 2023-05-16 09:46:19 +04:00
d773742a2f Merge branch 'LabWork07_hard' into LabWork08_hard 2023-05-16 09:44:19 +04:00
f7c5ff8a17 Merge branch 'LabWork06_hard' into LabWork07_hard 2023-05-16 09:44:03 +04:00
Ino
687cff0a87 fix 2023-05-16 09:43:39 +04:00
Ino
079efaa43c fix 2023-05-16 09:43:13 +04:00
Inohara
64b7846fe6 fix 2023-05-05 10:43:11 +04:00
Inohara
e2b4bf836d Merge branch 'LabWork07_hard' of http://student.git.athene.tech/Senju/PIbd-22_Tsukanova_I.V._IceCreamShop into LabWork07_hard 2023-05-05 09:18:59 +04:00
Inohara
7e2a8252ee fix 2023-05-05 09:18:56 +04:00
Inohara
aca0c56633 вроде работает 2023-05-04 21:52:24 +04:00
0667e366aa Merge branch 'LabWork07_hard' into LabWork08_hard 2023-05-04 21:05:15 +04:00
a936d2383a Merge branch 'LabWork06_hard' into LabWork07_hard 2023-05-04 21:02:08 +04:00
Inohara
49cbb06075 упс2 2023-05-04 21:00:47 +04:00
Inohara
4378b3fb8d упс 2023-05-04 20:54:48 +04:00
Inohara
6d357a51ad Merge branch 'LabWork07_hard' into Lab08_hard 2023-05-04 20:43:09 +04:00
Inohara
5e6d303874 вот вроде так 2023-05-04 20:35:08 +04:00
Ino
713e096862 надо протестить 2023-05-03 16:28:35 +04:00
Ino
17bc71d4ff Merge branch 'LabWork08' into Lab08_hard 2023-05-03 14:25:27 +04:00
Ino
7fae4ed8f3 может работает, а может и нет, а может не может 2023-05-03 14:20:42 +04:00
Ino
4cf40944f5 начало 7 усложненки 2023-05-03 14:05:03 +04:00
Ino
e81bb5f092 Merge branch 'LabWork07' into LabWork07_hard 2023-05-03 11:57:27 +04:00
Ino
82fd32fb9e fix 2023-05-03 11:51:34 +04:00
Ino
d02a6e71fd вроде так 2023-05-03 11:46:57 +04:00
Ino
8247d0c400 непонятное 2023-05-03 11:42:51 +04:00
Ino
249fd76981 Revert "fix"
This reverts commit 959e5adcad.
2023-05-03 11:41:55 +04:00
Ino
dee5de3f82 Revert "fix"
This reverts commit 4b37411891.
2023-05-03 11:37:32 +04:00
Ino
959e5adcad fix 2023-05-03 11:35:54 +04:00
Ino
4b37411891 fix 2023-05-03 11:31:44 +04:00
2536db5691 Merge branch 'LabWork04_hard' into LabWork05_hard 2023-05-03 11:25:59 +04:00
Ino
5d4541d601 fix 2023-05-03 11:25:17 +04:00
7a27aad092 Merge branch 'LabWork05_hard' into LabWork06_hard 2023-04-25 11:19:49 +04:00
Inohara
016b5d3f6b сдана 6 усложненка 2023-04-25 11:18:23 +04:00
Inohara
165a765693 сдана 5 усложненка 2023-04-25 09:48:29 +04:00
Inohara
91fdd361b6 у 2023-04-25 08:54:06 +04:00
Inohara
2c2eec51ff почему то не работает 2023-04-24 18:50:18 +04:00
Inohara
c5f9bc34c3 Merge branch 'LabWork06' into LabWork06_hard 2023-04-23 19:08:21 +04:00
Inohara
13f8e6683f вроде работает 2023-04-19 19:52:11 +04:00
Ino
c26ab75741 фикс 2023-04-12 13:29:49 +04:00
Ino
2564d27b89 shopApp 2023-04-12 13:11:07 +04:00
Ino
c4ca3f7949 Merge branch 'LabWork05' into LabWork05_hard 2023-04-12 12:15:57 +04:00
Ino
b9096879ae вот 2023-04-12 12:04:35 +04:00
Ino
5d6ad409fc туктук 2023-04-12 12:03:05 +04:00
Ino
5b8087029b добавлены DataContract и DataMember 2023-04-12 11:59:00 +04:00
Ino
5eea91c76d кое что еще 2023-04-11 16:57:04 +04:00
Ino
8a61dd2832 data grid view new 2023-04-11 15:57:59 +04:00
fc5691398a Merge branch 'LabWork07' into LabWork08 2023-04-11 15:40:08 +04:00
Ino
25f51edbdc бд 2023-04-11 15:39:54 +04:00
Ino
071b44d73d Attributes 2023-04-11 15:37:52 +04:00