0b5101e85b
Исправление конфликта*
2024-10-27 21:45:31 +04:00
3b9698ac38
Merge pull request 'tsukanova_irina_lab_5' ( #108 ) from tsukanova_irina_lab_5 into main
...
Reviewed-on: #108
2024-10-26 13:01:34 +04:00
a456344432
Merge pull request 'rogashova_ekaterina_lab_3' ( #106 ) from rogashova_ekaterina_lab_3 into main
...
Reviewed-on: #106
2024-10-26 13:00:05 +04:00
383a5e3b25
Merge pull request 'kadyrov_aydar_lab_3' ( #105 ) from kadyrov_aydar_lab_3 into main
...
Reviewed-on: #105
2024-10-26 12:59:18 +04:00
2834efbbce
Merge pull request 'kadyrov_aydar_lab_2' ( #104 ) from kadyrov_aydar_lab_2 into main
...
Reviewed-on: #104
2024-10-26 12:58:55 +04:00
decc46b37c
Merge pull request 'tukaeva_alfiya_lab_5' ( #103 ) from tukaeva_alfiya_lab_5 into main
...
Reviewed-on: #103
2024-10-26 12:58:23 +04:00
a41e76795f
Merge pull request 'artamonova_tatyana_lab_2 is ready' ( #102 ) from artamonova_tatyana_lab_2 into main
...
Reviewed-on: #102
2024-10-26 12:57:40 +04:00
bcfec37329
Merge pull request 'bogdanov_dmitry_lab_5' ( #101 ) from bogdanov_dmitry_lab_5 into main
...
Reviewed-on: #101
2024-10-26 12:56:47 +04:00
e17b0b0d61
Merge pull request 'bogdanov_dmitry_lab_4' ( #100 ) from bogdanov_dmitry_lab_4 into main
...
Reviewed-on: #100
2024-10-26 12:56:28 +04:00
62290fc43d
Merge pull request 'zhimolostnova_anna_lab_6' ( #95 ) from zhimolostnova_anna_lab_6 into main
...
Reviewed-on: #95
2024-10-26 12:56:04 +04:00
0b5fb8da2e
Merge pull request 'zhimolostnova lab 5 complete' ( #94 ) from zhimolostnova_anna_lab_5 into main
...
Reviewed-on: #94
2024-10-26 12:53:57 +04:00
9c6ef7e89e
Merge pull request 'vaksman_valeria_lab_6' ( #91 ) from vaksman_valeria_lab_6 into main
...
Reviewed-on: #91
2024-10-26 12:52:19 +04:00
e763cf36e2
Merge pull request 'yakovleva_yulia_lab_4 is ready' ( #90 ) from yakovleva_yulia_lab_4 into main
...
Reviewed-on: #90
2024-10-26 12:51:56 +04:00
adf3f384a3
Merge pull request 'dozorova_alena_lab_8' ( #99 ) from dozorova_alena_lab_8 into main
...
Reviewed-on: #99
2024-10-26 12:50:30 +04:00
5ae6cd3cf1
Merge pull request 'dozorova_alena_lab_7' ( #98 ) from dozorova_alena_lab_7 into main
...
Reviewed-on: #98
2024-10-26 12:42:04 +04:00
daf3742ce6
Merge pull request 'zhimolostnova lab 8 complete' ( #97 ) from zhimolostnova_anna_lab_8 into main
...
Reviewed-on: #97
2024-10-26 12:35:58 +04:00
fb37a53f66
Merge pull request 'zhimolostnova lab 7 complete' ( #96 ) from zhimolostnova_anna_lab_7 into main
...
Reviewed-on: #96
2024-10-26 12:35:18 +04:00
23e035f9b2
Merge pull request 'vaksman_valeria_lab_8' ( #93 ) from vaksman_valeria_lab_8 into main
...
Reviewed-on: #93
2024-10-26 12:31:26 +04:00
556d8cf262
Merge pull request 'vaksman_valeria_lab_7' ( #92 ) from vaksman_valeria_lab_7 into main
...
Reviewed-on: #92
2024-10-26 12:30:20 +04:00
419790f5df
Merge pull request 'borschevskaya_anna_lab_8' ( #89 ) from borschevskaya_anna_lab_8 into main
...
Reviewed-on: #89
2024-10-26 12:27:12 +04:00
54a9b8a778
Merge pull request 'kadyrov_aydar_lab_1' ( #88 ) from kadyrov_aydar_lab_1 into main
...
Reviewed-on: #88
2024-10-26 12:23:44 +04:00
3aeae245fa
Merge pull request 'lazarev_andrey_lab_3' ( #87 ) from lazarev_andrey_lab_3 into main
...
Reviewed-on: #87
2024-10-26 12:23:21 +04:00
382273ccb8
Merge pull request 'borschevskaya_anna_lab_7 is ready' ( #86 ) from borschevskaya_anna_lab_7 into main
...
Reviewed-on: #86
2024-10-26 12:20:06 +04:00
4a37f55328
Merge pull request 'rogashova_ekaterina_lab_2' ( #85 ) from rogashova_ekaterina_lab_2 into main
...
Reviewed-on: #85
2024-10-26 12:14:14 +04:00
4e32398903
Merge pull request 'artamonova_tatyana_lab_1' ( #84 ) from artamonova_tatyana_lab_1 into main
...
Reviewed-on: #84
2024-10-26 12:13:43 +04:00
e69819aedd
Merge pull request 'tukaeva_alfiya_lab_4 is ready' ( #83 ) from tukaeva_alfiya_lab_4 into main
...
Reviewed-on: #83
2024-10-26 12:12:59 +04:00
d9c4402ec9
Merge pull request 'kuzarin_maxim_lab_8' ( #81 ) from kuzarin_maxim_lab_8 into main
...
Reviewed-on: #81
2024-10-26 12:07:16 +04:00
93687ad850
Merge pull request 'kuzarin_maxim_lab_7' ( #80 ) from kuzarin_maxim_lab_7 into main
...
Reviewed-on: #80
2024-10-26 11:37:45 +04:00
4528bcd22c
Merge pull request 'emelyanov_artem_lab_8' ( #79 ) from emelyanov_artem_lab_8 into main
...
Reviewed-on: #79
2024-10-26 11:35:53 +04:00
eef1d03249
Merge pull request 'emelyanov_artem_lab_7' ( #78 ) from emelyanov_artem_lab_7 into main
...
Reviewed-on: #78
2024-10-26 11:34:21 +04:00
7e09109cd2
Merge pull request 'emelyanov_artem_lab_6' ( #77 ) from emelyanov_artem_lab_6 into main
...
Reviewed-on: #77
2024-10-26 11:33:34 +04:00
f46724e5cf
Merge pull request 'dozorova_alena_lab_6' ( #76 ) from dozorova_alena_lab_6 into main
...
Reviewed-on: #76
2024-10-26 11:27:22 +04:00
72b0b63e58
видео
2024-10-25 21:03:05 +04:00
fd54e426b5
осталось видео
2024-10-25 20:52:46 +04:00
ad8894c0ca
сделано, осталось дописать ридми
2024-10-25 16:56:56 +04:00
edea94a4f2
Готово
2024-10-25 14:10:33 +04:00
NAP
5700e75965
kadyrov_aydar_lab_3
2024-10-25 01:10:46 +04:00
NAP
9e9711f004
kadyrov_aydar_lab_2
2024-10-24 20:07:47 +04:00
014845df45
tukaeva_alfiya_lab_5 is ready
2024-10-24 15:46:08 +04:00
636592bbac
artamonova_tatyana_lab_2 is ready
2024-10-23 21:29:01 +04:00
6711e8b0f6
Lab5
2024-10-23 18:36:31 +04:00
c91aa6e1f3
Исправление
2024-10-23 15:58:26 +04:00
d340d34c0b
README, исправления, изображения
2024-10-23 15:56:48 +04:00
aaff3b8183
Lab4
2024-10-23 14:11:04 +04:00
06a7114499
lab 8 complete
2024-10-22 20:52:00 +03:00
0246f32bcf
lab 7 complete
2024-10-22 20:19:09 +03:00
417368d25e
fix readme
2024-10-22 19:31:03 +03:00
20a39fa9a5
lab 6 complete
2024-10-22 19:30:00 +03:00
fb15f87160
lab 5 complete
2024-10-22 18:23:30 +03:00
f86dfba785
lab8 wow
2024-10-21 21:21:28 +04:00
e874c69b62
lab7 is ready
2024-10-21 21:17:41 +04:00
6f0726185a
lab six is ready yep
2024-10-21 21:10:24 +04:00
JulYakJul
b4b0ef7730
fix readme
2024-10-21 14:35:40 +04:00
JulYakJul
4d51941016
fix readme
2024-10-21 14:34:02 +04:00
JulYakJul
a07b272c79
yakovleva_yulia_lab_4 is ready
2024-10-21 14:31:58 +04:00
7cb94c14b0
borschevskaya_anna_lab_8 is ready
2024-10-21 08:52:52 +04:00
NAP
506d544060
kadyrov_aydar_lab_1
2024-10-21 02:36:18 +04:00
1ef9e02d32
lazarev_andrey_lab_3 is ready
2024-10-20 23:32:58 +04:00
ff8a87ebb8
borschevskaya_anna_lab_7 is ready
2024-10-20 22:37:56 +04:00
740d49d368
Готово
2024-10-20 21:59:10 +04:00
df1b8bd8ce
artamonova_tatyana_lab_1 is ready
2024-10-20 19:29:17 +04:00
7549429b6b
artamonova_tatyana_lab_1 is ready
2024-10-20 19:25:21 +04:00
00d9e2409a
tukaeva_alfiya_lab_4 is ready
2024-10-20 19:04:32 +04:00
098cb9b9ad
Обновить kuzarin_maxim_lab_8/README.md
...
маленькая стилистическая доработка
2024-10-19 19:44:12 +04:00
af39fdc505
Текст написан, нужно проверить отображение Md
2024-10-19 18:42:32 +03:00
ef603a8056
Обновить kuzarin_maxim_lab_7/README.md
...
Небольшая проблема с двум \n
2024-10-19 19:36:31 +04:00
c8b3124074
Добавлено эссе в виде MD файла
2024-10-19 18:34:37 +03:00
ce853de348
feature: completed lab 8
2024-10-19 18:40:59 +04:00
c3ac60eaa2
fix: delete .idea
2024-10-19 18:03:24 +04:00
e12438b727
feature: completed lab 7
2024-10-19 18:00:48 +04:00
aa54f9187f
написали эссе
2024-10-19 14:47:04 +04:00
b1d8660774
+
2024-10-19 14:18:21 +04:00
6c66654acc
feature: deleted lab 6
2024-10-19 14:17:40 +04:00
1d9c308bb4
правим в принципе разметку
2024-10-19 14:17:25 +04:00
a64b6c7329
feature: completed lab 6
2024-10-19 14:17:22 +04:00
7ec5c45faa
попытка выравнивания
2024-10-19 14:06:09 +04:00
340dc6aa19
добавляем эссе
2024-10-19 14:04:46 +04:00
a152275bb7
Merge branch 'main' into dozorova_alena_lab_6
2024-10-19 13:17:33 +04:00
6e3ec51fe7
Merge branch 'main' into dozorova_alena_lab_6
2024-10-19 13:17:09 +04:00
131dc39f6c
Merge pull request 'borschevskaya_anna_lab_6 is ready' ( #75 ) from borschevskaya_anna_lab_6 into main
...
Reviewed-on: #75
2024-10-19 13:08:27 +04:00
d82f47e04c
Merge pull request 'emelyanov_artem_lab_5' ( #74 ) from emelyanov_artem_lab_5 into main
...
Reviewed-on: #74
2024-10-19 12:56:19 +04:00
3175352d02
Merge pull request 'emelyanov_artem_lab_4' ( #73 ) from emelyanov_artem_lab_4 into main
...
Reviewed-on: #73
2024-10-19 12:49:26 +04:00
2e86e68e12
Merge pull request 'aleikin_artem_lab_1' ( #72 ) from aleikin_artem_lab_1 into main
...
Reviewed-on: #72
2024-10-19 12:46:13 +04:00
63dd60f20e
Merge pull request 'bondarenko_max_lab_1' ( #71 ) from bondarenko_max_lab_1 into main
...
Reviewed-on: #71
2024-10-19 12:43:27 +04:00
63e031ef17
Merge pull request 'vaksman_valeria_lab_5' ( #70 ) from vaksman_valeria_lab_5 into main
...
Reviewed-on: #70
2024-10-19 12:33:16 +04:00
5fdabedcd6
Merge pull request 'kuzarin_maxim_lab_6' ( #69 ) from kuzarin_maxim_lab_6 into main
...
Reviewed-on: #69
2024-10-19 12:30:30 +04:00
9eadb70f85
fix link
2024-10-19 12:28:06 +04:00
5fd241a980
Merge pull request 'dozorova_alena_lab_5' ( #67 ) from dozorova_alena_lab_5 into main
...
Reviewed-on: #67
2024-10-19 12:26:46 +04:00
4f53dff75f
Merge branch 'dozorova_alena_lab_5' of https://git.is.ulstu.ru/Alexey/DAS_2024_1 into dozorova_alena_lab_5
2024-10-19 12:24:25 +04:00
57b7675030
fix link
2024-10-19 12:24:07 +04:00
b1c16dc76c
Merge pull request 'bogdanov_dmitry_lab_3' ( #68 ) from bogdanov_dmitry_lab_3 into main
...
Reviewed-on: #68
2024-10-19 12:23:02 +04:00
309911ed75
Merge pull request 'rogashova_ekaterina_lab_1 is ready' ( #66 ) from rogashova_ekaterina_lab_1 into main
...
Reviewed-on: #66
2024-10-19 12:08:44 +04:00
d23e808325
Merge pull request 'lazarev_andrey_lab_2' ( #65 ) from lazarev_andrey_lab_2 into main
...
Reviewed-on: #65
2024-10-19 12:05:03 +04:00
4c974bfb51
Merge pull request 'tsukanova_irina_lab_4' ( #64 ) from tsukanova_irina_lab_4 into main
...
Reviewed-on: #64
2024-10-19 12:00:40 +04:00
b573569a97
borschevskaya_anna_lab_6 is ready
2024-10-19 10:46:15 +04:00
60c79b64fb
feature: deleted lab 5
2024-10-18 17:42:21 +04:00
07105e81a0
feature: completed lab 5
2024-10-18 17:41:49 +04:00
JulYakJul
0ebd562be2
Merge branch 'main' into yakovleva_yulia_lab_4
2024-10-18 17:02:27 +04:00
JulYakJul
22a3917d28
work 3 done
2024-10-18 16:59:19 +04:00
46b94ea885
feature: completed lab 4
2024-10-18 16:27:06 +04:00
JulYakJul
94b8ba783c
work 2.2 done
2024-10-18 16:24:18 +04:00
JulYakJul
060bd2321e
work 2 done
2024-10-18 16:11:22 +04:00
JulYakJul
a8f1b39dd7
work 1 done
2024-10-18 15:42:10 +04:00
d3a7046f97
aleikin_artem_lab1 is ready
2024-10-18 00:09:32 +04:00
06d65650ab
aleikin_artem_lab1 is ready
2024-10-18 00:05:35 +04:00
992a169c9b
Merge branch 'main' into bondarenko_max_lab_1
2024-10-17 23:22:03 +04:00
b82a13c106
bondarenko_max_lab_1 is ready
2024-10-17 23:20:01 +04:00
e33ffef85e
fix
2024-10-17 22:43:46 +04:00
9362e62999
йееес lab 5 is ready
2024-10-17 20:01:43 +04:00
13b5dfc707
Merge branch 'main' into dozorova_alena_lab_5
2024-10-16 14:31:12 +04:00
f3bbfb2efd
rogashova_ekaterina_lab_1 is ready
2024-10-14 23:20:57 +04:00
3c6c7f47e8
second lab done
2024-10-14 16:27:36 +04:00
dc7c2c9694
видео
2024-10-14 16:09:46 +04:00
9b4f9b608c
все готово, осталось сделать видео
2024-10-14 15:37:29 +04:00
735a403027
Добавлен README
2024-10-09 16:38:42 +04:00
c67049687b
Done
2024-10-09 16:17:26 +04:00
022e2dc49e
+
2024-10-08 23:46:12 +04:00
8f24aad349
+
2024-10-08 23:45:44 +04:00
a54e13f7ee
+
2024-10-08 23:45:00 +04:00
1bb988ea2f
dozorova_alena_lab_6
2024-10-08 23:43:24 +04:00
f7668394b0
dozorova_alena_lab_5
2024-10-08 22:46:32 +04:00
23087c87ea
Обновить kuzarin_maxim_lab_6/README.md
2024-09-26 23:14:31 +04:00
5a6580ff8c
Фикс README
2024-09-26 22:14:06 +03:00
5f6472b5ff
Лаба реализована. Нужно всё проверить в контексте описания
2024-09-26 22:12:33 +03:00
f0083bc4cd
feature: add .yml and .env files, start readme
2024-09-20 01:42:54 +04:00
