Skip to content

Merge pull request #7 from Sasha1602/main #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sasha1602 wants to merge 54 commits into
base: main
Choose a base branch
from
Open

Merge pull request #7 from Sasha1602/main #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
1f9ea1d
Merge pull request #5 from Sasha1602/main
Sasha1602 Oct 9, 2023
2cfa449
Add parser using C#
Fuflick Oct 10, 2023
f7ec564
Merge pull request #7 from Sasha1602/main
Sasha1602 Oct 10, 2023
1d1fdef
Merge pull request #6 from Fuflick/main
Sasha1602 Oct 10, 2023
321eaab
Merge branch 'test' into Pashilaia_vetka
Sasha1602 Oct 10, 2023
f14740a
Merge pull request #9 from Sasha1602/Pashilaia_vetka
Sasha1602 Oct 10, 2023
56ebaad
Merge pull request #10 from Sasha1602/Pashilaia_vetka
Sasha1602 Oct 10, 2023
f6c034e
Add MongoDB
7c00h Oct 13, 2023
4cdf293
Merge pull request #14 from Sasha1602/main
Sasha1602 Oct 13, 2023
c0babf4
i ont know
Fuflick Oct 13, 2023
091b67f
Merge pull request #1 from 0x0e4/test
0x0e4 Oct 13, 2023
8e75572
Merge pull request #15 from 0x0e4/main
Sasha1602 Oct 13, 2023
fb1f80d
Merge pull request #16 from Sasha1602/0x0e4
Sasha1602 Oct 13, 2023
06ba855
Merge pull request #17 from Sasha1602/test
Sasha1602 Oct 13, 2023
9e4b3ea
Merge pull request #19 from Sasha1602/test
Sasha1602 Oct 13, 2023
6af7ba0
Merge pull request #1 from Sasha1602/test
Fuflick Oct 13, 2023
19aa7d2
Add API dir
Fuflick Oct 13, 2023
9db4239
Merge branch 'main' of https://github.com/Fuflick/Xakaton
Fuflick Oct 13, 2023
45849c3
Fuck, we need parser again, begin to write API
Fuflick Oct 13, 2023
2d7f0e0
Merge pull request #20 from Fuflick/main
Sasha1602 Oct 13, 2023
df92a2a
Change Parser
7c00h Oct 13, 2023
0d30c94
Merge pull request #22 from 0x0e4/test
Sasha1602 Oct 13, 2023
5bbef28
Merge pull request #23 from Sasha1602/test
Sasha1602 Oct 13, 2023
a7084d4
Merge pull request #24 from Sasha1602/test
Sasha1602 Oct 13, 2023
a3e28ff
Change Parser2
7c00h Oct 13, 2023
9ce9d16
Merge pull request #25 from 0x0e4/test
Sasha1602 Oct 13, 2023
ae9b41a
Merge pull request #26 from Sasha1602/test
Sasha1602 Oct 13, 2023
425cc27
Change Parser3
7c00h Oct 13, 2023
c8e2be6
Merge pull request #27 from 0x0e4/test
Sasha1602 Oct 13, 2023
fff746d
Merge pull request #28 from Sasha1602/test
Sasha1602 Oct 13, 2023
54e73ca
Delete MyParserC#/API directory
Sasha1602 Oct 13, 2023
253da27
Merge pull request #29 from Sasha1602/test
Sasha1602 Oct 13, 2023
9ec2a36
Merge pull request #2 from Sasha1602/test
Fuflick Oct 13, 2023
b9ba4f9
Add API solution
Fuflick Oct 13, 2023
beba18b
First API version
Fuflick Oct 14, 2023
015885e
Merge pull request #30 from Fuflick/main
Sasha1602 Oct 14, 2023
1bc7e8d
Add Program class
Fuflick Oct 14, 2023
a4e8615
Do smth
Fuflick Oct 14, 2023
deb9359
Merge pull request #31 from Fuflick/main
Sasha1602 Oct 14, 2023
ff44c30
Merge pull request #32 from Sasha1602/Pashilaia_vetka
Sasha1602 Oct 14, 2023
a5ed65a
Update ParserTest.cs
0x0e4 Oct 14, 2023
b0530c4
Merge pull request #33 from 0x0e4/test
Sasha1602 Oct 18, 2023
feb981d
vc
Sasha1602 Nov 5, 2023
f424570
vds
Sasha1602 Nov 5, 2023
6de90e7
df
Sasha1602 Nov 5, 2023
fb115cc
Merge pull request #34 from Sasha1602/Lis
Sasha1602 Nov 5, 2023
b0d6a82
вап
Sasha1602 Nov 5, 2023
6532cf1
Merge branch 'test' of https://github.com/Sasha1602/Xakaton into test
Sasha1602 Nov 5, 2023
9c1bd74
Merge pull request #36 from Sasha1602/test
Sasha1602 Nov 8, 2023
f26ce65
Ostavil correct parser
Fuflick Nov 8, 2023
c9786fd
Fuck, i don't want to suck big black cock
Fuflick Nov 8, 2023
7dcb758
I dont't know, what I did
Fuflick Nov 8, 2023
64d9515
Add 3 project folders: DAL, Domain, Api
Fuflick Nov 9, 2023
318eed3
Merge pull request #37 from Fuflick/Pashilaia_vetka
Sasha1602 Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 8 additions & 0 deletions .idea/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/.idea.Xakaton.dir/.idea/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/.idea.Xakaton.dir/.idea/encodings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/.idea.Xakaton.dir/.idea/indexLayout.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/.idea.Xakaton.dir/.idea/projectSettingsUpdater.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/.idea.Xakaton.dir/.idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

100 changes: 100 additions & 0 deletions .idea/.idea.Xakaton.dir/.idea/workspace.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions .idea/Xakaton.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading