BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,312 Commits 13 Branches 260 Tags 1.1 GiB
78c649650e
Commit Graph

470 Commits

Author SHA1 Message Date
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
Richard Alam
1f5f3ba7ea - handle message from red5 screenshare 2018-03-19 13:23:31 -07:00
Richard Alam
fa3fc4ce95 - setup message path for screenshare 2018-03-19 12:47:18 -07:00
Richard Alam
aaf094ca84 - handle guest allow, wait, and denied response 2018-03-19 10:26:09 -07:00
Richard Alam
2dc86cee4a - fix conflict 2018-03-16 12:01:48 -07:00
Richard Alam
b94b30677b Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into mobile-screenshare 2018-03-16 11:36:53 -07:00
Chad Pilkey
e8af89f0d6 [AIR] create empty MainViewMediator for use with screenshare 2018-03-16 11:08:13 -07:00
Richard Alam
9bb7bb3d9a Merge branch 'master' into mobile-screenshare 2018-03-16 11:02:29 -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
Richard Alam
a5576d0318 - remove moderator specific features for screenshare 2018-03-05 14:33:11 -08:00
Richard Alam
1540de05cd - wire up message receiver to view screenshare stream 2018-03-05 14:28:07 -08:00
Ghazi Triki
ec4b7381b1 Sort public and private chats by type and name. 2018-03-05 23:10:18 +01:00
Richard Alam
c907520d0a - setup screenshare sender and receiver 2018-03-05 12:37:43 -08:00
Ghazi Triki
9fff746904 Improve JoinAudioView. 2018-03-05 21:20:26 +01:00
Ghazi Triki
bed47ff9df Remove force debug in LoadingScreenMediator. 2018-03-05 19:41:04 +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
Richard Alam
700e2cb9f7 Merge branch 'master' into mobile-screenshare 2018-03-05 08:21:18 -08: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
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
Richard Alam
bb20359db1 - setup message sender for screenshare 2018-03-02 14:50:27 -08:00
Richard Alam
d3a379a17e - connect to screenshare 2018-03-02 14:11:37 -08:00
Ghazi Triki
f84bfcb04a Add listen only audio join. 2018-03-02 22:20:11 +01:00
Richard Alam
5cba756270 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into mobile-screenshare 2018-03-02 13:19:44 -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
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
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
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
Richard Alam
ff589f978d - hook up screenshare connection 2018-02-26 14:36:22 -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
Richard Alam
feb6df5ff1 - start setting up screenshare connection 2018-02-26 14:28:21 -08: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
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
Chad Pilkey
8ad12e44d9
Merge pull request #5163 from riadvice/mobile-client-2.1 
Implement echo test view
 2018-02-23 14:49:00 -05:00
Ghazi Triki
43cc31cb35 Delete EchoTestHasAudio and EchoTestHasNoAudo signals and commands. 2018-02-23 08:43:56 +01:00
Richard Alam
918102f754 - apply passed in bannerColor (e.g. #FF0000) 2018-02-22 14:24:33 -08:00
Ghazi Triki
d36e448b40 Merge remote-tracking branch 'bigbluebutton/master' into mobile-client-2.1 
# Conflicts:
#	clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatViewMediatorBase.as
 2018-02-22 23:14:57 +01:00
Ghazi Triki
df4706dd01 Set microphone gain and improve EchoTestViewMediator. 2018-02-22 23:12:34 +01:00
Richard Alam
3875f929bb - diaply passed in banner text 
TODO: figure out how to change banner background color
 2018-02-22 14:09:09 -08:00
Chad Pilkey
28eb1b2da7 [AIR] fix userVM webcam removal 2018-02-22 16:54:18 -05:00
Chad Pilkey
ce25daeb14 [AIR] fix user status updating check 2018-02-22 16:43:19 -05:00
Chad Pilkey
f02c8b9449 [AIR] get user list updating again 2018-02-22 16:32:54 -05:00
Richard Alam
680c4dc465 - handle banner param from create api 2018-02-22 12:35:04 -08:00
Ghazi Triki
631f1bdeb1 Added a new sking for ProgressBar component. 2018-02-22 20:54:41 +01:00
Chad Pilkey
f15cb3c76f
Merge pull request #5161 from ritzalam/apply-lock-settings-on-chat 
- apply lock to private and public chat when lock settings changes
 2018-02-22 13:35:49 -05:00
Ghazi Triki
5bb2cb3568 Implement echo test view. 2018-02-21 19:42:00 +01:00
Richard Alam
a44ab359f8 - convert user message to 2.x 2018-02-20 15:32:59 -08:00
Chad Pilkey
5055c8a7de [AIR] receive user role change message 2018-02-20 18:14:40 -05:00
Richard Alam
0cfb3452c7 - more messages converted to 2.x format 2018-02-20 15:04:26 -08:00
Richard Alam
e29a6527d8 - slowly convert messages to 2x format 2018-02-20 14:41:30 -08:00
Richard Alam
1b417dd704 - remove trace log 2018-02-20 14:15:32 -08:00
Richard Alam
f777cacd10 - query for lock settings when client starts 2018-02-20 13:56:18 -08:00
Richard Alam
d49456631b - init lock settings on chat view when opened 
- apply only lock setting to viewers
 2018-02-20 13:33:00 -08:00
Richard Alam
791d5dd859 - apply lock to private and public chat when lock settings changes 2018-02-20 12:17:04 -08:00
Chad Pilkey
374618c45c [AIR] first pass at removing old User and UserList classes 2018-02-16 19:34:42 -05:00
Richard Alam
fe5a1313c4 - allow connecting to server using rtmps 2018-02-15 13:50:20 -08:00
Chad Pilkey
99c5b2c8a0 [AIR] include missing RequestWelcomeMessage[Signal|Command] 2018-02-08 15:58:04 -05:00
Chad Pilkey
7c560ca9c3 [AIR] fix chat message display issues related to system messages 2018-02-08 14:27:41 -05:00
Chad Pilkey
8bd7f9c721 [AIR] fix exception when trying to scroll a short chat list 2018-02-08 14:26:40 -05:00
Chad Pilkey
7139777588 [AIR] add authToken to voice and video connections 2018-02-08 14:25:20 -05:00
Chad Pilkey
d0bc56972c [AIR] reset new messages when viewing chat and scroll to bottom 2018-02-07 16:45:38 -05:00
Chad Pilkey
cb59793703 [AIR] reposition chat send button 2018-02-06 18:52:33 -05:00
Chad Pilkey
9f7887e687 [AIR] add welcome and clear messages 2018-02-06 18:22:14 -05:00
Chad Pilkey
32df263d18 first pass at updating chat in AIR client for 2.1 2018-02-05 19:27:44 -05:00
Chad Pilkey
3c89514905 [AIR] fix potential exception with the annotations 2018-01-31 16:39:48 -05:00
Chad Pilkey
846eca5f41 [AIR] disable video connection temporarily to avoid connection failure 2018-01-31 16:39:22 -05:00
Chad Pilkey
bc6840dd8c [AIR] fixes for UserDetailsView to avoid exception 2018-01-31 16:38:44 -05:00
Chad Pilkey
4a3cdeb55b [AIR] enforce annotation and cursor holder sizes 2018-01-26 17:59:49 -05:00
Chad Pilkey
4c84c7132a make the air client exportable again 2018-01-26 15:24:24 -05:00
Chad Pilkey
5628fbacb5 update whiteboard annotations and cursor in air client for 2.1 2018-01-25 16:28:58 -05:00
Chad Pilkey
5abc928645 get default presentation pod working in the AIR client 2018-01-11 17:33:10 -05:00
Chad Pilkey
d10d3af41c remove requesterId AIR message to match 2018-01-11 17:32:07 -05:00
Chad Pilkey
47760ee462 get the air client connecting to 2.1 2018-01-10 15:25:22 -05:00
Chad Pilkey
5da4f2a4f6 [AIR] remove excess debug URLs 2018-01-08 17:55:22 -05:00
Chad Pilkey
b52ad4e6a4 [AIR] user details and settings fixes 2017-10-09 05:41:56 -07:00
Chad Pilkey
668b0642bd [AIR] updated chat and user details 2017-10-06 06:05:39 -07:00
Chad Pilkey
135b8f4bfa first pass updating AIR to 2.0 (users, pres) 2017-10-03 23:48:36 -04:00
Ghazi Triki
30a60b0e2b More improvements to the configuration parsing. 2017-05-25 11:57:51 +01:00
Richard Alam
23e6dea35b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2.x-dev-mconf 2017-05-04 14:39:02 -07:00
Ghazi Triki
8793812ca1 Add item renderer for camera profiles list. 2017-05-04 09:36:16 +01:00
Ghazi Triki
1bf45e1902 Enable "back" soft key navigation for the mobile application. 2017-05-03 18:27:25 +01:00
Ghazi Triki
8a8a623862 Fix float scale of generate_css_dpi to 2 2017-05-03 17:51:10 +01:00
Ghazi Triki
1ff345eaf0 Update generate_css_dpi.sh comments. 2017-05-03 14:55:40 +01:00
Ghazi Triki
041ac03886 Added multi-resolution generated css files for the mobile client. 2017-05-03 14:54:28 +01:00
Ghazi Triki
f87d98a6df Added a shell script to generate multi-dpi css files for the mobile client. 2017-05-03 14:52:48 +01:00
Ghazi Triki
167df89d02 Set icon-44.png to its true size and set value for allowBrowserInvocation in Main-app.xml 2017-05-02 20:50:54 +01:00
Chad Pilkey
47e50c0814 Merge pull request #3518 from riadvice/mobile-client 
Implemented mobile views
 2017-05-02 14:43:19 -04:00
Ghazi Triki
df264cffd5 Renamed clours for mobile application styles. 2017-05-02 18:21:56 +01:00
Ghazi Triki
7c3344c481 Put all toolbar logic in TopToolbarMediatorAIR to avoid double mediator registration. 2017-05-02 18:14:12 +01:00
Ghazi Triki
f1ced34322 Improve setting padding to containers in ChatSettingsViewBase and LockSettingsViewBase. 2017-04-27 11:08:05 +01:00
Pedro Beschorner Marin
f59e42bb02 Merge remote-tracking branch 'bigbluebutton/master' into merging-into-bbb-1.1 2017-04-04 20:42:15 +00:00
Pedro Beschorner Marin
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
Ghazi Triki
08e4dcd25f Move shared mediator listeners and actions from AIR mediators to base mediators. 2017-03-14 14:08:21 +01:00
Ghazi Triki
ee5becda1c Fix .participantIconSettings class in xhdpi.css 2017-03-13 11:53:51 +01:00
Ghazi Triki
8c17ebe325 Change radius property to diameter for ellipses. 2017-03-09 15:16:24 +01:00
Ghazi Triki
119338aff3 Separators color in settings view get their colour from the Default.css 2017-03-09 14:24:44 +01:00
Ghazi Triki
57c39b35ed Replace bindings in components and item renderes by the override of updateDisplayList. 2017-03-09 12:01:10 +01:00
Ghazi Triki
b4e0b5d9ee Remove bindings from ParticipantIcon.mxml 2017-03-08 12:22:16 +01:00
Ghazi Triki
5027539821 Add ASF license to MobileToggleSwitchSkin.as as this class is mostly based on an open source skin. 2017-03-07 15:19:43 +01:00
Ghazi Triki
e69b28d8e6 Fixed adding _inputGroup twice in ChatViewBase.as 2017-03-07 14:58:35 +01:00
Ghazi Triki
46c19e1a12 Use tabs instead of space for bbb-icons.css 2017-02-02 15:22:49 +01:00
Ghazi Triki
33f98a7547 Code style update for Main.mxml 2017-02-02 11:53:16 +01:00
Ghazi Triki
b12b1259bf Correctly renamed ChatSettingsViewMediatorAIR. 2017-02-02 11:49:49 +01:00
Ghazi Triki
6bfd8db84a Fixed microphoneToggle property name. 2017-02-02 11:49:01 +01:00