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.

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

Dev/accesstoken2 #154

Merged
merged 45 commits into from
May 26, 2021
Merged

Conversation

winking324
Copy link
Contributor

rebase to master

xianing and others added 30 commits July 28, 2020 17:38
For Education First Euro customer's requirement
@plutoless
support custom source for connectivity testing
add  MITLICENSE
add rtm token generator example for csharp
refine description on README.md
replace random number generator from std to openssl
fix compile problem in release mode
add csharp token generator back
…ols into dev/RtcTokenBuilderWithDetail

merger error
Xia Ning and others added 15 commits April 21, 2021 13:57
adapt sdk 3.3.3 cloud proxy feature
add rtc channel encryptionSalt sample
# Conflicts:
#	DynamicKey/AgoraDynamicKey/cpp/src/RtcTokenBuilder.h
#	DynamicKey/AgoraDynamicKey/cpp/src/utils.h
#	DynamicKey/AgoraDynamicKey/cpp/test/RtcTokenBuilder_test.cpp
#	DynamicKey/AgoraDynamicKey/python/test/RtcTokenBuilderTest.py
#	DynamicKey/AgoraDynamicKey/python3/sample/RtcTokenBuilderSample.py
#	DynamicKey/AgoraDynamicKey/python3/src/AccessToken.py
#	DynamicKey/AgoraDynamicKey/python3/test/RtcTokenBuilderTest.py
@plutoless plutoless merged commit 4408a79 into AgoraIO:dev/accesstoken2 May 26, 2021
plutoless added a commit that referenced this pull request Jul 2, 2021
This reverts commit 4408a79, reversing
changes made to 5f571c2.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.