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

Problem with Screen Sharing #1

Closed
s-ohno-learnie opened this issue Apr 16, 2018 · 3 comments
Closed

Problem with Screen Sharing #1

s-ohno-learnie opened this issue Apr 16, 2018 · 3 comments

Comments

@s-ohno-learnie
Copy link

Hi, I am trying release-2.1.0(agora-education-demo 0.2.1) to check screen sharing.

After entering Classroom as a teacher, click "Screen Share" button, my client preview seems to be working, but student side computers cannot see the shared screen, and they get black screen, when teacher click "Screen Share" again(to be off), student side computers see white screen.

Is there any work around for this issue? Or something I need to fix for the code?

Thanks,
@menthays
Copy link

@s-ohno-learnie
Thanks for your report. This was a bug in our native sdk and we have fixed it. You can have a try to see if it works.

@s-ohno-learnie
Copy link
Author

@menthays

Thank you for your response. I'm looking forward the fix soon.

@s-ohno-learnie
Copy link
Author

@menthays

Thanks, I have confirmed the fix, and now the screen sharing works.

LichKing-2234 added a commit that referenced this issue Mar 12, 2020
@LichKing-2234
Merge pull request #1 from AgoraIO-Community/dev/language
f11ef23 
Dev/language
LichKing-2234 added a commit that referenced this issue Mar 13, 2020
@LichKing-2234
Squashed 'education_Android/AgoraEducation/' changes from 5fae84e..c3…
4173d8b 
…b239e

c3b239e optimize readme
f11ef23 Merge pull request #1 from AgoraIO-Community/dev/language

git-subtree-dir: education_Android/AgoraEducation
git-subtree-split: c3b239e
LichKing-2234 added a commit that referenced this issue Mar 13, 2020
@LichKing-2234
Squashed 'education_Android/AgoraEducation/' changes from 4e281ca..c2…
99b8e8b 
…3f9f1

c23f9f1 Merge branch 'master' into welfare
c3b239e optimize readme
3f7fe11 Merge pull request #2 from AgoraIO-Community/dev/welfare_language
f11ef23 Merge pull request #1 from AgoraIO-Community/dev/language

git-subtree-dir: education_Android/AgoraEducation
git-subtree-split: c23f9f161652005f1ff011f146c68b31f01ec3b9
Matrixbirds added a commit that referenced this issue Mar 19, 2020
@Matrixbirds
Merge pull request #1 from AgoraIO-Community/bugfix/5.2.0-develop-web
4a6c8cd 
Bugfix/5.2.0 develop web
Matrixbirds added a commit that referenced this issue Apr 23, 2020
@Matrixbirds
Squashed commit of the following:
7b0654a 
commit 038473b9b5094dbf9331966e7cc44e976854f03f
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Fri Apr 17 14:50:03 2020 +0800

    add debug log

commit 0da0e7012820911cdf10d450c9bf0e959df060da
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Fri Apr 17 00:00:51 2020 +0800

    fix. typo

commit def3863c9003b037bcd9ed5856da33faa7f09fe2
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Thu Apr 16 23:55:41 2020 +0800

    chore. add refresh token

commit 137fe96a4f53e52932103e57b424c0e43750c7d7
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Thu Apr 16 23:51:37 2020 +0800

    chore. add debug tool

commit edfdebc3ae2b1a1b5eb599a08800bb1f9c22c7af
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Tue Apr 14 13:24:44 2020 +0800

    fix. mui version

commit 3f325f3b896c75c708a8f05d3154c0d7e2bab54d
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Tue Mar 31 21:52:40 2020 +0800

    chore. upgrade to 5.2.1

commit 6f66fa6e22c714fb659c398814e575940920dac8
Merge: af78613 d7f1133
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Thu Mar 19 16:32:15 2020 +0800

    merge

commit d7f113326630527c2133a5cf4bc94d7c1e0d895e
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Thu Mar 19 11:51:29 2020 +0800

    fix. autoplay

commit 7ccf6a72f9dd4c306514ff6b37b3547f38c8edba
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Wed Mar 18 16:07:35 2020 +0800

    fix. autoplay

commit 976ec5571db8c2157aa2c6820111c2256e27b3e8
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Wed Mar 18 16:02:49 2020 +0800

    fix. autoplay

commit e0f10bba68315e3f759cbdcd2d0ebd49878f5211
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Wed Mar 18 14:48:18 2020 +0800

    fix. language & advance syntax

commit af78613c6ce57c7936334fc4fb2d8307d254198c
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Mar 14 19:25:56 2020 +0800

    Merge commit 'ffc00a238d380176336a1f9a82bdd09ab38e9a95' into dev/5.2.0-welfare-develop

commit d2d345cba5a863c3dad9b64ac92bccdd8c64baee
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Mar 14 17:40:03 2020 +0800

    fix. use endpoint instead region

commit 25aea721b9261cd2b07f1883b0426962663cc55e
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Mar 14 17:37:20 2020 +0800

    fix. lang select

commit f5f84f51f379adb023c9dbd3700af25ba57ba0ca
Merge: 04b3cbf 1872941
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Mar 14 17:33:46 2020 +0800

    Merge commit '40555ed15985a4a892385e8d024c35cd2cd25ba1' as 'education_web'

commit 04b3cbf705c91545f37c1f1434ec270d4c728d47
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Mar 14 17:33:14 2020 +0800

    chore. upgrade code

commit 1872941adf423371886c56794556f1347a6f685d
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Mar 14 17:30:59 2020 +0800

    fix. title

commit 9a20e03d7cf1d081cd9406ed3088fe361aa15483
Merge: e33286a 386ef4a
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Mar 14 17:31:26 2020 +0800

    Merge branch 'develop-welfare' of https://github.com/AgoraIO-Community/eEducation-Web into dev/5.2.0-welfare-develop

commit 386ef4ac8dfaa52c2ba20b3dfe1a869a9aa9ed26
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Mar 14 17:30:59 2020 +0800

    fix. title

commit e33286a055e2b70d98b7684d178da318f0847f42
Merge: d8a5429 8761853
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Mar 14 17:25:15 2020 +0800

    Merge branch 'develop-welfare' of https://github.com/AgoraIO-Community/eEducation-Web into dev/5.2.0-welfare-develop

commit 87618538f3c79299597acbe6c769363056c3d336
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Mar 14 17:24:20 2020 +0800

    upgrade docs

commit df5f28294c1a8f2e6f790e9a1393f39287ff7859
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Mar 14 17:10:36 2020 +0800

    fix. endpoint

commit d8a5429e07f3e04b3f0c3814acb29fa12b2ed961
Merge: 3c8fd75 991a3d2
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Mar 14 16:58:08 2020 +0800

    Merge remote-tracking branch 'sub_develop/develop-welfare' into dev/5.2.0-welfare-develop

commit 991a3d2eca5b383ce1cf6ddfe9b27be45ea2c6ed
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Mar 14 16:46:51 2020 +0800

    fix. api adapter

commit 3c8fd75798926e1ee14f690405ae1755415c42e3
Merge: b4ec5c1 2b6726c
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Mar 14 00:27:22 2020 +0800

    Merge branch 'develop-welfare' of https://github.com/AgoraIO-Community/eEducation-Web into dev/5.2.0-welfare-develop

commit 2b6726c4d4ce0b8fb2f89cf75bf4c54780f37323
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Mar 14 00:18:52 2020 +0800

    upgrade logo

commit b4ec5c1cc687106b2b1d3d59025b3176849c9d87
Merge: a8617e4 dd3f30b
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Mar 14 00:09:16 2020 +0800

    Merge commit 'dd3f30b3901d26c8d45a65229ea8502e66abde9d' as 'education_web'

commit dd3f30b3901d26c8d45a65229ea8502e66abde9d
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Mar 14 00:09:16 2020 +0800

    Squashed 'education_web/' content from commit 09f777d

    git-subtree-dir: education_web
    git-subtree-split: 09f777d8a5e4669ea9ce8630d97803bfb81c6f29

commit a8617e49b82b7bf1f94b0827997ed79775057cb7
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Mar 14 00:09:07 2020 +0800

    chore .remove old project

commit 09f777d8a5e4669ea9ce8630d97803bfb81c6f29
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Fri Mar 13 23:40:03 2020 +0800

    update readme

commit 0820435d313b34ce8e01c1d374b81b767a02a7f2
Merge: fb2e53b 5e40ab7
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Fri Mar 13 23:11:47 2020 +0800

    Merge remote-tracking branch 'sub_develop/develop-welfare' into dev/5.2.0-welfare-develop

commit 5e40ab7e1558ca65183ccd798c82e5bcc2f75b6a
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Fri Mar 13 21:04:14 2020 +0800

    fix. welfare

commit fb2e53bad1e50bf5064f0471ad1d71d4db93d119
Merge: 839d94f 93c48bc
Author: HUI <15215604969@163.com>
Date:   Fri Mar 13 17:19:59 2020 +0800

    Merge commit '93c48bc1ee0c9c60a26afd92881d55de791275f0' into dev/5.2.0-welfare-develop

commit 93c48bc1ee0c9c60a26afd92881d55de791275f0
Author: HUI <15215604969@163.com>
Date:   Fri Mar 13 17:19:59 2020 +0800

    Squashed 'education_Android/AgoraEducation/' changes from 021578c..871764a

    871764a Merge branch 'dev/5.2.0' into dev/welfare
    8272384 Merge branch 'master' into dev/5.2.0
    c3b239e optimize readme

    git-subtree-dir: education_Android/AgoraEducation
    git-subtree-split: 871764ab9dff3c422b7cf0aa104b42dde89dc2f6

commit 839d94f8b577b959913d8f565b89e2017c952577
Author: HUI <15215604969@163.com>
Date:   Fri Mar 13 02:45:58 2020 +0800

    init ci

commit a016aba7805c8c666df5e723b038472e6161c73a
Merge: 94804ba 021578c
Author: HUI <15215604969@163.com>
Date:   Fri Mar 13 02:43:55 2020 +0800

    Add 'education_Android/AgoraEducation/' from commit '021578cd933d33ffc28860aa35347f713b2d6b89'

    git-subtree-dir: education_Android/AgoraEducation
    git-subtree-mainline: 94804bac7649017e8396f0652d73bb357a624b8d
    git-subtree-split: 021578cd933d33ffc28860aa35347f713b2d6b89

commit 94804bac7649017e8396f0652d73bb357a624b8d
Author: HUI <15215604969@163.com>
Date:   Fri Mar 13 02:43:42 2020 +0800

    clear

commit 021578cd933d33ffc28860aa35347f713b2d6b89
Merge: 2cf59ba bfa3b03
Author: HUI <15215604969@163.com>
Date:   Fri Mar 13 02:36:03 2020 +0800

    Merge branch 'dev/5.2.0' into dev/welfare

commit bfa3b031966bf1f09b90a90762add0c745774e5c
Author: HUI <15215604969@163.com>
Date:   Fri Mar 13 02:35:45 2020 +0800

    add ci

commit 71626f8b21b30b0795cadc823ee6da9aa5bec860
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Fri Mar 13 00:41:20 2020 +0800

    fix. bug

commit 78013f55898a9299a94a113266d3194aac3815e5
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Thu Mar 12 23:43:04 2020 +0800

    bugfix. stage 1

commit 2cf59baa847891eeaf762973236514357f706ce7
Merge: 6de0239 460f332
Author: HUI <15215604969@163.com>
Date:   Thu Mar 12 22:58:59 2020 +0800

    Merge branch 'dev/5.2.0' into dev/welfare

commit 460f3325707ee1508b29017582de8fc848717767
Author: HUI <15215604969@163.com>
Date:   Thu Mar 12 22:58:42 2020 +0800

    fix time

commit 6de02398c9d85ed84b807a420c9050a24060f8be
Merge: 05de7b3 5920f4d
Author: HUI <15215604969@163.com>
Date:   Thu Mar 12 22:37:54 2020 +0800

    Merge branch 'dev/5.2.0' into dev/welfare

commit 5920f4debc8e12970eec9bf55eae8ba05e500e5e
Author: HUI <15215604969@163.com>
Date:   Thu Mar 12 22:37:41 2020 +0800

    add record status

commit 05de7b3d6dceee8682cd881c7798ccb0ce1e9b97
Author: HUI <15215604969@163.com>
Date:   Thu Mar 12 19:03:12 2020 +0800

    fix bug

commit d09481b71b1cd4132b30b61332391e042d2a1186
Merge: 76e12a2 7006158
Author: HUI <15215604969@163.com>
Date:   Thu Mar 12 19:01:31 2020 +0800

    Merge branch 'dev/5.2.0' into dev/welfare

commit 7006158a961d27966b4f3be95d8b8edef9e31aae
Author: HUI <15215604969@163.com>
Date:   Thu Mar 12 19:00:56 2020 +0800

    fix bug

commit 76e12a2d3949bc9b5b51f50bec1f0114e08123f3
Merge: a2b1bf6 3f7fe11
Author: HUI <15215604969@163.com>
Date:   Thu Mar 12 11:05:31 2020 +0800

    Merge branch 'welfare' into dev/welfare

commit 1e93d5ec31771174c0df99728f9692237326dff0
Merge: 6ee408e f11ef23
Author: HUI <15215604969@163.com>
Date:   Thu Mar 12 11:01:17 2020 +0800

    Merge branch 'master' into dev/5.2.0

    # Conflicts:
    #	app/build.gradle
    #	app/src/main/java/io/agora/education/base/BaseCallback.java

commit 3f7fe1105487bfd5d03558a46d38f6778fe597f1
Merge: 11373d6 4e281ca
Author: Arthas <luxuhui@agora.io>
Date:   Thu Mar 12 10:58:37 2020 +0800

    Merge pull request #2 from AgoraIO-Community/dev/welfare_language

    Dev/welfare language

commit f11ef230daa2e08983f36e11aaa62d43054dcfff
Merge: 2bc8518 5fae84e
Author: Arthas <luxuhui@agora.io>
Date:   Thu Mar 12 10:53:00 2020 +0800

    Merge pull request #1 from AgoraIO-Community/dev/language

    Dev/language

commit 6556725e7c2ef2e2bc10f251aed9cd116205854c
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Thu Mar 12 00:38:51 2020 +0800

    stash. use edu open api stage4

commit 420a6d7128406f154225a4de1b72e985806d9f29
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Wed Mar 11 21:32:19 2020 +0800

    stash. use edu open api stage3

commit 4e281ca9a45f1f56ce6a6365906aee02f1ab9c94
Merge: 33de58a 5fae84e
Author: HUI <15215604969@163.com>
Date:   Tue Mar 10 13:26:44 2020 +0800

    Merge branch 'dev/language' into dev/welfare_language

commit 5fae84ef196b8279682248ce6ca8eb47d416882c
Author: HUI <15215604969@163.com>
Date:   Tue Mar 10 13:23:49 2020 +0800

    optimize server request toast

commit 33de58a63de2bd012b0e6f783c65e52e3d2d61aa
Merge: 4cc8688 1af38a0
Author: HUI <15215604969@163.com>
Date:   Tue Mar 10 12:28:26 2020 +0800

    Merge branch 'dev/language' into dev/welfare_usa

commit 1af38a04aaf8b7aa68d4041c46b4ba4bcb0d643d
Author: HUI <15215604969@163.com>
Date:   Tue Mar 10 12:27:58 2020 +0800

    optimize translate

commit 4cc868883a880f26c6d1edda5ad158dcfe497599
Author: HUI <15215604969@163.com>
Date:   Tue Mar 10 11:53:13 2020 +0800

    optimize translate

commit a2b1bf670271a81e6c0d3dfcd96076be90b521aa
Merge: 20c30a0 87a7fde
Author: HUI <15215604969@163.com>
Date:   Mon Mar 9 18:27:35 2020 +0800

    Merge branch 'dev/welfare_usa' into dev/welfare

commit 20c30a01ee0678d6ae6ff39baf6966fad1307caa
Merge: f325a00 6ee408e
Author: HUI <15215604969@163.com>
Date:   Mon Mar 9 17:53:06 2020 +0800

    Merge branch 'dev/5.2.0' into dev/welfare

commit 87a7fdee9e6d124c9bb08349167bb4a514389c29
Author: HUI <15215604969@163.com>
Date:   Mon Mar 9 17:38:33 2020 +0800

    multi language

commit 1942a62dee94f5b4aa145e3b167bd5728dc70649
Merge: 953d602 3647f0d
Author: HUI <15215604969@163.com>
Date:   Mon Mar 9 17:29:42 2020 +0800

    Merge branch 'dev/language' into dev/welfare_usa

    # Conflicts:
    #	app/src/normal/java/io/agora/education/MainActivity.java

commit 6ee408e998c4098cbac2344f985e2b1b3f649c4c
Author: HUI <15215604969@163.com>
Date:   Mon Mar 9 17:26:45 2020 +0800

    multi language

commit dd114913bc92128567a754bf74cbb9f9f13e4016
Merge: 40cb33d 3647f0d
Author: HUI <15215604969@163.com>
Date:   Mon Mar 9 17:03:05 2020 +0800

    Merge branch 'dev/language' into dev/5.2.0

    # Conflicts:
    #	app/src/main/java/io/agora/education/EduApplication.java
    #	app/src/main/java/io/agora/education/classroom/bean/channel/ChannelInfo.java
    #	app/src/main/java/io/agora/education/classroom/strategy/context/OneToOneClassContext.java
    #	app/src/main/java/io/agora/education/classroom/strategy/context/SmallClassContext.java
    #	app/src/main/java/io/agora/education/service/bean/response/AppConfigRes.java
    #	app/src/normal/java/io/agora/education/MainActivity.java

commit 3647f0d62f0f7effd6fbc8051a08f93338633ccf
Author: HUI <15215604969@163.com>
Date:   Mon Mar 9 16:54:56 2020 +0800

    multi language

commit 953d6028c53842d788bd508dad646818eb4aafe5
Author: HUI <15215604969@163.com>
Date:   Mon Mar 9 15:42:46 2020 +0800

    change wuhan to welfare

commit 5e45c76e94497eae64859958d51e397eedef58cb
Author: HUI <15215604969@163.com>
Date:   Mon Mar 9 15:41:37 2020 +0800

    change wuhan to welfare

commit 40cb33d0e8f098d1f3e244b1f5430a6466b4c85b
Author: HUI <15215604969@163.com>
Date:   Fri Mar 6 20:48:15 2020 +0800

    dev finish

commit 308f028ca7e79b805c2278d3a574c8155128adfe
Author: HUI <15215604969@163.com>
Date:   Thu Mar 5 13:59:33 2020 +0800

    upgrade bean

commit 0f20302458032c8e420890472925298c2812190f
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Thu Mar 5 00:03:38 2020 +0800

    stash. use edu open api stage2

commit a72ff66380bd1259b449c78d2d4ed8de1b9700a5
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Wed Mar 4 00:35:18 2020 +0800

    stash. class state

commit f325a00f3a923ec8700bcaa50bae3cecfa53bac6
Author: HUI <15215604969@163.com>
Date:   Tue Mar 3 15:11:38 2020 +0800

    remove board sdk token

commit a7d09b0eaa47003c650ef2eae559f04ac790f082
Merge: d8c32b1 45eecde
Author: HUI <15215604969@163.com>
Date:   Tue Mar 3 15:10:10 2020 +0800

    Merge branch '5.2.0' into wuhan

commit 45eecde932dc311f865b479836414f2803848304
Author: HUI <15215604969@163.com>
Date:   Tue Mar 3 15:09:51 2020 +0800

    remove board sdk token

commit d8c32b111e26177531f558865ad299c04af633ff
Author: HUI <15215604969@163.com>
Date:   Tue Mar 3 14:37:31 2020 +0800

    fix bug

commit fa0d099da12b001dd667f803c918070d27f67eaf
Author: HUI <15215604969@163.com>
Date:   Tue Mar 3 14:35:50 2020 +0800

    remove unless code

commit 28ba85a1f9a2e2b3d8cce4592a2c9b3843926786
Merge: e6ebb70 42b7680
Author: HUI <15215604969@163.com>
Date:   Tue Mar 3 14:34:14 2020 +0800

    Merge branch '5.2.0' into wuhan

commit 42b7680987320852ff59aeebb5bf5b8d1d5e7a14
Author: HUI <15215604969@163.com>
Date:   Tue Mar 3 14:33:42 2020 +0800

    config && login

commit 887aacb1fde6d2969e8507d4b4e6c0045997a398
Merge: a948d48 e6ebb70
Author: HUI <15215604969@163.com>
Date:   Mon Mar 2 19:28:38 2020 +0800

    Add 'education_Android/AgoraEducation/' from commit 'e6ebb706ff19de3273163b7f9e207444791f674f'

    git-subtree-dir: education_Android/AgoraEducation
    git-subtree-mainline: a948d485edc12c9850a3dbbdd0e13a71473505fe
    git-subtree-split: e6ebb706ff19de3273163b7f9e207444791f674f

commit a948d485edc12c9850a3dbbdd0e13a71473505fe
Author: HUI <15215604969@163.com>
Date:   Mon Mar 2 19:27:10 2020 +0800

    delete

commit e6ebb706ff19de3273163b7f9e207444791f674f
Merge: 11373d6 4fc4118
Author: HUI <15215604969@163.com>
Date:   Mon Mar 2 19:18:11 2020 +0800

    Merge branch '5.2.0' into wuhan

commit 4fc4118d76481c88f26093caad96fd39a0203bf9
Author: HUI <15215604969@163.com>
Date:   Mon Mar 2 19:16:35 2020 +0800

    init

commit e0438da4aaa0987f37e200d5021a6cadc803a3aa
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Mon Mar 2 18:10:52 2020 +0800

    fix. source map & version changed

commit 2f6d8d5d463e4cbe3227f85393f3ee944961e229
Author: HUI <15215604969@163.com>
Date:   Mon Mar 2 17:31:40 2020 +0800

    upgrade to 5.1.0

commit 520cce533aa8fd8bceeb49eed561ebef4156efe8
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Mon Mar 2 17:18:38 2020 +0800

    chore. remove unused file

commit 2712822c31a5ad34a4d10510f02e0a5c622cb107
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Mon Mar 2 17:11:32 2020 +0800

    chore. refactor large-class support, deprecate channel attributes solution

commit a4476ec2e4d60c181f43e30a5ff190d10b402c33
Author: HUI <15215604969@163.com>
Date:   Wed Feb 26 15:15:43 2020 +0800

    finish timeline

commit 65a1bca3a30cdd2f237f63f1e33619593f6eaff0
Merge: 51b264f 2f84dcb
Author: Qianze Zhang <qianze.zhang@hotmail.com>
Date:   Sun Feb 23 19:51:27 2020 +0800

    Merge pull request #85 from AgoraIO-Usecase/welfare-develop

    Welfare develop

commit 2f84dcbd2018ab737679fc86ed99f77ac4a0c3ff
Merge: a14dd50 d54bfc4
Author: srs888001 <603722906@qq.com>
Date:   Sun Feb 23 18:19:32 2020 +0800

    Merge pull request #83 from AgoraIO-Usecase/Android/wuhan

    Android/wuhan

commit d54bfc45834ba0233c9fb6a278f89fec7b3dcd39
Merge: ee48a72 a14dd50
Author: HUI <15215604969@163.com>
Date:   Sun Feb 23 18:10:12 2020 +0800

    Merge branch 'welfare-develop' into Android/wuhan

commit 2bc8518a1fb72cffc7ee7b77934bb37ea83aef29
Merge: f9e5f8f b7de6f8
Author: HUI <15215604969@163.com>
Date:   Sun Feb 23 17:58:59 2020 +0800

    Merge branch 'develop' into Android/5.1.0

    # Conflicts:
    #	education_Android/AgoraEducation/app/src/normal/res/values/string_configs.xml
    #	education_Android/AgoraEducation/local.properties

commit a14dd50bfc18dbc4f4e1a491d4dd626056b8e533
Merge: e399c9c 7f74c52
Author: srs888001 <603722906@qq.com>
Date:   Sun Feb 23 17:35:29 2020 +0800

    Merge pull request #81 from AgoraIO-Usecase/dev/web-org-alpha.1

    公益demo

commit e399c9c9e068fdc480f4e9112e7dd6f4e2df7ab4
Merge: 51b264f 37dca40
Author: srs888001 <603722906@qq.com>
Date:   Fri Feb 21 17:47:55 2020 +0800

    Merge pull request #76 from AgoraIO-Usecase/iOS/welfare-5.1.0-develop

    I os/welfare 5.1.0 develop

commit 7f74c52e5435cc63e24b6143dd9ae466ae900b6a
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Fri Feb 21 16:35:01 2020 +0800

    fix. comment isWritable

commit 37dca40c96b49888dc0405253f4632c8e6590b08
Author: SRS <sirusheng@agora.io>
Date:   Fri Feb 21 14:08:59 2020 +0800

    fix small class UI

commit 297bdf5a10f938c3b8a6b2152ab6efe3668d4761
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Thu Feb 20 23:10:51 2020 +0800

    fix. bug

commit 16820b6c073cc1e250686b98f86acfac92f2934d
Author: SRS <sirusheng@agora.io>
Date:   Thu Feb 20 16:23:47 2020 +0800

    update white version

commit 11373d6f5a799fad063893ac11e03e407599b630
Merge: 9a91c14 f9e5f8f
Author: HUI <15215604969@163.com>
Date:   Thu Feb 20 11:57:48 2020 +0800

    Merge branch 'Android/5.1.0' into Android/wuhan

commit ee48a72de5fca9d9ac8773a29077de0d48b16d30
Merge: e028285 4ae73f5
Author: HUI <15215604969@163.com>
Date:   Thu Feb 20 11:57:48 2020 +0800

    Merge branch 'Android/5.1.0' into Android/wuhan

commit f9e5f8f1a1e20993d262b11117f23e5bfb00a976
Author: HUI <15215604969@163.com>
Date:   Thu Feb 20 11:57:22 2020 +0800

    applicationIdSuffix

commit 4ae73f5925701d4c71759a7b0e8a3cb69e4d4cdc
Author: HUI <15215604969@163.com>
Date:   Thu Feb 20 11:57:22 2020 +0800

    applicationIdSuffix

commit 5b30374b66e0dcfce617e30bfcf36b8db69fce7f
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Thu Feb 20 11:00:12 2020 +0800

    fix. bug

commit bcdd63c7887832d73ec42ae657d72571d1adcc1a
Author: SRS <sirusheng@agora.io>
Date:   Wed Feb 19 20:48:20 2020 +0800

    remove redundant code

commit 0590fa9316f913b2b96b94b00489993eaec463ad
Author: SRS <sirusheng@agora.io>
Date:   Wed Feb 19 18:47:41 2020 +0800

    add follow logic

commit 9a91c14ed7bf38fad7edfa463863be689c1f69b8
Author: HUI <15215604969@163.com>
Date:   Wed Feb 19 17:19:53 2020 +0800

    add english app name

commit e028285cf3b2fa889dc7632c0c1f09dae17f5329
Author: HUI <15215604969@163.com>
Date:   Wed Feb 19 17:19:53 2020 +0800

    add english app name

commit 80e10e0fea0e13a93297e093b7ea20bf6f6a8858
Merge: 32bd4b2 ba4c450
Author: HUI <15215604969@163.com>
Date:   Wed Feb 19 17:16:14 2020 +0800

    Merge branch 'Android/5.1.0' into Android/wuhan

commit d3506eb28fff3544f5e631b6b9b3e76ce7ffa38f
Merge: 940cbfc efa039f
Author: HUI <15215604969@163.com>
Date:   Wed Feb 19 17:16:14 2020 +0800

    Merge branch 'Android/5.1.0' into Android/wuhan

commit ba4c450775164e82d4a662065e71c885fa1aec18
Author: HUI <15215604969@163.com>
Date:   Wed Feb 19 17:15:15 2020 +0800

    add english policy

commit efa039f06315cd9f282bf67abec7c37720f6239b
Author: HUI <15215604969@163.com>
Date:   Wed Feb 19 17:15:15 2020 +0800

    add english policy

commit 32bd4b205e2d90a67325a7b5f4f2011ba4da2564
Merge: a966911 8a56cfb
Author: HUI <15215604969@163.com>
Date:   Wed Feb 19 16:29:06 2020 +0800

    Merge branch 'Android/5.1.0' into Android/wuhan

commit 940cbfc10d7d7397a07e373e3c439d6393b4fe8e
Merge: 0685962 e6d1c5a
Author: HUI <15215604969@163.com>
Date:   Wed Feb 19 16:29:06 2020 +0800

    Merge branch 'Android/5.1.0' into Android/wuhan

commit 8a56cfb99508b342c4df2a4a8082ee34a02cde2d
Author: HUI <15215604969@163.com>
Date:   Wed Feb 19 16:25:18 2020 +0800

    add lock board

commit e6d1c5a6ab4ddb080e6395dd3f66bd4a25325ad7
Author: HUI <15215604969@163.com>
Date:   Wed Feb 19 16:25:18 2020 +0800

    add lock board

commit b74628b556e80ac88fe56be42d12f17a125a9eb1
Author: SRS <sirusheng@agora.io>
Date:   Wed Feb 19 15:19:11 2020 +0800

    1. optimization UI
    2. add multilingual
    3. add small class white permission

commit 0685962b892ef7643d2e2c0553845109cc0f9c43
Merge: d162f98 51b264f
Author: HUI <15215604969@163.com>
Date:   Wed Feb 19 14:47:55 2020 +0800

    Merge branch 'welfare' into Android/wuhan

commit a96691138f55bdcb7efb834523b21254c09e8005
Merge: bb281f1 2e6fac8
Author: agorauser-01 <agorauser-01@xfruit.cn>
Date:   Wed Feb 19 13:04:06 2020 +0800

    Merge branch 'Android/5.1.0' into Android/wuhan

commit d162f98825fc87fe99414359f8e87d6bddbeaad5
Merge: c7f8054 de6de65
Author: agorauser-01 <agorauser-01@xfruit.cn>
Date:   Wed Feb 19 13:04:06 2020 +0800

    Merge branch 'Android/5.1.0' into Android/wuhan

commit 2e6fac801d62c7efab09fb4819cd732ca86ea6de
Author: agorauser-01 <agorauser-01@xfruit.cn>
Date:   Wed Feb 19 13:03:20 2020 +0800

    temp finish

commit de6de65b3c739d36bf686e72533d10a3279a2933
Author: agorauser-01 <agorauser-01@xfruit.cn>
Date:   Wed Feb 19 13:03:20 2020 +0800

    temp finish

commit b7de6f80825e9254db4778b3204dab58064f5f7e
Author: SRS <sirusheng@agora.io>
Date:   Tue Feb 18 12:00:46 2020 +0800

    optimization ui

commit 51b264f3806dd2ea6d443c7dfec08fb0c3b1ebdb
Merge: d2454d2 c7f8054
Author: srs888001 <603722906@qq.com>
Date:   Mon Feb 17 21:02:04 2020 +0800

    Merge pull request #73 from AgoraIO-Usecase/Android/wuhan

    Android/wuhan

commit c7f8054ca4444127a6a400e1f9c74ee1791fd6fa
Merge: 1cb64a0 d2454d2
Author: HUI <15215604969@163.com>
Date:   Mon Feb 17 13:31:22 2020 +0800

    Merge remote-tracking branch 'origin/welfare' into Android/wuhan

    # Conflicts:
    #	education_web/.env.example
    #	education_web/.gitignore
    #	education_web/package.json
    #	education_web/src/components/mediaboard.tsx
    #	education_web/src/stores/whiteboard.ts

commit bb281f1e0646d37227ccecb330d1c52b9df486af
Author: HUI <15215604969@163.com>
Date:   Mon Feb 17 13:21:02 2020 +0800

    init

commit 1cb64a048c7cb164432cfb4c657500cf26f66393
Author: HUI <15215604969@163.com>
Date:   Mon Feb 17 13:21:02 2020 +0800

    init

commit 0cee2102f335a32139add839a89a7fbac6c63a15
Author: HUI <15215604969@163.com>
Date:   Mon Feb 17 13:15:16 2020 +0800

    优化keyStore配置

commit d323edc9f81842eade37c3b4a3d750e43c3313ce
Author: HUI <15215604969@163.com>
Date:   Mon Feb 17 13:15:16 2020 +0800

    优化keyStore配置

commit d2454d2ebccbe33666158e6d7ccdfb5d4833e6f2
Merge: b0e3504 9f1e215
Author: srs888001 <603722906@qq.com>
Date:   Mon Feb 17 13:04:26 2020 +0800

    Merge pull request #72 from AgoraIO-Usecase/dev/web-org-alpha.1

    公益web分支

commit 9f1e2157acd2c5bae185cfdbc6728dfdcfe04835
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Mon Feb 17 13:01:07 2020 +0800

    chore. update readme

commit fc3fbbaefa89b5b13a0f6da01527a17323291531
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Mon Feb 17 12:54:19 2020 +0800

    chore. comment rtm proxy

commit 0bb6f4bc0df126480b08fe29f74cc1ea48f28b78
Author: HUI <15215604969@163.com>
Date:   Mon Feb 17 12:53:39 2020 +0800

    remove unused code

commit f19285a6647db475c2dba84f792f810eac677436
Author: HUI <15215604969@163.com>
Date:   Mon Feb 17 12:53:39 2020 +0800

    remove unused code

commit 6f7e4958cba23e0eea9c0d8a5b17f5484a7f8d20
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Mon Feb 17 12:47:45 2020 +0800

    chore. update readme

commit cfb50a8bc88a3a3cda82e8864fa7cdaaa67f392b
Author: HUI <15215604969@163.com>
Date:   Mon Feb 17 12:44:24 2020 +0800

    add policy

commit 832d97fc5744e467c9924eaf9f69a304704403da
Author: HUI <15215604969@163.com>
Date:   Mon Feb 17 12:44:24 2020 +0800

    add policy

commit c67c378350c9e1e82e09d30a7fa953da568288f8
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Mon Feb 17 12:28:30 2020 +0800

    fix. optimize webpack build

commit b0e350433d678b3f81b39d423903aa04b3398d46
Author: SRS <sirusheng@agora.io>
Date:   Sun Feb 16 19:18:28 2020 +0800

    update network env

commit 2d343603323ba788ca1082dd138705f2f3703ebe
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Feb 15 12:45:43 2020 +0800

    fix. api prefix

commit b3b387aa29a36f10c5f9434935780662e1507a53
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Fri Feb 14 19:26:11 2020 +0800

    feat. add assets

commit 7021ebec69d257526068df2f2af52a126932a6ce
Author: SRS <sirusheng@agora.io>
Date:   Fri Feb 14 13:34:25 2020 +0800

    config network env

commit 6ca0296dd86db81c8d2ae5aadcea2b177a995dd9
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Thu Feb 13 21:36:19 2020 +0800

    fix. autoplay

commit bca6f73062557260b9f22e06fbdb98049d71a12d
Author: HUI <15215604969@163.com>
Date:   Thu Feb 13 16:16:34 2020 +0800

    change api host

commit ce9ce658b80368486f19a7e2486f45fa58c13e48
Author: HUI <15215604969@163.com>
Date:   Thu Feb 13 16:16:34 2020 +0800

    change api host

commit fbb9b0c9bc3bc22d72f37d414454ea5e617a706a
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Thu Feb 13 04:17:52 2020 +0800

    fix. bug

commit e6cd6984d77f079b0c8cdd3f1dbc16950f1585df
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Wed Feb 12 12:26:06 2020 +0800

    chore. update white-web-sdk

commit c9341d4c37c8391867d324943eaf8882f0970c15
Author: HUI <15215604969@163.com>
Date:   Wed Feb 12 12:04:51 2020 +0800

    init

commit c21b219c18e850251d81b75028caba8683f06dbc
Author: HUI <15215604969@163.com>
Date:   Wed Feb 12 12:04:51 2020 +0800

    init

commit d0f65ec0d5e9b6e86f45b45f0797335387a61441
Author: SRS <sirusheng@agora.io>
Date:   Wed Feb 12 09:57:44 2020 +0800

    update white version & fix bigclass mute bug

commit 41918fd2d358d5114a20f3e05ffff2f302f4cf7a
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Tue Feb 11 16:53:16 2020 +0800

    chore. update sdk

commit 95e8af8d15b5eb3d829ee40bfb375d923f5bf040
Author: SRS <sirusheng@agora.io>
Date:   Tue Feb 11 16:43:41 2020 +0800

    update white version

commit c742d88ff067b408b2636ea2a6c10af3029643a3
Author: SRS <sirusheng@agora.io>
Date:   Tue Feb 11 13:45:17 2020 +0800

    add logic control

commit e1e515b3ee85251286358ed68770e9be24342c3a
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Mon Feb 10 01:04:45 2020 +0800

    feat. form-input support pattern match
    fix. rtm instance stalled when join timeout
    chore. update white-web-sdk & revert react-color

commit b95e03a07aca5c7f148624aeb03a2a5ef9b61173
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sun Feb 9 21:13:17 2020 +0800

    feat. add globalShortcut ctrl+shift+x openDevTools

commit 79b828da31c637c12a29dd798e94af15db3cef05
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sun Feb 9 19:31:30 2020 +0800

    fix. ignore

commit e988863bf23a916d46c4a8e24a2de89916821590
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sun Feb 9 18:57:17 2020 +0800

    fix. stale strokeColor & upgrade icons

commit 09cdf545e8446ea8f46356ea3eda57448e0c7e05
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sun Feb 9 18:03:39 2020 +0800

    chore. upgrade white-web-sdk & lock react-color

commit 682a4d69c562e81dfd58264163b9b639fa9e7689
Author: SRS <sirusheng@agora.io>
Date:   Sat Feb 8 16:13:30 2020 +0800

    add  ci config

commit 23fe1ab899b85a07cda2d0a92176b4c75591f5ad
Author: SRS <sirusheng@agora.io>
Date:   Sat Feb 8 14:47:42 2020 +0800

    update app name

commit 92fe1c0db4d32518f8db6e44ffce3851255e0010
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Fri Feb 7 19:04:55 2020 +0800

    fix. whiteboard reset

commit 3c5da6df8cccbbee201aa1981c754473487c5f60
Author: SRS <sirusheng@agora.io>
Date:   Thu Feb 6 22:24:03 2020 +0800

    fix bug

commit e24364264d65227fff57d392c32f01fda3bcafdb
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Thu Feb 6 18:33:30 2020 +0800

    chore. enhance ui

commit 1bb903a5ccd30216ccef8cb16a5df1cf179e0683
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Thu Feb 6 17:04:29 2020 +0800

    fix. notice message count

commit f904cde5da944f17e835ecb798cdc1dc6fbba2b3
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Wed Feb 5 23:37:17 2020 +0800

    fix. missing scss

commit 3b3a6cb778a446d00c65e50307e97fcb695c0992
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Wed Feb 5 13:43:21 2020 +0800

    feat. gen uuid identity

commit f372413ad196a9dc8936a69540e0418d01fefbd0
Author: SRS <sirusheng@agora.io>
Date:   Wed Feb 5 11:53:26 2020 +0800

    save code

commit 1042cba461487453318f34e6bfd7d6f4447610a8
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Tue Feb 4 22:41:37 2020 +0800

    feat. edu special

commit b509dac02b30d56eb314e2b5bf7523399bcb1a0e
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Mon Feb 3 22:19:58 2020 +0800

    feat. network quality icon

commit a054c324c143cd67f3407b21dfc383510d3320ff
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Mon Feb 3 18:22:36 2020 +0800

    chore. remove unused env variables

commit 501e9bb935f79cf91b3858369727c1cdfc3bb7f3
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Mon Feb 3 18:19:24 2020 +0800

    chore. remove unused env variables

commit 4bef7821a0886bb22b2e818b80f9ee12376eb664
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Feb 1 13:17:22 2020 +0800

    fix. whiteboard not reset

commit ea63cb1c57cd7d6004d231d76f70a0cab63aa55e
Author: SRS <sirusheng@agora.io>
Date:   Sat Feb 1 10:28:38 2020 +0800

    modify api for config

commit 4d92372fe810fe0036c551c081f1e94ae2268a0f
Author: SRS <sirusheng@agora.io>
Date:   Fri Jan 31 18:01:09 2020 +0800

    add private permission distrubition

commit bb0aff4b1debed00a33d4a18ca3eb854c980a15a
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Fri Jan 31 16:19:23 2020 +0800

    fix. setup proxy

commit 4baabfc0bd94059d695ebcd2fda51ce53ba3e49e
Author: SRS <sirusheng@agora.io>
Date:   Fri Jan 31 14:01:53 2020 +0800

    add app update logic

commit 8c0e0e5623abbda8d14760f49de60dfd220e724f
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Fri Jan 31 13:16:28 2020 +0800

    fix. missing file

commit f98395be9f266d7fc9c1c5aaf50e2740c10d2907
Author: SRS <sirusheng@agora.io>
Date:   Fri Jan 31 10:02:36 2020 +0800

    update config

commit 64e98d92f65ba39f330145e0928d7e6ebc835e1f
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sun Jan 19 22:08:43 2020 +0800

    feat. add rtm replay

commit b9ece4ade8b9a54f4cf99e2540bf84885092ce9c
Author: Qianze Zhang <qianze.zhang@hotmail.com>
Date:   Wed Jan 29 17:01:56 2020 +0800

    Update package.json

commit 0442b8d99f5ea4e473b96c22704eaa4be9830ce0
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Wed Jan 29 14:49:42 2020 +0800

    fix. missing electron mac dependency

commit 025dc852dc72aa7fb8b4d98b9d3c4d354ad46dd6
Author: matrixbirds <9990676+Matrixbirds@users.noreply.github.com>
Date:   Sun Jan 19 16:47:13 2020 +0800

    Update README.zh.md

commit f2f29a6283c06909d871001d6daf5ba40483746e
Author: matrixbirds <9990676+Matrixbirds@users.noreply.github.com>
Date:   Sun Jan 19 16:46:52 2020 +0800

    Update README.md

commit 7d80bbacef9bd72a4ed0df1f1e925d34a9069dac
Merge: ed85311 f19901e
Author: srs888001 <603722906@qq.com>
Date:   Thu Jan 16 11:08:35 2020 +0800

    Merge pull request #62 from AgoraIO-Usecase/iOS/5.0.0-fixbug

    I os/5.0.0 fixbug

commit 413ebfa608a68564a621acaa63191352a167901f
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Thu Jan 16 09:53:39 2020 +0800

    feat. support i18n

commit 87a39c55463be2ac50748b972fc64487da04c994
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Wed Jan 15 13:42:28 2020 +0800

    fix. electron view crop

commit f19901e99dfeb12bf70b8ccd76f91a0112728d02
Author: SRS <sirusheng@agora.io>
Date:   Wed Jan 15 11:55:33 2020 +0800

    update ci rtc appid

commit a0cefa252b5374ec33338ae462867715aeebd822
Author: SRS <sirusheng@agora.io>
Date:   Wed Jan 15 11:23:34 2020 +0800

    update ci rtc appid

commit ed853118049d1277e16120428977b8d4330424bd
Author: Qianze Zhang <qianze.zhang@hotmail.com>
Date:   Tue Jan 14 16:32:00 2020 +0800

    Update README.md

commit 18bb9d7068f37d92b51c2773fe927cc60617e541
Author: srs888001 <603722906@qq.com>
Date:   Tue Jan 14 15:07:07 2020 +0800

    Update build-ios.yml

commit 2f0c54d64edbe954a284529ca7e5b3a75b01cf17
Author: srs888001 <603722906@qq.com>
Date:   Tue Jan 14 14:58:21 2020 +0800

    Update build-ios.yml

commit 2ce10e8b0bafbeac9537c6903634cbe2e8ecdc10
Author: srs888001 <603722906@qq.com>
Date:   Tue Jan 14 14:29:14 2020 +0800

    Update build-ios.yml

commit 4c84dc8767ec6ad4f6101eb73fff4ae6e14a8bb6
Author: SRS <sirusheng@agora.io>
Date:   Tue Jan 14 14:26:49 2020 +0800

    chore. remove deprecated fold

commit 3f5370802ed7d78e98480cda6b65b26fcfec2950
Author: SRS <sirusheng@agora.io>
Date:   Tue Jan 14 14:22:36 2020 +0800

    fix pipeline

commit 098cfab8895224652fc0a608927eaf2d242e5203
Author: srs888001 <603722906@qq.com>
Date:   Tue Jan 14 14:03:32 2020 +0800

    Update build-ios-qa.yml

commit 61ccafec8b74653445d6f0a18b5f718e2452e889
Merge: f6231d5 fa33810
Author: srs888001 <603722906@qq.com>
Date:   Tue Jan 14 13:56:11 2020 +0800

    Merge pull request #61 from AgoraIO-Usecase/fix-pipeline

    Fix pipeline

commit fa3381048dff56096bd6147ed2ace691eda6768f
Merge: 8096f51 f6231d5
Author: SRS <sirusheng@agora.io>
Date:   Tue Jan 14 13:50:19 2020 +0800

    Merge branch 'master' into fix-pipeline

    # Conflicts:
    #	cicd/templates/build-ios-dev.yml

commit 8096f515ec062c81e7753a43a8c17e7e5aa9ff65
Author: SRS <sirusheng@agora.io>
Date:   Tue Jan 14 13:40:59 2020 +0800

    update pipeline

commit f6231d502f8a91ec00a72fc38f6f8d29145369b6
Author: srs888001 <603722906@qq.com>
Date:   Tue Jan 14 13:23:20 2020 +0800

    Update build-ios.yml

    add task

commit 8a1a61e8fc7c8a58a57e9b3610199a5d849392e4
Author: srs888001 <603722906@qq.com>
Date:   Tue Jan 14 12:27:52 2020 +0800

    Update build-ios.yml

    fix variables group bug

commit ffea157f40fe4518cedeaa85d8e2d51e54b769b2
Merge: 7fbed9a 0227efc
Author: Qianze Zhang <qianze.zhang@hotmail.com>
Date:   Tue Jan 14 12:20:44 2020 +0800

    Merge pull request #59 from AgoraIO-Usecase/iOS/5.0.0-fixbug

    I os/5.0.0 fixbug

commit 7fbed9a82bbc19192be2c43236679e0f79f6c704
Author: matrixbirds <9990676+Matrixbirds@users.noreply.github.com>
Date:   Tue Jan 14 12:01:44 2020 +0800

    Update README.md

commit f4677da4e9eddacaa2f830a0d68459f5849719eb
Author: matrixbirds <9990676+Matrixbirds@users.noreply.github.com>
Date:   Tue Jan 14 12:00:54 2020 +0800

    Update README.md

commit 816f684df65c10dc4ed90215941e01174e6d719d
Author: matrixbirds <9990676+Matrixbirds@users.noreply.github.com>
Date:   Tue Jan 14 11:54:11 2020 +0800

    Update README.zh.md

commit 28729e71768943c9cd4346dd3b5e0cb0b057d10e
Author: matrixbirds <9990676+Matrixbirds@users.noreply.github.com>
Date:   Tue Jan 14 11:51:50 2020 +0800

    Update README.md

commit 8480fb70f1d08da2534b0da58cabc6fb8e1e643a
Merge: 71602f5 59da07a
Author: matrixbirds <9990676+Matrixbirds@users.noreply.github.com>
Date:   Tue Jan 14 11:48:50 2020 +0800

    Merge pull request #60 from AgoraIO-Usecase/web/5.0.0

    delete. lock file

commit 59da07afbe95ada341b6ae78b5e10d8b2d454bb4
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Tue Jan 14 11:46:30 2020 +0800

    delete. lock file

commit 0227efc6b57ab5b47b0066b2b136de2f3a838a6a
Merge: 1969027 71602f5
Author: SRS <sirusheng@agora.io>
Date:   Tue Jan 14 11:36:09 2020 +0800

    Merge branch 'master' into 5.0.0-fixbug

commit 71602f5025cd33704c278e71b8951de562b7b3df
Merge: f08d4aa a16a487
Author: Qianze Zhang <qianze.zhang@hotmail.com>
Date:   Tue Jan 14 11:34:14 2020 +0800

    Merge pull request #58 from AgoraIO-Usecase/web/5.0.0

    Web/5.0.0

commit a16a48739d9dcd8adb18a925494dc7fa3b5aa047
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Tue Jan 14 11:31:26 2020 +0800

    chore. add electron & icons

commit cfa5e74a281f77cbf10dd16e355768d3cfb34b7b
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Tue Jan 14 11:28:52 2020 +0800

    chore. update readme

commit 19690276bc7485ae577a32467f541578627523d6
Merge: d80a87d f08d4aa
Author: SRS <sirusheng@agora.io>
Date:   Tue Jan 14 11:28:47 2020 +0800

    Merge branch 'master' into 5.0.0-fixbug

commit 141bd670b34891533dd8f94afaa831cb42304b2f
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Tue Jan 14 11:25:52 2020 +0800

    chore. commit missing frontend files

commit d80a87d91b6adebe7090bf2bf4342f3fdb824af6
Merge: ca52d89 56075e8
Author: SRS <sirusheng@agora.io>
Date:   Tue Jan 14 10:35:34 2020 +0800

    Merge branch '5.0.0-fixbug' of https://github.com/AgoraIO-Usecase/eEducation into 5.0.0-fixbug

commit f08d4aa1cf5052e6f2cb267be30afde9412357e2
Merge: f4fe7bd 56075e8
Author: Qianze Zhang <qianze.zhang@hotmail.com>
Date:   Tue Jan 14 10:35:31 2020 +0800

    Merge pull request #55 from AgoraIO-Usecase/5.0.0-fixbug

    update to new version

commit 56075e8e04c7d94d2c0407b74810f2992d8b5e21
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Mon Jan 13 20:24:41 2020 +0800

    fix. typo

commit ca52d89b05e6b530ac2df4143c0746f91c4943ee
Author: SRS <sirusheng@agora.io>
Date:   Mon Jan 13 19:43:20 2020 +0800

    update build version

commit 44cab6350b0ca6772e2c4860d7e5e272afb41029
Merge: 9e72a41 708e1ee
Author: SRS <sirusheng@agora.io>
Date:   Mon Jan 13 18:19:06 2020 +0800

    Merge branch '5.0.0-fixbug' of https://github.com/AgoraIO-Usecase/eEducation into 5.0.0-fixbug

commit 9e72a41a2c95689f2b6b35be1a9bd33f2b697fba
Author: SRS <sirusheng@agora.io>
Date:   Mon Jan 13 18:19:00 2020 +0800

    1. update white sdk version
    2. fix small class rerender crash bug

commit 708e1ee56c313ef485a718460e2e706414e57431
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Mon Jan 13 17:18:17 2020 +0800

    chore. update readme

commit a451ee562e59025ac274e18f2dcaf030df916271
Merge: e2a0bff 5e6ceaf
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Mon Jan 13 17:08:53 2020 +0800

    Merge branch '5.0.0-fixbug' of https://github.com/AgoraIO-Usecase/eEducation into 5.0.0-fixbug

commit e2a0bffa9b65f45603a35fdb4fd2fc4a62442a69
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Mon Jan 13 17:06:47 2020 +0800

    fix. readme

commit cf27d687876b4fbcd9b778748305a11ae8b1607d
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Mon Jan 13 17:05:14 2020 +0800

    chore. update readme &
    fix. upgrade whiteboard sdk &
    deprecated. old folders

commit fe9b74e620a16495c792d3c862b58db557a8fbe9
Author: Arthas <15215604969@163.com>
Date:   Mon Jan 13 13:52:42 2020 +0800

    Update build.gradle

    upgrade lib version

commit 5e6ceafb062c6b129d84abb0d5793f55c5082e30
Author: Arthas <15215604969@163.com>
Date:   Mon Jan 13 13:52:42 2020 +0800

    Update build.gradle

    upgrade lib version

commit 98dd7ad5fb245fa2c5522210dea7d2d0f452dc91
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Wed Jan 8 22:07:46 2020 +0800

    fix. web bigClass handsupupgrade whiteboard web netless sdk

commit faea3867a2de4aaf222e910e07c1a3e16a4147b4
Author: HUI <15215604969@163.com>
Date:   Wed Jan 8 16:42:36 2020 +0800

    optimize .gitignore

commit b7359df26de018ec7429912fcfb43eb493ce9d66
Author: HUI <15215604969@163.com>
Date:   Wed Jan 8 16:42:36 2020 +0800

    optimize .gitignore

commit 430a1e40f29da40c8b7f701073904f26935b7adc
Author: HUI <15215604969@163.com>
Date:   Wed Jan 8 16:34:49 2020 +0800

    upgrade version

commit d40487fde1699b840350fe50c6501f22013dd28a
Author: HUI <15215604969@163.com>
Date:   Wed Jan 8 16:34:49 2020 +0800

    upgrade version

commit 14ac751e4e982ddb5a97b4b27695f1bda7223d4a
Author: SRS <sirusheng@agora.io>
Date:   Wed Jan 8 12:42:48 2020 +0800

    add qa certificate

commit e36fb9e9f64313071b19c4a0a5ccec2a411593a5
Author: SRS <sirusheng@agora.io>
Date:   Wed Jan 8 12:36:09 2020 +0800

    update whiteborad version
    update ci

commit fa2b10312818542c6cdf17cc8a0997488793f7a1
Author: SRS <sirusheng@agora.io>
Date:   Tue Jan 7 17:23:09 2020 +0800

    fix ui display bug when teacher exits abnormally

commit f4fe7bda0f51726f4eda3f20be474cc84a6392cd
Merge: 52f6d75 1a9c792
Author: Qianze Zhang <qianze.zhang@hotmail.com>
Date:   Tue Jan 7 13:34:58 2020 +0800

    Merge pull request #52 from AgoraIO-Usecase/dev/native

    Dev/native

commit 52f6d75561d649bea3df547f345367d5dd7600fe
Merge: 61ff863 0fb47a4
Author: Qianze Zhang <qianze.zhang@hotmail.com>
Date:   Tue Jan 7 13:34:12 2020 +0800

    Merge pull request #50 from AgoraIO-Usecase/dev/new-edu-web

    update new edu web

commit 1a9c792618522a25e343b9937714be1607e7cffd
Author: SRS <sirusheng@agora.io>
Date:   Tue Jan 7 12:05:02 2020 +0800

    update version

commit a37d6d334c045dba4ec88213e2e4a6b7f3cfcdd8
Merge: ded34a1 61ff863
Author: SRS <sirusheng@agora.io>
Date:   Tue Jan 7 11:17:59 2020 +0800

    Merge branch 'master' into dev/native

    # Conflicts:
    #	azure-pipelines.yml
    #	education_Android/AgoraMiniClass/README.md
    #	education_Android/AgoraMiniClass/README.zh.md
    #	education_Android/AgoraMiniClass/app/src/main/res/values-zh/strings.xml
    #	education_Android/AgoraMiniClass/app/src/main/res/values/strings.xml
    #	education_iOS/AgoraMiniClass/CameraMicTestViewController.m
    #	education_iOS/AgoraMiniClass/NetworkViewController.m
    #	education_iOS/AgoraMiniClass/Room/RoomViewController.m

commit 61ff863ee10d13c1828e706e198acf6bbe2a928e
Author: srs888001 <603722906@qq.com>
Date:   Tue Jan 7 10:50:32 2020 +0800

    Delete settings.json

commit 576d2f6d43b3eccc5a580a2bbba52e23b75d5a80
Author: srs888001 <603722906@qq.com>
Date:   Tue Jan 7 10:50:23 2020 +0800

    Delete mmap_address.bin

commit 5ad4060b0da764bf319511ffe2597c54ba69cc49
Author: srs888001 <603722906@qq.com>
Date:   Tue Jan 7 10:50:12 2020 +0800

    Delete mmap_address.bin

commit e85f54cd80796dbaa2bfdd2cb4725670d589bd45
Author: srs888001 <603722906@qq.com>
Date:   Tue Jan 7 10:50:03 2020 +0800

    Delete agora_node_ext.ipch

commit 3a8f856a0d0d8c65ca16318288cc6508310239b9
Author: srs888001 <603722906@qq.com>
Date:   Tue Jan 7 10:49:51 2020 +0800

    Delete mmap_address.bin

commit 51499b9a480e097afb5f8d0f25311c7bc63c14d0
Author: srs888001 <603722906@qq.com>
Date:   Tue Jan 7 10:49:42 2020 +0800

    Delete agora_rtc_engine.ipch

commit ded34a1cd503bda0c765b7337508b4ac1595faf8
Author: SRS <sirusheng@agora.io>
Date:   Mon Jan 6 19:37:51 2020 +0800

    optimization small class render

commit 0fb47a40e8fb745b7d1bb21031eef7d0d22f14c9
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Mon Jan 6 15:23:34 2020 +0800

    fix. switch eraser to hand tool

commit a1922ba0aa4a6cd862e77d74c2890b47353d9bf0
Merge: 02e7ea9 bf7295c
Author: SRS <sirusheng@agora.io>
Date:   Mon Jan 6 10:25:42 2020 +0800

    Merge branch 'dev/native' of https://github.com/AgoraIO-Usecase/eEducation into dev/native

commit 02e7ea90c1aa421b2c9ef0fc848a41a86fceca24
Author: SRS <sirusheng@agora.io>
Date:   Mon Jan 6 10:25:35 2020 +0800

    fix small class bug

commit bf7295cfc523494baaf350ea51a87941a9fdfb5e
Merge: 9b298fb a351b83
Author: HUI <15215604969@163.com>
Date:   Fri Jan 3 17:33:26 2020 +0800

    Merge remote-tracking branch 'origin/dev/native' into dev/native

commit 27ef83e9ccb3b6622f4e79625530e92a0c5a395e
Author: HUI <15215604969@163.com>
Date:   Fri Jan 3 17:33:16 2020 +0800

    remove chinese from class file

commit 9b298fb14e24909b899624561a40b6ab17b142e0
Author: HUI <15215604969@163.com>
Date:   Fri Jan 3 17:33:16 2020 +0800

    remove chinese from class file

commit a351b83f149ff3d238903750343439f98f28aa69
Author: SRS <sirusheng@agora.io>
Date:   Fri Jan 3 15:51:00 2020 +0800

    remove ipad support

commit 54a4d65c7c28f0b783c513821292ea6448ddd9c8
Merge: 676f5c9 199673f
Author: SRS <sirusheng@agora.io>
Date:   Fri Jan 3 15:46:54 2020 +0800

    Merge branch 'dev/native' of https://github.com/AgoraIO-Usecase/eEducation into dev/native

commit 676f5c97fb089dde4a5456b7b95dd3e3892b5e44
Author: SRS <sirusheng@agora.io>
Date:   Fri Jan 3 15:46:46 2020 +0800

    update language

commit ce2cb7c8d9afdba1c9977e3671ef86e20a1e36c3
Author: HUI <15215604969@163.com>
Date:   Fri Jan 3 14:52:52 2020 +0800

    optimize code

commit 199673f37a5c9aa182fcae58b651438260d4d8fa
Author: HUI <15215604969@163.com>
Date:   Fri Jan 3 14:52:52 2020 +0800

    optimize code

commit 53061f76d30538c2a5282a96ec23e468efdd39fc
Author: SRS <sirusheng@agora.io>
Date:   Fri Jan 3 12:02:59 2020 +0800

    update ci config

commit a65ad0dff55a9d03f6722095493a54a828de7c0f
Merge: b282439 3bfbb39
Author: SRS <sirusheng@agora.io>
Date:   Wed Jan 1 23:08:13 2020 +0800

    Merge branch 'dev/native' of https://github.com/AgoraIO-Usecase/eEducation into dev/native

commit b2824396c3d617d9f86c4bb62042086b6dde054f
Author: SRS <sirusheng@agora.io>
Date:   Wed Jan 1 23:07:47 2020 +0800

    adjust code structure

commit 2678893690230eadf500f0ae9819ed2cbf645c8a
Author: HUI <15215604969@163.com>
Date:   Mon Dec 30 17:16:55 2019 +0800

    add translate

commit 3bfbb39a20d74c5e723fd767e1156cbfc60983b6
Author: HUI <15215604969@163.com>
Date:   Mon Dec 30 17:16:55 2019 +0800

    add translate

commit 97624dc8c011aa0dfc58cd9c7683d0ebd9472c1c
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Fri Dec 27 18:30:58 2019 +0800

    fix. callback delay

commit 27238221610ca31f79c01f06f632096e70e4ed4a
Author: SRS <sirusheng@agora.io>
Date:   Fri Dec 27 11:52:03 2019 +0800

    unified  1V1 &  big class logic

commit 1aa845f2d9c4f67241f7030d38ee38cc6fba6308
Merge: 9e6bee0 0e53673
Author: HUI <15215604969@163.com>
Date:   Fri Dec 27 00:28:06 2019 +0800

    Merge remote-tracking branch 'origin/dev/native' into dev/native

commit 9cfd6c080bd900f805bfdeeea6f46b89f10cbfc0
Author: HUI <15215604969@163.com>
Date:   Fri Dec 27 00:27:57 2019 +0800

    done

commit 9e6bee01a167414c604448e3298d90a8273997d5
Author: HUI <15215604969@163.com>
Date:   Fri Dec 27 00:27:57 2019 +0800

    done

commit 0e53673a452fabe33d69ce0d4cf82c183a86563f
Author: SRS <sirusheng@agora.io>
Date:   Thu Dec 26 22:58:18 2019 +0800

    fix miniclass bug when user exit abnormally

commit b05ccae85b80f23f84dba3d1b7c03ea65d7ada52
Author: SRS <sirusheng@agora.io>
Date:   Thu Dec 26 16:57:56 2019 +0800

    remove test code

commit 78266ac5e6840d9c8f1cf13d33e10e0ef63dfbfb
Merge: c27960d ed0c08c
Author: SRS <sirusheng@agora.io>
Date:   Thu Dec 26 16:53:11 2019 +0800

    Merge branch 'dev/native' of https://github.com/AgoraIO-Usecase/eEducation into dev/native

commit c27960dfee7fb221987b1ba89147a86d301ca250
Author: SRS <sirusheng@agora.io>
Date:   Thu Dec 26 16:53:02 2019 +0800

    modify copyright

commit 5426304c3dec2495ea00b0394aafc7d8f2038ed4
Author: HUI <15215604969@163.com>
Date:   Thu Dec 26 16:38:44 2019 +0800

    update readme

commit ed0c08c3e7ad37d6829a9b443cf363a2371492e0
Author: HUI <15215604969@163.com>
Date:   Thu Dec 26 16:38:44 2019 +0800

    update readme

commit c3bff876cbb8b55e020071d9d0ea5e99e8e4cbca
Author: HUI <15215604969@163.com>
Date:   Thu Dec 26 11:51:48 2019 +0800

    fix bug

commit 084aa354ddc6222aa543fcf9cd8876db548bec6f
Author: HUI <15215604969@163.com>
Date:   Thu Dec 26 11:51:48 2019 +0800

    fix bug

commit fc06713dda78a95c46857d79de52688c2e5849d4
Merge: 2a1c73b d5eea3c
Author: HUI <15215604969@163.com>
Date:   Thu Dec 26 11:48:51 2019 +0800

    Merge remote-tracking branch 'origin/dev/native' into dev/native

commit 0f2b2828b7eceb72b00e7d969af6265a17ce16e0
Author: HUI <15215604969@163.com>
Date:   Thu Dec 26 11:48:43 2019 +0800

    upgrade white version

commit 2a1c73bdda4b88e0e563881c2fb6911dbb5a4587
Author: HUI <15215604969@163.com>
Date:   Thu Dec 26 11:48:43 2019 +0800

    upgrade white version

commit d5eea3c89d0b373ee7d9b66cf04107f3ae85d858
Merge: 114f41a f02ec2e
Author: SRS <sirusheng@agora.io>
Date:   Wed Dec 25 21:31:56 2019 +0800

    Merge branch 'dev/native' of https://github.com/AgoraIO-Usecase/eEducation into dev/native

commit 114f41a693503320aaab3572b23370ebd811f8a5
Author: SRS <sirusheng@agora.io>
Date:   Wed Dec 25 21:31:43 2019 +0800

    adjust code structure
    update readme

commit b1142221ccf6c25afb4b143da22dd5c9c0c4cee5
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Wed Dec 25 21:30:52 2019 +0800

    chore. update readme

commit eb149a2926d0159c0a41b73ed59c46cce4f27fcb
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Wed Dec 25 21:22:54 2019 +0800

    feat. add recording toast

commit f02ec2e74327b1688a21cc80aa55da66666b91cd
Merge: bcb852f 5cef297
Author: HUI <15215604969@163.com>
Date:   Wed Dec 25 20:28:34 2019 +0800

    Merge remote-tracking branch 'origin/dev/native' into dev/native

commit 5b719c9ee19d1bc2e19c52b068ff3ecadf012304
Author: HUI <15215604969@163.com>
Date:   Wed Dec 25 20:28:22 2019 +0800

    replay video done

commit bcb852f5dc9ec439ae5dbe7a37817f85443432e8
Author: HUI <15215604969@163.com>
Date:   Wed Dec 25 20:28:22 2019 +0800

    replay video done

commit 4857ff91d7faea526c43513007407769a4780405
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Wed Dec 25 19:30:17 2019 +0800

    feat. record agora rtc

commit 5cef2976832ccb6529e0bb1d95d945e9fdddb3f7
Author: SRS <sirusheng@agora.io>
Date:   Wed Dec 25 16:50:53 2019 +0800

    adjust code structure

commit 312ab29883b940c27a53997eb298981ccf7acfb0
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Tue Dec 24 21:23:47 2019 +0800

    chore. update dot env example

commit 44e093e25afcd486934896b776d0291fad005ee6
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Tue Dec 24 20:57:47 2019 +0800

    chore. enhance ux

commit 15f138eaf483af90f7de4370aff23f6da698462b
Author: SRS <sirusheng@agora.io>
Date:   Tue Dec 24 14:11:48 2019 +0800

    fix mute bug

commit 9f1411ae095e7354ced108dac93ab18ac8ade942
Merge: e45c628 93eb57d
Author: SRS <sirusheng@agora.io>
Date:   Tue Dec 24 13:34:26 2019 +0800

    Merge branch 'dev/native' of https://github.com/AgoraIO-Usecase/eEducation into dev/native

commit e45c6286666e7d8313404a93c9457296c1ff427a
Author: SRS <sirusheng@agora.io>
Date:   Tue Dec 24 13:34:18 2019 +0800

    adjust code structure

commit ec9458ac41d129bc76c303a00c2bf8266b9e9933
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Tue Dec 24 02:10:36 2019 +0800

    chore. whiteboard config

commit 22dd24843d06421f26c489ea796b98bc4865ced4
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Tue Dec 24 01:57:05 2019 +0800

    chore. remove legacy files

commit 6ff5d8536beaa677228e46e88daad64fddf7e8a3
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Tue Dec 24 01:50:48 2019 +0800

    doc. update startup electron

commit ff54cfefb2eb794fb67792cbaa49deedd1deee9e
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Tue Dec 24 01:45:32 2019 +0800

    chore. add readme & simple refactor

commit 22e5a61805ea9d85473c1bcaeebaf6892ede62ab
Author: HUI <15215604969@163.com>
Date:   Mon Dec 23 17:17:01 2019 +0800

    remove test todo

commit 93eb57df6c8ab68f39b6942b52e51c4b5be0b282
Author: HUI <15215604969@163.com>
Date:   Mon Dec 23 17:17:01 2019 +0800

    remove test todo

commit 6cb238f2f7a350a770963f559eeb99586feb2c64
Author: HUI <15215604969@163.com>
Date:   Mon Dec 23 13:56:32 2019 +0800

    finish

commit ac4f5a1dd0b3aa1026c1bc075a290f8fc8a618c8
Author: HUI <15215604969@163.com>
Date:   Mon Dec 23 13:56:32 2019 +0800

    finish

commit 40a8016c36720efe3d5add44960df28fe8091823
Author: HUI <15215604969@163.com>
Date:   Mon Dec 23 13:13:58 2019 +0800

    delete iml file

commit c913b318f2212e1c49aff371c7057cc9e75039ae
Author: HUI <15215604969@163.com>
Date:   Mon Dec 23 13:13:58 2019 +0800

    delete iml file

commit c04c93821d92f5fbcbcfeb6789b655f3cf5262df
Author: HUI <15215604969@163.com>
Date:   Mon Dec 23 13:11:44 2019 +0800

    save

commit 43437e40e453f1e512b7de9da7b5054917e23745
Author: HUI <15215604969@163.com>
Date:   Mon Dec 23 13:11:44 2019 +0800

    save

commit ce8eb80c0f6cf47345a98f1f55605e2d1b24cfa6
Author: SRS <sirusheng@agora.io>
Date:   Mon Dec 23 12:14:49 2019 +0800

    resolve uid generate bug
    resolve time bug for replay

commit d389903fab43d1d10ffb8917403b580c2004b358
Author: SRS <sirusheng@agora.io>
Date:   Fri Dec 20 16:49:56 2019 +0800

    fix user name empty bug

commit ddb937218e08926bfeeeff1847b87ebbd48b1dd2
Author: SRS <sirusheng@agora.io>
Date:   Fri Dec 20 14:25:49 2019 +0800

    remove redundancy code

commit 442bf6ce6f787724a78fa53b4998cf655b93ab6b
Author: SRS <sirusheng@agora.io>
Date:   Fri Dec 20 14:23:38 2019 +0800

    fix one to one ppt frame bug

commit f88f6daf9f9a0e070a3dd223ed22e6ae2d84c223
Author: SRS <sirusheng@agora.io>
Date:   Thu Dec 19 21:53:10 2019 +0800

    fix white frame  bug

commit d0e3e0210bf4966a3cb40f8e738f8eb4c1c23d74
Author: SRS <sirusheng@agora.io>
Date:   Thu Dec 19 19:59:55 2019 +0800

    fix whitemanager

commit 111f5fc1c11fbc68a6aa060bdcb23de556eb8137
Merge: 79f3895 33b2fcb
Author: SRS <sirusheng@agora.io>
Date:   Thu Dec 19 17:36:20 2019 +0800

    Merge branch 'dev/native' of https://github.com/AgoraIO-Usecase/eEducation into dev/native

commit 79f38955e48e2dbfb70ba4def5dba1ceddc0ecb5
Author: SRS <sirusheng@agora.io>
Date:   Thu Dec 19 17:36:11 2019 +0800

    combine replay scene

commit ed788a4194638948b6b3111b2a295423556283c2
Author: ChengleiQiu <457624287@qq.com>
Date:   Thu Dec 19 15:13:50 2019 +0800

    add files of README.

commit 33b2fcbeb6896b0504788781af89bd6f0b7b0387
Author: ChengleiQiu <457624287@qq.com>
Date:   Thu Dec 19 15:13:50 2019 +0800

    add files of README.

commit 21cb9ec4d1cf9ad5170588e12df9c995493d863d
Author: ChengleiQiu <457624287@qq.com>
Date:   Thu Dec 19 11:58:29 2019 +0800

    resolve some bugs

commit 63ee8c7a5046af765c02931f92d0e8bd8faefd20
Author: ChengleiQiu <457624287@qq.com>
Date:   Thu Dec 19 12:02:27 2019 +0800

    remove the old program named 'AgoraMiniClass'

commit a8af22196645d82699201d4c3afd86ee31457309
Author: ChengleiQiu <457624287@qq.com>
Date:   Thu Dec 19 11:58:29 2019 +0800

    resolve some bugs

commit 349b1644d887a8dc4a35eb5bdc9267b21775aa29
Author: SRS <sirusheng@agora.io>
Date:   Thu Dec 19 10:38:41 2019 +0800

    update podfile

commit 995f760b612626fe815220bbb0002f3daa03010d
Author: SRS <sirusheng@agora.io>
Date:   Wed Dec 18 16:58:14 2019 +0800

    extract whitemanager

commit 7054b34c7513c6a59604bf9034db64fdb717407f
Merge: a5234b7 508e6c8
Author: SRS <sirusheng@agora.io>
Date:   Wed Dec 18 14:23:49 2019 +0800

    Merge branch 'dev/extract' into dev/native

    # Conflicts:
    #	education_iOS/AgoraEducation.xcodeproj/project.pbxproj
    #	education_iOS/AgoraEducation/ClassRoomData/JsonAndStringConversions.m
    #	education_iOS/AgoraEducation/MainViewController.m
    #	education_iOS/AgoraEducation/Room/AERoomViewController.m
    #	education_iOS/AgoraEducation/Room/BigClass/Controllers/BCViewController.m
    #	education_iOS/AgoraEducation/Room/BigClass/Model/AERTMMessageBody.h
    #	education_iOS/AgoraEducation/Room/BigClass/Model/AERTMMessageBody.m
    #	education_iOS/AgoraEducation/Room/MiniClass/Controllers/MCViewController.m
    #	education_iOS/AgoraEducation/Room/OneToOne/Controllers/OneToOneViewController.m

commit a5234b74904928be0e10b69789767d72bd7703ce
Author: srs888001 <603722906@qq.com>
Date:   Wed Dec 18 13:56:47 2019 +0800

    Delete mmap_address.bin

commit 3bd30a07aef08cae91dcf017aec62d8e4c398deb
Author: srs888001 <603722906@qq.com>
Date:   Wed Dec 18 13:56:37 2019 +0800

    Delete mmap_address.bin

commit 6d7cda1a3bc54474a399e31d5972e5b5d04e46ed
Author: srs888001 <603722906@qq.com>
Date:   Wed Dec 18 13:56:29 2019 +0800

    Delete agora_node_ext.ipch

commit caf3e6391995764e070dcc04c725c682e4835aac
Author: srs888001 <603722906@qq.com>
Date:   Wed Dec 18 13:56:19 2019 +0800

    Delete mmap_address.bin

commit ba073dbba86ec36bd6e12ca7c29dea410d11122d
Author: srs888001 <603722906@qq.com>
Date:   Wed Dec 18 13:56:10 2019 +0800

    Delete agora_rtc_engine.ipch

commit b41e2382e1ec77ad9e569def8e26a7f8404b48cd
Author: srs888001 <603722906@qq.com>
Date:   Wed Dec 18 13:55:54 2019 +0800

    Delete settings.json

commit 508e6c8042636dce92e79b11f8817b2e0767308c
Author: SRS <sirusheng@agora.io>
Date:   Wed Dec 18 13:52:47 2019 +0800

    fix hand up tip bug

commit 012f68350624fdeebf0df760b54bb4d98a3b6f95
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Wed Dec 18 02:58:43 2019 +0800

    chore. fix some edge case & provide electron windows & mac build script

commit 1892e500f1b86cd9fe07f17e367730901889afea
Author: SRS <sirusheng@agora.io>
Date:   Tue Dec 17 20:43:15 2019 +0800

    fix min class mute bug

commit 976682b8728f32203ea77e2c915a354c97507c6c
Author: SRS <sirusheng@agora.io>
Date:   Tue Dec 17 13:33:36 2019 +0800

    fix replay view

commit eec61d184ac80b9eca935f7a7d7dbd7854f35b35
Author: SRS <sirusheng@agora.io>
Date:   Mon Dec 16 11:11:20 2019 +0800

    Optimization code

commit 587beb9ce76417f87a4dbd41174e58e7eaa09ada
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Dec 14 23:36:15 2019 +0800

    feat. add electron-builder

commit 923947205108d2ed5530f01d25e0638856457382
Author: ChengleiQiu <457624287@qq.com>
Date:   Sat Dec 14 18:05:24 2019 +0800

    fixed a bug of eye protection mode in large class.
    fixed a bug of videos display in small class.

commit 50362cc1832f9b0ed6d0f617116cbbb0e2550aa3
Author: ChengleiQiu <457624287@qq.com>
Date:   Sat Dec 14 18:05:24 2019 +0800

    fixed a bug of eye protection mode in large class.
    fixed a bug of videos display in small class.

commit 20e1af62a1c5dbaa6335fc44c34c8835ac21ac7d
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Sat Dec 14 16:31:41 2019 +0800

    chore. update readme & fix co-video

commit 69627cc8143c814abf05046763cb30474cb7e72f
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Fri Dec 13 23:37:44 2019 +0800

    feat. integrate whiteboard recording

commit 11647119a4e49d3b1ae43510f2b6ac4da14cb1a8
Author: ChengleiQiu <457624287@qq.com>
Date:   Fri Dec 13 22:36:23 2019 +0800

    基本完成

commit ba163f4effe4c97c9ac9a214ba252a2e716825a7
Author: ChengleiQiu <457624287@qq.com>
Date:   Fri Dec 13 22:36:23 2019 +0800

    基本完成

commit 99f611ea4274df3d9279516fe1126cd1cfe8f68c
Author: yangshangbin <1058070112@qq.com>
Date:   Fri Dec 13 21:24:06 2019 +0800

    fix setuplocalvideo error

commit 4600169502891f1cdee59468a34b926cb03437e6
Merge: c580a6f bd7c728
Author: SRS <sirusheng@agora.io>
Date:   Fri Dec 13 16:57:48 2019 +0800

    Merge branch 'dev/extract' of https://github.com/AgoraIO-Usecase/eEducation into dev/extract

commit c580a6f83cbe278b9bc21139095ea31645bab76d
Author: SRS <sirusheng@agora.io>
Date:   Fri Dec 13 16:57:28 2019 +0800

    Optimization code

commit bd7c728021aec48e2a30b3f1e9bd3a6287289f6d
Merge: fb96529 c513f47
Author: srs888001 <603722906@qq.com>
Date:   Fri Dec 13 16:54:49 2019 +0800

    Merge pull request #43 from leavesster/dev/extract

    support video replay

commit c513f471b43e3b5fc00f03147352b479b5f321c5
Author: leavesster <11785335+leavesster@users.noreply.github.com>
Date:   Thu Dec 12 20:50:46 2019 +0800

    add combinePlayer

commit e24858bcf996f181818c73a84efbd781b39d4eba
Author: leavesster <11785335+leavesster@users.noreply.github.com>
Date:   Thu Dec 12 16:21:37 2019 +0800

    fix Whiteboard import

commit fb9652998d3a8706f30171d7910ffe509799de5a
Author: SRS <sirusheng@agora.io>
Date:   Thu Dec 12 14:37:55 2019 +0800

    clear withe key

commit 67248be66a2e0e06764c0fb67f32a6a11a67d287
Author: SRS <sirusheng@agora.io>
Date:   Thu Dec 12 14:35:16 2019 +0800

    add replay ui

commit 6a02a6a9c1cddbc941a4daebf7c4863068b22160
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Tue Dec 10 11:00:29 2019 +0800

    chore. add ignore

commit 2bef25291e2bce134bb5b1189ba825af33451101
Author: ChengleiQiu <457624287@qq.com>
Date:   Mon Dec 9 20:17:00 2019 +0800

    基本功能完成

commit d22f6d52c7341146aca18bb843b2d7fda8767e24
Author: ChengleiQiu <457624287@qq.com>
Date:   Mon Dec 9 20:17:00 2019 +0800

    基本功能完成

commit 8bfd8cd401ca362bf3564d2cd0adc511afe73f0a
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Mon Dec 9 14:16:52 2019 +0800

    add. dot env for developer

commit 99a6a21f590dc6de76fbace6146d34f6b3ffa1cb
Author: matrixbirds <yooobuntu@gmail.com>
Date:   Mon Dec 9 14:11:41 2019 +0800

    new. add electron & web

commit 7293583239b62db86d54aac4566764696d5ab19d
Author: srs888001 <603722906@qq.com>
Date:   Sun Dec 8 21:30:18 2019 +0800

    Delete settings.json

commit d37c51ffcf100b5f8fa8df5dcd21ab2012ed1bce
Author: srs888001 <603722906@qq.com>
Date:   Sun Dec 8 21:29:39 2019 +0800

    Delete mmap_address.bin

commit 4de225ff9cbdc2fe4b9284c955428a315672087e
Author: srs888001 <603722906@qq.com>
Date:   Sun Dec 8 21:28:37 2019 +0800

    Delete mmap_address.bin

commit afd8ae39a20f796a90b4ace5be1e9786768743a6
Author: srs888001 <603722906@qq.com>
Date:   Sun Dec 8 21:27:51 2019 +0800

    Delete agora_node_ext.ipch

commit 8442591d3c05b44e3e3761d3fdf4371a40a49c2f
Author: srs888001 <603722906@qq.com>
Date:   Sun Dec 8 21:27:24 2019 +0800

    Delete mmap_address.bin

commit 42b8e0fe971d0d7a6c9bdce9a75f5e77cbc82913
Author: srs888001 <603722906@qq.com>
Date:   Sun Dec 8 21:26:55 2019 +0800

    Delete agora_rtc_engine.ipch

commit b68f2ed02dedd4a7600f2d6608e4f54e843f39ec
Author: SRS <sirusheng@agora.io>
Date:   Sun Dec 8 21:21:18 2019 +0800

    update gitignore

commit 34b87740f1d65a35988c57ea38ae379dcd8e1d71
Author: SRS <sirusheng@agora.io>
Date:   Sun Dec 8 21:07:12 2019 +0800

    抽取MessageManager

commit 767a0ba8c08683a9ec44039d0f1fa137ac01f39c
Author: yangshangbin <1058070112@qq.com>
Date:   Fri Dec 6 14:17:01 2019 +0800

    add head file

commit b71938c1e17ff63e9426500c8ed24ca48d09f326
Author: yangshangbin <1058070112@qq.com>
Date:   Fri Dec 6 14:10:44 2019 +0800

    fix handup bug

commit 55945a15f97ed5670f2f77288ede111cfda29e38
Author: yangshangbin <1058070112@qq.com>
Date:   Thu Dec 5 16:39:14 2019 +0800

    fix sendmessage lenght

commit 67542c0926829060b8a532b38c8e2c071f26f49d
Author: yangshangbin <1058070112@qq.com>
Date:   Thu Dec 5 11:02:32 2019 +0800

    fix handup bug

commit 3c3bba960b99200cfeb48db93036b7b9fee679e3
Merge: c3cd3c6 d2ce52d
Author: yangshangbin <1058070112@qq.com>
Date:   Tue Dec 3 14:40:57 2019 +0800

    Merge branch 'dev/native' of github.com:AgoraIO-Usecase/eEducation into dev/native

commit c3cd3c609f57de5998b6f523f4bff4a037707967
Author: yangshangbin <1058070112@qq.com>
Date:   Tue Dec 3 14:40:46 2019 +0800

    fix mc crash bug

commit 22757aaa89452e599037bf69b8b76b07e18c07ee
Merge: 4f44f59 3fbbfbf
Author: Qianze Zhang <qianze.zhang@hotmail.com>
Date:   Sun Dec 1 15:49:36 2019 +0800

    Merge pull request #40 from AgoraIO-Usecase/dependabot/npm_and_yarn/education_server/lodash-4.17.15

    Bump lodash from 4.17.11 to 4.17.15 in /education_server

commit c9f3fec388aa05ff3f8400d166d5778150ab8b3d
Author: ChengleiQiu <457624287@qq.com>
Date:   Fri Nov 29 16:28:56 2019 +0800

    first education

commit d2ce52db4809f1c6b75d1e416c0937efa21b6115
Author: ChengleiQiu <457624287@qq.com>
Date:   Fri Nov 29 16:28:56 2019 +0800

    first education

commit 967f6f197383d59a1c9307a39b6115b16b5def90
Author: yangshangbin <1058070112@qq.com>
Date:   Fri Nov 29 02:24:58 2019 +0800

    fix crash

commit 09e560eccb3ccc0f144d155864cac51a7c3d2ffd
Author: yangshangbin <1058070112@qq.com>
Date:   Thu Nov 28 14:31:15 2019 +0800

    修改readme

commit 1eed5521744a1e95d47a420ae3a288b5ab89fb2f
Author: yangshangbin <1058070112@qq.com>
Date:   Thu Nov 28 13:59:52 2019 +0800

    modify ci code

commit 4f44f5960841cb8d8b27654f621447f903dd3261
Author: 杨尚彬 <17610603610@163.com>
Date:   Thu Nov 28 13:55:47 2019 +0800

    Set up CI with Azure Pipelines

    [skip ci]

commit a7a0e8903309faa664cca2a5543314c4aa3ebe86
Author: yangshangbin <1058070112@qq.com>
Date:   Thu Nov 28 11:52:19 2019 +0800

    修改CI

commit 3fbbfbf2fd1e81e7a146ff5eace51c2a9ebeb2bb
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Nov 27 14:07:15 2019 +0000

    Bump lodash from 4.17.11 to 4.17.15 in /education_server

    Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.15.
    - [Release notes](https://github.com/lodash/lodash/releases)
    - [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.15)

    Signed-off-by: depe…
This issue was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@menthays @s-ohno-learnie