Commit Graph

20272 Commits

Author SHA1 Message Date
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
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
Chad Pilkey
a17acc869b [AIR] fix pencil annotation taking down the client 2018-03-01 08:04:51 -08:00
Chad Pilkey
1a5ae204fa [AIR] fix presentation switching 2018-03-01 08:04:27 -08:00
Chad Pilkey
0ff196a882 [AIR] adjust chat send button icon and size 2018-03-01 08:03:59 -08:00
Ghazi Triki
e4dace3e61 Implement kick user to mobile application. 2018-02-28 22:15:49 +01:00
Ghazi Triki
1da91b6b3a Implement user promote and demote. 2018-02-28 21:36:26 +01:00
Chad Pilkey
03586d68f3
Merge pull request #5176 from riadvice/mobile-logout
Implement two new screens for mobile : ExitView and DisconnectView
2018-02-27 15:24:14 -05:00
Ghazi Triki
beb6c0cfa6 Merge remote-tracking branch 'bigbluebutton/master' into mobile-logout
# Conflicts:
#	clients/flash/air-client/src/org/bigbluebutton/air/main/views/TopToolbarMediatorAIR.as
#	clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/user/services/UsersMessageReceiver.as
2018-02-27 21:20:24 +01:00
Ghazi Triki
8a8b28870e Correctly remove user after receiving UserLeftMeetingEvtMsg. 2018-02-27 20:59:20 +01:00
Chad Pilkey
92cb821cad
Merge pull request #5175 from capilkey/2.1-air-userlist
2.1 AIR Updates
2018-02-27 14:38:42 -05:00
Ghazi Triki
a693b5d732 Show DisconnectView if initial RTMP connection fails. 2018-02-27 19:14:06 +01:00
Ghazi Triki
6f909fc931 Implement two new screens for mobile : ExitView and DisconnectView. 2018-02-27 13:26:50 +01:00
Chad Pilkey
4dbff2d492 Merge remote-tracking branch 'upstream/master' into 2.1-air-userlist 2018-02-26 16:50:44 -08:00
Chad Pilkey
c4588009a7 [AIR] clean up echo test and voice connection and make it always work 2018-02-26 16:44:54 -08:00
Chad Pilkey
de02e7ebba [AIR] updates to MenuButtons and voice and video UIs to hopefully work with new models 2018-02-26 17:35:26 -05:00
Chad Pilkey
6418adfef8 [AIR] avoid null exception in WhiteboardCanvasMediator on start 2018-02-26 17:34:17 -05:00
Chad Pilkey
b0f9d3e348
Merge pull request #5174 from ritzalam/guest-mobile-access
Guest mobile access
2018-02-26 17:06:39 -05:00
Richard Alam
93af8a7b88 - run changes through FlexFormatter 2018-02-26 13:05:04 -08:00
Richard Alam
28e5f3f0a9 - switch back url to test-install 2018-02-26 12:29:18 -08:00
Richard Alam
0a5f4dfc33 - update loading screen with guest wait status 2018-02-26 12:08:00 -08:00
Chad Pilkey
ec63728bc1
Merge pull request #5169 from riadvice/mobile-recording
Show recording icon in mobile
2018-02-26 15:07:36 -05:00
Ghazi Triki
1890556b7b Fix UserSession EOL. 2018-02-26 21:04:16 +01:00
Ghazi Triki
683fb96a39 Fix UISession EOL. 2018-02-26 20:44:57 +01:00
Richard Alam
e981a874c3 - query for guest wait status 2018-02-26 10:51:02 -08:00
Richard Alam
7b2d2279f9 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into guest-mobile-access 2018-02-26 07:25:45 -08:00
Richard Alam
f3f1a1187e - enter service 2018-02-25 17:31:46 -08:00
Chad Pilkey
a16c58a9e0 [AIR] rewrite voice models to separate collection and add to userlist view. Also split voice msg s/r to separate files 2018-02-24 23:58:53 -05:00
Chad Pilkey
d507d9a4a1 [AIR] correct the icon style sheet 2018-02-24 23:54:08 -05:00
Ghazi Triki
cac2ce7990 Minor improvements. 2018-02-24 22:38:45 +01:00
Chad Pilkey
2c342bc758 merged master - temporarily disabled some voice stuff in AIR 2018-02-24 15:57:26 -05:00
Ghazi Triki
87655eaf66 Display a message if the application was not launched using a browser. 2018-02-24 13:48:27 +01:00
Ghazi Triki
edcf38a4f3 Fix displaying wrong meeting id message. 2018-02-24 13:36:49 +01:00
Ghazi Triki
0c7d5daff2 Show recording icon in mobile application. 2018-02-24 12:16:37 +01:00
Richard Alam
8de5dcdaea - setup guest wait fetcher 2018-02-23 19:34:15 -08:00