Commit Graph

61 Commits

Author SHA1 Message Date
275a6ab493 Merge pull request 'feature/user-section' (#33) from feature/user-section into main
Reviewed-on: https://git.softuniq.eu/Telegram-Market/telegram-shop/pulls/33
2024-11-21 15:01:49 +00:00
1f7d1a144c bonus balance 2024-11-21 17:58:45 +03:00
0371f70546 Merge pull request 'main' (#32) from main into feature/user-section
Reviewed-on: https://git.softuniq.eu/Telegram-Market/telegram-shop/pulls/32
2024-11-21 11:51:41 +00:00
3c942da274 Merge pull request 'feature/admin-section' (#31) from feature/admin-section into main
Reviewed-on: https://git.softuniq.eu/Telegram-Market/telegram-shop/pulls/31
2024-11-21 11:50:21 +00:00
a760cb2d23 Bonus balance editing 2024-11-21 14:48:45 +03:00
d4eb5d46c3 Zip error fix 2024-11-21 13:43:41 +03:00
3153ecf325 Merge pull request 'main' (#30) from main into feature/admin-section
Reviewed-on: https://git.softuniq.eu/Telegram-Market/telegram-shop/pulls/30
2024-11-21 10:29:14 +00:00
97073eb939 Merge pull request 'Old purchase method removed' (#29) from feature/user-section into main
Reviewed-on: https://git.softuniq.eu/Telegram-Market/telegram-shop/pulls/29
2024-11-21 10:27:28 +00:00
627f9e417e Old purchase method removed 2024-11-21 13:24:04 +03:00
c1276e1187 Merge pull request 'purchase viewing' (#28) from feature/user-section into main
Reviewed-on: https://git.softuniq.eu/Telegram-Market/telegram-shop/pulls/28
2024-11-20 15:20:16 +00:00
1cb0467f6c purchase viewing 2024-11-20 17:43:51 +03:00
563d9d27c7 Merge pull request 'main' (#27) from main into feature/admin-section
Reviewed-on: https://git.softuniq.eu/Telegram-Market/telegram-shop/pulls/27
2024-11-19 17:57:35 +00:00
56698c28c4 Merge pull request 'feature/user-section' (#26) from feature/user-section into main
Reviewed-on: https://git.softuniq.eu/Telegram-Market/telegram-shop/pulls/26
2024-11-19 17:56:20 +00:00
a35bbbf3d9 Recalculate balance 2024-11-19 19:19:05 +03:00
6fa273f0b6 Item purchase 2024-11-19 05:01:13 +03:00
626435a3de Merge pull request 'main' (#24) from main into feature/user-section
Reviewed-on: https://git.softuniq.eu/Telegram-Market/telegram-shop/pulls/24
2024-11-17 11:57:14 +00:00
NW
1b1a9468a0 Merge pull request 'feature/admin-section' (#23) from feature/admin-section into main
Reviewed-on: https://git.softuniq.eu/Telegram-Market/telegram-shop/pulls/23
2024-11-17 00:48:01 +00:00
NW
072067eb4a Merge branch 'main' into feature/admin-section 2024-11-17 00:45:10 +00:00
b45aa35527 Database import 2024-11-16 20:55:47 +03:00
e3f2e87fcc export database 2024-11-16 19:18:50 +03:00
44ae5a6631 Delete photos after exit from card 2024-11-16 18:04:32 +03:00
ec96f67dfe Product edition 2024-11-16 17:53:43 +03:00
aed9a2ba56 Merge pull request 'feature/admin-section' (#22) from feature/admin-section into main
Reviewed-on: https://git.softuniq.eu/Telegram-Market/telegram-shop/pulls/22
2024-11-15 12:45:54 +00:00
772cd738ca merge glitch solved 2024-11-15 15:43:00 +03:00
18e09119b3 Merge pull request 'main' (#21) from main into feature/admin-section
Reviewed-on: https://git.softuniq.eu/Telegram-Market/telegram-shop/pulls/21
2024-11-15 12:35:23 +00:00
d760c77593 Merge pull request 'feature/admin-section' (#20) from feature/admin-section into main
Reviewed-on: https://git.softuniq.eu/Telegram-Market/telegram-shop/pulls/20
2024-11-15 12:34:09 +00:00
89a7a8b9c5 product deletion 2024-11-15 09:15:44 +03:00
e1eda05afe products pagination 2024-11-15 08:19:54 +03:00
df3149e59a product photo fix 2024-11-15 07:31:46 +03:00
de5e405093 import from json 2024-11-15 07:07:02 +03:00
4251f1a0bd user deletion/blocking 2024-11-15 06:18:55 +03:00
NW
7c79e7fd94 Merge pull request 'feature/admin-section' (#16) from feature/admin-section into main
Reviewed-on: https://git.softuniq.eu/Telegram-Market/telegram-shop/pulls/16
2024-11-14 23:55:23 +00:00
NW
f7d21d9d0d Обновить .gitea/workflows/dev.yaml 2024-11-14 23:32:46 +00:00
373e8e2567 user deletion/blocking 2024-11-15 02:26:13 +03:00
b45f7daa6f add location state reset 2024-11-15 00:29:42 +03:00
ebad9da439 Another back to admin fix 2024-11-15 00:25:34 +03:00
NW
82afcf9854 Обновить .gitea/workflows/dev.yaml 2024-11-14 21:18:41 +00:00
NW
9c4253ba58 Обновить .gitea/workflows/dev.yaml 2024-11-14 21:16:34 +00:00
f504d5fb7b Back to admin menu fix 2024-11-15 00:15:13 +03:00
NW
38ba2356bc Обновить .gitea/workflows/dev.yaml 2024-11-14 21:09:33 +00:00
NW
1cabe48594 Обновить .gitea/workflows/dev.yaml 2024-11-14 21:07:50 +00:00
NW
5eec9586b7 Обновить .gitea/workflows/prod.yaml 2024-11-14 20:16:38 +00:00
NW
97079ce1d5 Обновить .gitea/workflows/demo.yaml 2024-11-14 20:15:51 +00:00
NW
f737d46802 Обновить .gitea/workflows/dev.yaml 2024-11-14 20:13:18 +00:00
NW
82132c7466 Merge pull request 'feature/admin-section' (#12) from feature/admin-section into main
Reviewed-on: https://git.softuniq.eu/Telegram-Market/telegram-shop/pulls/12
2024-11-14 19:32:30 +00:00
d506d79367 users pagination 2024-11-14 21:27:32 +03:00
93290dee1c admin access 2024-11-14 20:29:57 +03:00
2beaa324fa Users location edition added 2024-11-14 20:16:17 +03:00
52779d20ab Nickname added 2024-11-14 18:24:04 +03:00
a3bde60b87 Merge pull request 'feature/pipelines' (#11) from feature/pipelines into main
Some checks are pending
Telegram Shop Bot CI [PROD] / lint (push) Waiting to run
Telegram Shop Bot CI [DEMO] / lint (push) Waiting to run
Telegram Shop Bot CI [DEV] / lint (push) Waiting to run
2024-11-14 14:40:00 +00:00