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

End Of Semester Project - Merge #170

Merged
merged 132 commits into from
Jul 2, 2024
Merged

End Of Semester Project - Merge #170

merged 132 commits into from
Jul 2, 2024

Conversation

MaximeZmt
Copy link
Collaborator

Thank you for opening a pull request with this project, please also:

  • add a brief description of your changes here
  • assign the PR to yourself, or to the person(s) working on it
  • start in draft mode and in progress pipeline in the project (if applicable)
  • if applicable, add this PR to its related issue by one of the special keywords Closing keywords
  • once it's ready
    • put it in the Review or Ready4Merge pipeline in the project (if applicable)
    • remove draft
    • assign a reviewer

MaximeZmt and others added 30 commits February 25, 2024 12:01
@MaximeZmt
change some error checking method
7998bd6
@MaximeZmt
Merge pull request #1 from MaximeZmt/Work-Mzmt-RefactorEvotingMod_Test
036084d 
Change some error checking method
@MaximeZmt
Merge branch 'c4dt:main' into main
c703526
@MaximeZmt
Merge branch 'c4dt:main' into main
89f11d2
@MaximeZmt
Merge branch 'c4dt:main' into main
c2dd4a2
@MaximeZmt
add formAdmin struct
463b91a
@MaximeZmt
patch linting
b9e2bf7
@MaximeZmt
push working changes there
f35632e
@MaximeZmt
Update .gitignore
2a28803
@MaximeZmt
address changes
a1ec49a
@MaximeZmt
Merge branch 'c4dt:main' into main
a27faff
@MaximeZmt
change comment formatting
f35398f
@MaximeZmt
Update .gitignore
823103a 
edit .gitignore to add new line at the end as before
@MaximeZmt
make encode function logic simpler
4a972d0
@MaximeZmt
Merge pull request #4 from MaximeZmt/Work-Mzmt-FormAdmin
84360be 
add formAdmin struct
@MaximeZmt
change dela id
3ad2457
@MaximeZmt
solve conflict
5e881bb
@MaximeZmt
update UserID to VoterID
0c596c8
@MaximeZmt
happy linter
d7ffa0e
@MaximeZmt
happy linter bis
b218c64
@MaximeZmt
change SciperID to UserID
399d0f0
@MaximeZmt
address Carine review
8973938
@MaximeZmt
Merge pull request #5 from MaximeZmt/Work-Mzmt-UserID
2942f02 
Update ID Wording + transmit SCIPER ID at every transaction on blockchain
@MaximeZmt
add remove and is admin
3151902
@MaximeZmt
add ADD_ADMIN and REMOVE_ADMIN cmd
d1bdf22
@MaximeZmt
patch current error
639b346
@MaximeZmt
create admin form test
ec8e93f
@MaximeZmt
working on the testing part
9732d06
@MaximeZmt
patch test mistake
589dfbf
@MaximeZmt
fully working adminForm test
d652b1b
MaximeZmt and others added 28 commits May 28, 2024 11:45
@MaximeZmt
patch neff test
2dc4a7c
@MaximeZmt
patch neff test round 2
98c0f46
@MaximeZmt
patch weird neff test
4a40e99
@MaximeZmt
remove useless time.sleep
e48be78
@MaximeZmt
add explanation for voterid
1eb028f
@MaximeZmt
vet reformat
93cdd3b
@MaximeZmt
Merge pull request #9 from MaximeZmt/Work-Mzmt-OwnersVotersLogic
62cf3e8 
Merged as validated through slack the 28/05 at 4:50pm
@MaximeZmt
Merge branch 'c4dt:main' into main
7242c71
@MaximeZmt
feat: added new interface to the proxy (part 1)
b7cf44b
@MaximeZmt
feat: AddToAdminList first implem
a4d96fb
@MaximeZmt
temp: add info
b6d4d25
@MaximeZmt
fix: do reinsert existing admin
e3454c4
@MaximeZmt
Merge pull request #11 from MaximeZmt/Work-Mzmt-FixAddAdmin
d2080fd 
fix: do reinsert existing admin
@MaximeZmt
feat: update the signature verification on proxy
36cd87d
@MaximeZmt
work: working on debugging the new features of the proxy
0d6075d
@MaximeZmt
work: proxy add/remove/get adminlist
032fe70
@MaximeZmt
fix: for display
ec4fcc1
@MaximeZmt
fix: fix bug on transaction result
d4cf486
@MaximeZmt
fix: code cleaning + continue implem proxy
31d1230
@MaximeZmt
fix: remove commented query for testing
3cc3b98
@MaximeZmt
fix: improve comments to make govet happy
1f14351
@MaximeZmt
fix: clean the code
148b6ca
@MaximeZmt
fix: remove debug print
a91682d
@MaximeZmt
fix: revert change
cdda328
@MaximeZmt
Merge pull request #10 from MaximeZmt/Work-Mzmt-EditProxy
8e9babf 
feat: added new interface to the proxy (part 1)
@MaximeZmt
docs: update api.md
05b3d33
@MaximeZmt
Update api.md
98fa438
@MaximeZmt
Merge pull request #12 from MaximeZmt/Work-Mzmt-Docs
34c8feb 
docs: update api.md
@MaximeZmt MaximeZmt requested a review from PascalinDe July 2, 2024 13:37
@PascalinDe PascalinDe merged commit 2793657 into c4dt:student24spring_access_control Jul 2, 2024
3 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PascalinDe PascalinDe Awaiting requested review from PascalinDe

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@MaximeZmt @PascalinDe