BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,305 Commits 13 Branches 260 Tags 1.1 GiB
efaf450472
Commit Graph

20305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
efaf450472 - allow promoting of non-guest viewers to moderator role 2018-03-23 12:34:50 -07:00
Chad Pilkey
032abb8539
Merge pull request #5274 from riadvice/mobile-polling 
Implement polling for mobile
 2018-03-22 16:55:07 -04:00
Ghazi Triki
0730d8a224 Implement polling for mobile. 2018-03-22 21:44:51 +01:00
Chad Pilkey
15a4d06a88
Merge pull request #5216 from riadvice/mobile-conversations 
Update mobile conversations view
 2018-03-20 15:55:48 -04:00
Ghazi Triki
dbec2fa855 Update chat partner role after role change. 2018-03-20 20:49:33 +01:00
Ghazi Triki
c25bc274c5 Merge and move sorting functions from ChatMessagesSession and UsersVMCollection to ParticipantsCollection. 2018-03-20 17:30:49 +01:00
Ghazi Triki
bfc52fd5e2 Merge remote-tracking branch 'bigbluebutton/master' into mobile-conversations 2018-03-20 08:48:54 +01:00
Chad Pilkey
941f882602
Merge pull request #5249 from riadvice/mobile-emoji 
Implement mobile emoji menu
 2018-03-19 17:26:46 -04:00
Chad Pilkey
b4d6f17c69
Merge pull request #5262 from capilkey/revert-loadingmediator 
[AIR] revert LoadingScreenMediator
 2018-03-19 17:23:47 -04:00
Chad Pilkey
072b44f53e [AIR] revert LoadingScreenMediator 2018-03-19 14:22:57 -07:00
Ghazi Triki
d54a11c4b1 Delete unused classes. 2018-03-19 22:08:54 +01:00
Ghazi Triki
ad0971f87a Merge users and chat list into a single participants list. 2018-03-19 21:57:26 +01:00
Chad Pilkey
81d2cd0683
Merge pull request #5257 from capilkey/air-webcams 
AIR webcams
 2018-03-16 14:20:51 -04:00
Chad Pilkey
e8af89f0d6 [AIR] create empty MainViewMediator for use with screenshare 2018-03-16 11:08:13 -07:00
Richard Alam
391187f68e
Merge pull request #5255 from ritzalam/remove-log-fortify-issues 
- convert logs to printlns to silence fortify scans. Turning to prin…
 2018-03-16 13:10:41 -04:00
Richard Alam
5780bd4efe - convert logs to printlns to silence fortify scans. Turning to printlns still helps in debugging during development. 2018-03-16 10:05:02 -07:00
Ghazi Triki
09a07af92e Improve mobile emoji menu display. 2018-03-15 18:19:48 +01:00
Ghazi Triki
0677a5edcd Minor update to mobile colour palette. 2018-03-15 17:43:42 +01:00
Ghazi Triki
53d61e5719 Make none emoji work in mobile. 2018-03-15 17:43:21 +01:00
Ghazi Triki
d590c64aa0 Implement emoji status menu. 2018-03-15 16:51:37 +01:00
Chad Pilkey
1c244c30ea [AIR] avoid null exception in WBCanvasMediator 2018-03-12 23:07:51 -07:00
Chad Pilkey
0cf8f965cd [AIR] display the first webcam stream 2018-03-12 23:07:20 -07:00
Chad Pilkey
48969ed082 [AIR] wait for join before requesting data, publish webcams fixes 2018-03-09 14:11:42 -08:00
Ghazi Triki
08af0ea568 Remove duplicate private chat. 2018-03-06 19:00:39 +01:00
Ghazi Triki
36263ce668 Force scroll on ParticipantsView and disable it on ChatRoomsViewBase and UsersView. 2018-03-06 18:43:20 +01:00
Ghazi Triki
1dc95468b1 Fix displaying mobile private chat icon. 2018-03-06 16:22:57 +01:00
Ghazi Triki
c1ea5c6940 Fix displaying participants view. 2018-03-05 23:39:42 +01:00
Ghazi Triki
ec4b7381b1 Sort public and private chats by type and name. 2018-03-05 23:10:18 +01:00
Chad Pilkey
4a6b5e5e02
Merge pull request #5206 from riadvice/mobile-listen-only 
Mobile audio view for ListenOnly/Microphone
 2018-03-05 15:21:41 -05:00
Ghazi Triki
9fff746904 Improve JoinAudioView. 2018-03-05 21:20:26 +01:00
Ghazi Triki
5ed508b4d5 Merge remote-tracking branch 'bigbluebutton/master' into mobile-listen-only 
# Conflicts:
#	clients/flash/air-client/src/css/xhdpi.css
#	clients/flash/air-client/src/org/bigbluebutton/air/main/views/MenuButtonsMediator.as
#	clients/flash/air-client/src/org/bigbluebutton/air/main/views/MenuButtonsMediatorAIR.as
#	clients/flash/air-client/src/org/bigbluebutton/air/voice/VoiceConfig.as
#	clients/flash/air-client/src/org/bigbluebutton/air/voice/views/EchoTestViewMediatorAIR.as
 2018-03-05 19:36:06 +01:00
Ghazi Triki
cfd2620736 Updated mobile JoinAudioView layout and style. 2018-03-05 19:20:03 +01:00
Chad Pilkey
1dd942e20f
Merge pull request #5202 from capilkey/air-add-poll-annotation 
Add poll annotation to AIR
 2018-03-05 00:04:59 -05:00
Chad Pilkey
cbfe4176f8 [AIR] add poll annotation renderer 2018-03-04 21:03:00 -08:00
Chad Pilkey
b9b3278dc0 [AIR] fix LoadingScreenMediator imports after project merge 2018-03-04 21:02:26 -08:00
Chad Pilkey
72d2c1949f
Merge pull request #5199 from capilkey/air-combine-projects 
Merge common-library project into air-client
 2018-03-02 23:00:40 -05:00
Chad Pilkey
9ce004ca68 [AIR] combine air specific classes with their base versions 2018-03-02 19:53:02 -08:00
Chad Pilkey
d43b7d550d [AIR] update all other files with moved package locations 2018-03-02 17:31:50 -08:00
Chad Pilkey
a200adbbf3 [AIR] move lib package under air packages 2018-03-02 17:28:53 -08:00
Chad Pilkey
edcb5dd677 [AIR] merge shared assets directory with air-client 2018-03-02 15:51:44 -08:00
Chad Pilkey
320d749ad9 [AIR] move common-library files under air-client 2018-03-02 15:39:24 -08:00
Ghazi Triki
f84bfcb04a Add listen only audio join. 2018-03-02 22:20:11 +01:00
Chad Pilkey
50683b4bd1
Merge pull request #5198 from ritzalam/set-proxytype 
- set proxyType=none when using RTMPS as the mobile client fails to …
 2018-03-02 16:17:03 -05:00
Richard Alam
831fc70657 - set proxyType=none when using RTMPS as the mobile client fails to connect when proxyType=best 2018-03-02 13:10:21 -08:00
Chad Pilkey
1d7c9a2704
Merge pull request #5197 from riadvice/mobile-user-details 
Add moderator actions to mobile user details view
 2018-03-02 15:44:27 -05:00
Ghazi Triki
49f687af2a Fix mute button display condition. 2018-03-02 21:28:44 +01:00
Ghazi Triki
7284392ca1 Fixed mute/unmute in mobile client. 2018-03-02 20:34:54 +01:00
Ghazi Triki
2463c9a7f7 Mute and unmute user from mobile application. 2018-03-01 21:06:03 +01:00
Chad Pilkey
33cc2bec10
Merge pull request #5187 from capilkey/2.1-smallfixes-1 
Misc fixes for AIR client
 2018-03-01 11:22:56 -05:00
Chad Pilkey
00e0d4bcad [AIR] add try/catch so message handling won't take down the client 2018-03-01 08:05:50 -08:00