Skip to content
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

Jump to bottom

🔀 #34

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

🔀 #34

wants to merge 73 commits into from

Conversation

VujicGit
Copy link
Member

No description provided.

jelena-vlajkov and others added 30 commits June 7, 2021 00:04
@jelena-vlajkov
🚧 🐛 Fixed some bugs
6adab57
@jelena-vlajkov
✨ Adding media implemented
30da5a7
@VujicGit
🚧 🐛 Implemeted communication with user microservice and fixed user id
ffa85b8
@st3fan7
Merge pull request #7 from XML-BSEP/feature/registration
900b9da 
🚧 🐛 Implemeted communication with user microservice …
@OakenKnight
Merge pull request #8 from XML-BSEP/connection/post
e860ea3 
Connection/post
@OakenKnight
🚧 Fixed src and updated dataseeder
6570b38
@st3fan7
Merge pull request #9 from XML-BSEP/feture/dataseeder
ca9ca3d 
🚧 Fixed src and updated dataseeder
@jelena-vlajkov
🐛 Minor bugfixes
c5890bf
@OakenKnight
Merge pull request #10 from XML-BSEP/feature/docker
8385c10 
🐛 Minor bugfixes
@VujicGit
🚧 Logging and tracking data via Jeager
7221a8d
@VujicGit
🚧 Started working on two factor authentication
b494a6a
@VujicGit
🚧 2fa validating
e19ba74
@VujicGit
🐛 Deleted src from path
bf2544e
@VujicGit
🚧 Implemented disabling two factor authentication
ba49952
@st3fan7
Merge pull request #11 from XML-BSEP/feature/totp
124738d 
✨ Implemented disabling two factor authentication
@st3fan7
Merge pull request #12 from XML-BSEP/feature/logging_tracing
c85de86 
✨ Logging errors and tracing via Jaeger
@st3fan7
✨ Xss and validation are added
77efffe
@OakenKnight
Merge pull request #13 from XML-BSEP/feature/xss-validation
c45df00 
✨ Xss and validation are added
@VujicGit
🚧 Started working on login with 2fa
34b4cc2
@OakenKnight
✨ Code resend
95e9069
@st3fan7
Merge pull request #14 from XML-BSEP/feature/resend-code
788b4ac 
✨ Code resend
@st3fan7
🐛 Fixed validation and added gin secure
df4c0f4
@VujicGit
🚧 Login with 2fa
e4ec970
@OakenKnight
✨ Reset password
9e88e2a
@st3fan7
Merge pull request #16 from XML-BSEP/feature/reset-password
96ee840 
✨ Reset password
@OakenKnight
Merge pull request #15 from XML-BSEP/feature/xss-validation
8d9a03f 
🐛 Fixed validation and added gin secure
@VujicGit
🚧 Implemented two factor authentication
4a58c42
@VujicGit
Merge branch 'develop' into merging/totp
f04ccf2
@st3fan7
Merge pull request #18 from XML-BSEP/merging/totp
0d3fe75 
🔀 Totp merged with develop
@jelena-vlajkov
✨ Added logging
9f81d52
VujicGit and others added 30 commits June 16, 2021 22:46
@VujicGit
🚧 Implemented RBAC and certificate
61f2987
@st3fan7
🔀 Merged with develop
a63f5b5
@jelena-vlajkov
🐳 Added new dockerfile
e2201ce
@OakenKnight
Merge pull request #22 from XML-BSEP/bugfix/docker
c79e6b0 
🐳 Added new dockerfile
@jelena-vlajkov
Merge pull request #23 from XML-BSEP/feature/grpc_security
2b25581 
✨ Grpc secure communication
@OakenKnight
🐳 🔨 Changed configurations for docker
e466ed4
@jelena-vlajkov
Merge pull request #24 from XML-BSEP/bugfix/docker-configs
5c64e24 
🐳 🔨 Changed configurations for docker
@jelena-vlajkov
🐳 Fixed docker
f4e4fe4
@jelena-vlajkov
🐳 Enabling docker
a4ce13f
@jelena-vlajkov
🐳 ✨ Fixed docker
85b8f6d
@st3fan7
Merge pull request #25 from XML-BSEP/docker-branch
4e0078e 
🐳 Fixed docker
@jelena-vlajkov
🐛 fixed bug with paths
695d6fb
@OakenKnight
Merge pull request #26 from XML-BSEP/docker-branch
ad14752 
🐛 fixed bug with paths
@VujicGit
🚧 Started working on agent registration and confirmation
e3dc759
@VujicGit
🚧 Implemented confirmation of agent account
74b6832
@VujicGit
🚧 Implemented agent registration
c9e67d1
@st3fan7
Merge pull request #27 from XML-BSEP/feature/agent_registration
b787a8c 
✨ Agent registration
@jelena-vlajkov
✨ Banned user deleted from auth ms
acd55a5
@st3fan7
Merge pull request #28 from XML-BSEP/feature/ban-user
fb0cfa6 
✨ Banned user deleted from auth ms
@st3fan7
🚧 Added agent
adf786a
@VujicGit
🚧 Agent registration
3c063c9
@st3fan7
Merge pull request #29 from XML-BSEP/feature/agent_registration
f33d7e3 
🚧 Agent registration
@jelena-vlajkov
Merge pull request #30 from XML-BSEP/feature/campaigns
d7f4ccd 
🚧 Added agent
@VujicGit
🚧 Started implementing saga pattern
64c0602
@VujicGit
🚧 Implemented saga pattern for agent registration
c8eedff
@jelena-vlajkov
Merge pull request #31 from XML-BSEP/feature/saga
48846c5 
✨ Saga pattern for agent registration
@jelena-vlajkov
🐳 Docker config
96d8130
@VujicGit
Merge pull request #32 from XML-BSEP/docker-final
eef34cd 
🐳 Docker config
@jelena-vlajkov
♻️ Added Prometheus
231323c
@jelena-vlajkov
Merge pull request #33 from XML-BSEP/docker-final
7abfd09 
♻️ Added Prometheus
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@VujicGit @jelena-vlajkov @st3fan7 @OakenKnight