|
|
acf6a2d167
|
Merge remote-tracking branch 'origin/feature/priems' into dev
# Conflicts:
# modules_data/_umenie.php
|
2023-01-28 04:50:21 +02:00 |
|
|
|
ea01cd0a56
|
Merge remote-tracking branch 'origin/dev' into dev-lopar
# Conflicts:
# online.php
|
2023-01-28 04:41:36 +02:00 |
|
|
|
99b90a198b
|
Реализация ChatMessageDTO.
|
2023-01-28 04:24:37 +02:00 |
|
|
|
a9ab7257e8
|
Merge pull request 'Исправил чат.' (#40) from fix/chat into dev
Reviewed-on: new-combats.com/game#40
|
2023-01-23 11:46:55 +00:00 |
|
|
|
6095358496
|
Merge pull request 'Обучение' (#39) from maksym into dev
Reviewed-on: new-combats.com/game#39
|
2023-01-23 11:45:03 +00:00 |
|
|
|
72fe6139c6
|
Доработка
|
2023-01-23 07:42:18 +01:00 |
|
|
|
2d3bd006c0
|
Забыл добавить строчку
|
2023-01-23 07:40:55 +01:00 |
|
|
|
1fbd8d6de2
|
Изменил отображение приёмов
|
2023-01-23 07:33:19 +01:00 |
|
|
|
571ba4dffb
|
Исправил чат.
|
2023-01-18 20:27:27 +01:00 |
|
|
|
f0a9a3e8a1
|
Доработка #2
|
2023-01-18 20:20:06 +01:00 |
|
|
|
46c1e38ea8
|
Доработка
|
2023-01-18 18:24:00 +01:00 |
|
|
|
dcc6a1337c
|
Косяк.
|
2023-01-18 13:26:49 +01:00 |
|
|
|
d1be4995e2
|
Убрал notise
|
2023-01-18 13:00:56 +01:00 |
|
|
|
5518b335a8
|
Обучение. Правило для новой страницы с неправильным вводом ответа
|
2023-01-18 12:54:10 +01:00 |
|
|
|
95604fc4b1
|
Вынес логику из автозагрузчика
|
2023-01-18 12:53:20 +01:00 |
|
|
|
5df2447d34
|
Убрал лишнее
|
2023-01-18 12:51:58 +01:00 |
|
|
|
328e7483cd
|
Новая фича с хэлперами
|
2023-01-18 12:51:33 +01:00 |
|
|
|
3f579afaed
|
Обучение. Новые задания
|
2023-01-18 12:51:06 +01:00 |
|
|
|
bae941e155
|
Обучение. Рефакторинг
|
2023-01-18 12:43:45 +01:00 |
|
|
|
037d43857d
|
Merge branch 'maksym' of https://src.lopar.space/new-combats.com/game into maksym
|
2023-01-15 23:26:58 +01:00 |
|
|
|
739caee04b
|
Закончил разработку обучения
|
2023-01-15 22:47:19 +01:00 |
|
|
|
35c0b6825f
|
revert 45fc2f51b4
revert Восстановление пароля
|
2023-01-13 21:41:44 +00:00 |
|
|
|
45fc2f51b4
|
Восстановление пароля
|
2023-01-13 18:56:41 +01:00 |
|
|
|
9ec0f42e17
|
Обучение. Начало Frontend части
|
2023-01-12 21:38:13 +01:00 |
|
|
|
d9ec810f7f
|
Merge pull request 'dev-cookie-to-id' (#37) from dev-cookie-to-id into dev
Reviewed-on: new-combats.com/game#37
|
2023-01-12 03:41:11 +00:00 |
|
|
|
89469b919f
|
Merge remote-tracking branch 'origin/dev-cookie-to-id' into dev-cookie-to-id
|
2023-01-12 05:39:04 +02:00 |
|
|
|
d0fb296691
|
почта не уходила
|
2023-01-12 05:38:48 +02:00 |
|
|
|
e8252b8d4d
|
даты рождения не совпадали
|
2023-01-12 05:31:22 +02:00 |
|
|
|
c647600141
|
various small
|
2023-01-12 05:22:03 +02:00 |
|
|
|
68fe6ec13e
|
various small
|
2023-01-12 05:08:32 +02:00 |
|
|
|
b483b79df5
|
closes #33
|
2023-01-12 04:19:06 +02:00 |
|
|
|
557921edfa
|
Uncaught TypeError: Argument 1 passed to User::snatItem() must be of the type int, null given
|
2023-01-12 04:07:43 +02:00 |
|
|
|
f3bee1c3ac
|
Typed property User::$info must be array, bool used
|
2023-01-12 03:21:13 +02:00 |
|
|
|
84c0847178
|
Trying to access array offset on value of type null i
|
2023-01-12 03:18:17 +02:00 |
|
|
|
a1aca77a35
|
Запросы в несуществующий базы, снятие вещей из пустых слотов..
|
2023-01-12 02:58:26 +02:00 |
|
|
|
f1d838fcc4
|
Регистрация кажется завелась.
|
2023-01-12 01:39:26 +02:00 |
|
|
|
83fcf92ba0
|
Merge pull request 'dev-php74-utf8' (#31) from dev-php74-utf8 into master
Reviewed-on: new-combats.com/game#31
|
2023-01-11 13:51:55 +00:00 |
|
|
|
ef7a874772
|
Merge branch 'master' into dev-php74-utf8
|
2023-01-11 13:44:09 +00:00 |
|
|
|
80117d69a4
|
Merge pull request 'dev-php74' (#30) from dev-php74 into master
Reviewed-on: new-combats.com/game#30
|
2023-01-11 13:29:35 +00:00 |
|
|
|
75da4ded8f
|
Merge pull request 'dev' (#28) from dev into master
Reviewed-on: new-combats.com/game#28
|
2023-01-11 13:19:06 +00:00 |
|
|
|
93177f70b4
|
Merge pull request 'Maksym' (#25) from Maksym into dev-php74-utf8
Reviewed-on: new-combats.com/game#25
|
2023-01-10 22:50:55 +00:00 |
|
|
|
220d965c01
|
Начало разработки обучения.
|
2023-01-10 23:39:11 +01:00 |
|
|
|
23a2de0d17
|
Merge branch 'dev-php74-utf8' of https://src.lopar.space/new-combats.com/game into Maksym
|
2023-01-10 20:31:46 +01:00 |
|
|
|
e3915d2495
|
move comissionShop method to external class
|
2023-01-10 21:15:53 +02:00 |
|
|
|
c071d2d293
|
remove deprecated method sys_see()
|
2023-01-10 20:58:20 +02:00 |
|
|
|
2947b59172
|
type declarations
|
2023-01-10 20:53:10 +02:00 |
|
|
|
c3b46c30b2
|
Баг с кодировкой в чате
|
2023-01-10 19:39:35 +01:00 |
|
|
|
7b822fe884
|
registration bug
|
2023-01-10 20:29:27 +02:00 |
|
|
|
bbb35c19f9
|
encoding and smell
|
2023-01-10 20:14:47 +02:00 |
|
|
|
2590d62f1f
|
registration bug
|
2023-01-10 20:13:19 +02:00 |
|
