|
|
d27124e807
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# app/conf/api.py
|
2022-10-08 19:32:45 +03:00 |
|
|
|
7172920c07
|
added event crud
|
2022-10-08 19:31:01 +03:00 |
|
Ilia vasilenko
|
31a7b70c84
|
Merge pull request #3 from more-tech4-magnum-opus/clans
add clan seasons
|
2022-10-08 17:16:55 +03:00 |
|
Ilia vasilenko
|
693c1e2dbd
|
Delete 0004_alter_user_clan.py
|
2022-10-08 17:16:36 +03:00 |
|
Ilia vasilenko
|
117b2f3bae
|
Merge branch 'main' into clans
|
2022-10-08 17:16:16 +03:00 |
|
ilia
|
ada4fe8deb
|
add clan seasons
|
2022-10-08 17:14:19 +03:00 |
|
|
|
dada351290
|
added worker departments
|
2022-10-08 16:07:41 +03:00 |
|
|
|
a70763d6bc
|
added worker departments
|
2022-10-08 16:03:16 +03:00 |
|
ilia
|
779648b535
|
remove migrations
|
2022-10-08 14:42:58 +03:00 |
|
Ilia vasilenko
|
a64f07848c
|
Merge pull request #2 from more-tech4-magnum-opus/blockchain-and-clans
end up blockchain and add clans
|
2022-10-08 14:40:43 +03:00 |
|
Ilia vasilenko
|
a89a9d9614
|
Merge branch 'main' into blockchain-and-clans
|
2022-10-08 14:40:35 +03:00 |
|
ilia
|
69dc0b1b85
|
end up blockchain and add clans
|
2022-10-08 14:39:52 +03:00 |
|
|
|
9214c386c7
|
added user endpoints, connected blockchain
|
2022-10-08 13:52:49 +03:00 |
|
Alexandr Karpov
|
c56f8e018f
|
Merge pull request #1 from more-tech4-magnum-opus/blockchain-and-clans
add create wallet
|
2022-10-08 12:42:57 +03:00 |
|
ilia
|
ccdaacfe8a
|
add create wallet
|
2022-10-08 12:38:54 +03:00 |
|
|
|
9d33bdb285
|
added env example
|
2022-10-08 11:28:37 +03:00 |
|
|
|
4e4735d7e2
|
added marketplace endpoints, permissions
|
2022-10-08 11:21:53 +03:00 |
|
|
|
50a6c9d39c
|
added celery, channels, swagger, created base user, added auth endpoints
|
2022-10-08 00:48:53 +03:00 |
|
|
|
33562ddc1b
|
inited django
|
2022-10-07 22:15:12 +03:00 |
|
Alexandr Karpov
|
95b8f1f2f0
|
Initial commit
|
2022-10-07 19:19:58 +03:00 |
|
