BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,925 Commits 13 Branches 260 Tags 1.1 GiB
2b0fc6ed6b
Commit Graph

4656 Commits

Author SHA1 Message Date
perroned
e1ed43d343 Adds some deskshare strings and labels 2017-02-08 21:07:23 +00:00
Chad Pilkey
55614b35dd fix tab loop at end of Flash client 2017-02-08 15:57:23 -05:00
Anton Georgiev
384a97f3b9 fix labels + tooltips for viewer in webrtc deskshare 2017-02-08 19:06:24 +00:00
Anton Georgiev
5f5ecaee04 fix labels + tooltips; todo revisit "stop" button 2017-02-08 19:06:09 +00:00
Ghazi Triki
a10e298df2 Added to improve comment at ResourceUtil.as 2017-02-07 17:07:07 +01:00
Richard Alam
aafc429e80 Merge pull request #3620 from riadvice/breakout-rooms-ui-imporve 
Breakout rooms UI imporve
 2017-02-06 17:39:41 -05:00
Richard Alam
ffa55caa7e Merge pull request #3635 from riadvice/logged-out-confirmation 
Don't display the LoggedOutWindow.mxml if the user asked to logout
 2017-02-06 16:18:59 -05:00
Ghazi Triki
177a1bc186 Improve locale availability name checking. 2017-02-06 22:02:21 +01:00
alexandre
48d5054869 Adapting some client labels 
- Creating interface messages in locales
- Some translating to brazilian portuguese
 2017-02-06 20:53:07 +00:00
Ghazi Triki
8dbeb3604c Added ExitApplicationEvent.as 2017-02-06 21:39:41 +01:00
Richard Alam
de9d0144cb Merge pull request #3617 from riadvice/webcams-only-for-moderator-fix 
Webcams only for moderator fix
 2017-02-06 15:18:21 -05:00
Richard Alam
19f29e8bec Merge pull request #3616 from riadvice/detect-heavy-to-convert-pptx 
Avoid converting some pptx files with certain properties and inform the user.
 2017-02-06 13:22:39 -05:00
Pedro Beschorner Marin
9fe76ce2d8 Avoid record warning if record button is disabled 2017-02-06 16:29:09 +00:00
Ghazi Triki
b5bfcf4011 No more display the LoggedOutWindow.mxml if the user has explicitly clicked on yes to confirm the logout action. 2017-02-06 14:30:26 +01:00
Ghazi Triki
81b61d6b21 Link "enableEmojiStatus" enabled/disabled to the emoji button. 2017-02-05 14:32:55 +01:00
perroned
1116cc0d1e Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
 2017-02-02 15:27:08 +00:00
Ghazi Triki
13f5bc488f Change the emoji menu icon to the happy face. 2017-02-02 10:16:48 +01:00
Ghazi Triki
2910c0f0b3 Display breakout rooms user names in row tooltip. 2017-02-01 18:52:30 +01:00
Ghazi Triki
e01d718215 Added tooltip to breakout rooms timer. 2017-02-01 13:57:42 +01:00
Ghazi Triki
cc19bec9d7 Display only timer for breakout rooms then when it ends display "closing" message. 2017-02-01 09:21:29 +01:00
Ghazi Triki
e78bf5de46 Imrpove userIsModerator method in Conference.as 2017-01-31 18:55:08 +01:00
Ghazi Triki
c45917d99a Sharing WebCam logic is handled only in Conference class. 2017-01-31 16:44:02 +01:00
Ghazi Triki
57813a4a38 Fix subscribe to webcams for when "webcamsOnlyForModerator" is activated during the session. 2017-01-31 15:10:56 +01:00
Felipe Cecagno
2180987813 if language selector is hidden, doesn't include it in the layout 2017-01-30 16:53:42 -02:00
Ghazi Triki
dfbf8c8c0a Avoid converting some pptx files with certain properties and inform the user. 2017-01-30 19:50:10 +01:00
Pedro Beschorner Marin
9cbf1cdc76 Merge pull request #364 from pedrobmarin/fix-sharednotes-paste 
Changed the way we prevent text input in shared notes to fix paste ev…
 2017-01-25 13:47:53 -02:00
Felipe Cecagno
d0a5a2ff28 adjust minimum dimensions of the shared notes window 2017-01-24 21:12:41 -02:00
Felipe Cecagno
e80100b1f7 hide the layout controls when showLayoutTools is false (visible=includeInLayout=false) 2017-01-24 21:12:20 -02:00
Anton Georgiev
00fb1added log line was displaying null values 2017-01-20 16:56:48 -05:00
Anton Georgiev
5b78da8ed0 fix incorrect screenshare stream uri on reconnect 2017-01-20 16:55:34 -05:00
Anton Georgiev
6110797486 Merge pull request #3580 from antobinary/fix-many-webcam 
Filter out webcam duplicates. Also fixes #3572
 2017-01-20 11:25:23 -05:00
Anton Georgiev
9c3df8d3e5 improve detection of duplicates + cleanup 2017-01-19 18:09:26 -05:00
Anton Georgiev
98300d77e2 allow view for 2+ webcams per user. improve duplicate detection 2017-01-19 17:36:58 -05:00
Chad Pilkey
e5d06f9f23 add custom poll option text to locales 2017-01-19 14:58:17 -05:00
Chad Pilkey
1319c58b98 add defined widths for screenshare help text 2017-01-11 18:28:08 -05:00
Chad Pilkey
4e01f909e8 add new ScreensharePublish and ScreenshareView windows to the layout exclusion 2017-01-11 17:50:02 -05:00
Chad Pilkey
d3ab07e401 change screenshare help lines from Label to Text so they wrap 2017-01-09 17:26:24 -05:00
Chad Pilkey
f11345f24a Merge pull request #3537 from riadvice/webcams-only-for-moderator 
Webcams only for moderator
 2017-01-04 13:14:46 -05:00
Ghazi Triki
2e3bb4754d Fixed typos in webcamsOnlyForModerator naming. 2017-01-04 19:02:17 +01:00
Pedro Beschorner Marin
980c5d2ad0 Merge pull request #365 from alexandrekreis/mconf 
Whiteboard annotations on deskshare video
 2017-01-03 15:59:25 -02:00
Ghazi Triki
92c1205e9c Handling "webcamsOnlyForModerator" meeting option in the client. 2017-01-02 17:06:16 +01:00
Ghazi Triki
4c4d768883 Added new "webcamsOnlyForModerator" parameter for create meeting API. 2017-01-02 16:56:32 +01:00
Pedro Beschorner Marin
adbb81e1c5 Cleanup 2016-12-21 18:35:21 +00:00
Pedro Beschorner Marin
35b7dd2fd7 Changed the way we prevent text input in shared notes to fix paste events 2016-12-20 14:11:10 +00:00
Richard Alam
af169be2db Merge branch 'master' into support-svc2-in-screen-share 2016-12-19 16:41:40 +00:00
Anton Georgiev
de374c4ffc add json struct to more logs 2016-12-16 19:19:19 +00:00
Anton Georgiev
6fe33fb349 switch to logging in json form 2016-12-16 16:50:11 +00:00
Richard Alam
a86b0eadbc Merge pull request #3515 from antobinary/fix-double-webcams 
Fix double display of webcams on reconnect #3250
 2016-12-14 18:33:58 -02:00
Anton Georgiev
388d3ec86f fix double display of webcams on reconnect 2016-12-14 19:59:30 +00:00
Richard Alam
c87f0f559a Merge pull request #3513 from pedrobmarin/end-meeting-disconnection 
Working on avoiding reconnection when ending a meeting by API call
 2016-12-13 16:39:25 -02:00
Pedro Beschorner Marin
14b480c8ce Working on avoiding reconnection when ending a meeting by API call 2016-12-09 20:33:03 +00:00
Richard Alam
02066ef3ee Merge pull request #3501 from pedrobmarin/video-auto-start 
Video auto start
 2016-12-08 13:39:56 -02:00
Richard Alam
dc30aa6304 Merge pull request #3496 from pedrobmarin/priority-video-resolution 
Priority video will care about its own aspect ratio when positioning …
 2016-12-08 11:18:13 -02:00
Pedro Beschorner Marin
4938505781 Better handling no-webcam scenario 2016-12-07 17:53:18 +00:00
Pedro Beschorner Marin
e554b87780 Fixed videoconf autoStart-skipCheck race condition 2016-12-07 13:13:11 +00:00
Pedro Beschorner Marin
f0ed824aea Priority video will care about its own aspect ratio when positioning itself at videodock 2016-12-06 19:22:33 +00:00
Pedro Beschorner Marin
c4598c280a Fixed some layout lock issues: 
- New attendees get their layout locked;
- Double clicking top overlay won't maximize a window; and
- Right clicking won't show minimize/maximize options.
 2016-12-06 18:23:25 +00:00
perroned
0a12d2f6ce Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-html5/imports/startup/server/EventQueue.js
 2016-12-01 19:19:58 +00:00
perroned
fc995d25bf Adds conference command support 2016-12-01 17:00:15 +00:00
Richard Alam
145c40a459 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into upgrade-red5-nov-22-2016-snapshot 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
 2016-11-24 23:00:56 +00:00
Richard Alam
c26a29ff41 - try to use svc2 codec 2016-11-24 22:54:28 +00:00
Richard Alam
5f56a4edcd - close port testing connection 2016-11-22 20:46:29 +00:00
Richard Alam
224114c83d Merge pull request #3424 from riadvice/logout-on-stop-recording 
New option to logout user when he stops the recording
 2016-11-22 13:40:41 -05:00
Ghazi Triki
59a0f4665d Updated RequestBreakoutJoinURL to return two join urls, the first with redirection enable and the second without redirection. 2016-11-21 18:01:22 +01:00
Felipe Cecagno
8f4ca962cc Merge branch 'undo-stack-size' of github.com:pedrobmarin/bigbluebutton into mconf 
Conflicts:
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
 2016-11-20 21:20:16 -02:00
Felipe Cecagno
1ff4d5829e Merge branch 'priority-video-aspect' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-20 21:19:16 -02:00
Felipe Cecagno
f8b2107ec5 Merge branch 'fix-354' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-20 21:15:47 -02:00
Felipe Cecagno
3511120022 Merge branch 'fix-38' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-20 19:23:26 -02:00
Felipe Cecagno
7d0d27f020 Merge branch 'wont-record-metadata' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-20 15:54:38 -02:00
Felipe Cecagno
82a7945886 fix blur after the record notification on the first audio user 2016-11-20 00:56:31 -02:00
Felipe Cecagno
faba97fdee Merge branch 'inactivity-metadata' of github.com:pedrobmarin/bigbluebutton into mconf 
Conflicts:
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
 2016-11-20 00:41:28 -02:00
Felipe Cecagno
0cba31fa24 cleanup unused images 
used the following command line to find and remove:
```
for i in `find resources/ src/ -name "*.png" -o -name "*.jpg" -o -name "*.jpeg" -o -name "*.svg" -o -name "*.gif"`; do j=$(basename $i); if [ `grep -I "$j" . -R | wc -l` == 0 ]; then rm -f $i; fi; done
```
 2016-11-20 00:02:12 -02:00
Felipe Cecagno
8a75219ad6 fix position of lock and unlock images in the user list; change emoji order 2016-11-19 23:44:10 -02:00
Felipe Cecagno
e13aba9184 Merge branch 'status-icons' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-19 23:07:43 -02:00
Felipe Cecagno
4fffca0638 revert to the previous implementation of the column width distribution in the user list, which is much simpler 2016-11-19 23:04:44 -02:00
Felipe Cecagno
158c1ffd89 fix column width in the users list 2016-11-19 22:57:39 -02:00
kreismann
9aef8832c7 Setting current whiteboard id on page change 2016-11-18 13:18:36 -02:00
kreismann
4d13d7e20f Updating poll id and setting polling whiteboard id according to the poll Id 2016-11-17 16:04:19 -02:00
Pedro Beschorner Marin
e87420e44c Fixed a maximum stack size for shared notes undo feature and refactored resync detection 2016-11-16 14:41:31 +00:00
Chad Pilkey
cb77ada8f2 fix exception in webrtc error logging 2016-11-15 18:26:36 -05:00
kreismann
66deee9fb2 Fixing some race conditions 
- whiteboard canvas is added to SlideView after a loaded page event;
- We don't load slide annotations while deskshare is active (this situation occurs only in a race condition)
 2016-11-14 17:42:21 -02:00
Felipe Cecagno
132e4ebc0d Merge branch 'sharednotes-undo' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-14 17:40:04 -02:00
Felipe Cecagno
92a7d32818 Merge branch 'client-audio-process' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-14 14:19:49 -02:00
Felipe Cecagno
4dbe313209 increase gap between icons in the media column to 8 2016-11-14 14:11:44 -02:00
Felipe Cecagno
91fbf63621 Merge branch 'users-buttons' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-14 14:09:46 -02:00
Felipe Cecagno
9ff6980f34 Merge branch 'apply-layout-to-moderators' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-14 13:20:49 -02:00
Felipe Cecagno
c831a0a8e7 Merge branch 'sharednotes-timer' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-14 13:19:08 -02:00
Felipe Cecagno
8dca32d23b Merge branch 'mood-menu' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-14 13:16:17 -02:00
Felipe Cecagno
4ecd1adc9f Merge branch 'fixed-presentation-minimizing' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-14 13:12:42 -02:00
Richard Alam
27eac5faec Merge pull request #3462 from ritzalam/improve-client-logging 
- create only one netConnection to bbb-apps. Not re-create one when …
 2016-11-11 17:40:35 -05:00
Richard Alam
d88ec9c0e6 - create only one netConnection to bbb-apps. Not re-create one when reconnecting. 2016-11-11 22:37:14 +00:00
Richard Alam
1ef6ce8170 Merge pull request #3461 from ritzalam/improve-client-logging 
- log client out when user is ejected from meeting.
 2016-11-11 17:21:21 -05:00
Richard Alam
3ff537cff6 - log client out when user is ejected from meeting. 2016-11-11 22:19:52 +00:00
Richard Alam
fa4fcae71c Merge pull request #3458 from ritzalam/improve-client-logging 
- reset connectAttemptTimeout as we don't want to fail connection on…
 2016-11-11 13:47:54 -05:00
Richard Alam
3f399302ab - reset connectAttemptTimeout as we don't want to fail connection on reconnects. 2016-11-11 18:32:46 +00:00
kreismann
8720c9d954 Showing only the deskshare tab while deskshare is running 2016-11-11 15:01:03 -02:00
Richard Alam
57e9bcf292 Merge pull request #3457 from ritzalam/improve-client-logging 
- fix rtmpt
 2016-11-11 11:53:02 -05:00
Richard Alam
eaa778afe5 - fix rtmpt 2016-11-11 16:51:37 +00:00
Pedro Beschorner Marin
888d51abbd Removed unnecessary parameter initialization 2016-11-11 12:20:50 +00:00
Richard Alam
01a698090c Merge pull request #3455 from ritzalam/improve-client-logging 
- add more logging to track issues
 2016-11-10 17:36:46 -05:00
Richard Alam
fa16d266b9 - add more logging to track issues 2016-11-10 22:35:06 +00:00
kreismann
c7e0f9e5b0 Deskshare has its own whiteboard page 2016-11-10 18:20:00 -02:00
Pedro Beschorner Marin
6384b8c9e8 Priority video will care about its own aspect ratio when positioning itself at videodock 2016-11-10 20:18:40 +00:00
Richard Alam
0ffb7f251a Merge pull request #3452 from ritzalam/improve-client-logging 
- log locale version
 2016-11-09 17:28:07 -05:00
Richard Alam
453882f91f - log locale version 2016-11-09 22:23:11 +00:00
Richard Alam
437e0b86e9 Merge pull request #3451 from ritzalam/improve-client-logging 
- remove user join log
 2016-11-09 16:56:21 -05:00
Richard Alam
95e5f78e1b - remove user join log 2016-11-09 21:54:03 +00:00
Anton Georgiev
126312ca66 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into nginx-logging3 2016-11-09 20:55:34 +00:00
Anton Georgiev
e5b791073d improve logs for webrtc events 2016-11-09 20:42:56 +00:00
Richard Alam
5d6a33bdff - improve client side logging. 2016-11-09 20:35:58 +00:00
Anton Georgiev
f05f594f2d add EN string to ClientStatusEvent 2016-11-09 19:27:00 +00:00
Richard Alam
934de7e563 - add log to indicate successful connection to bbb-apss 2016-11-08 21:42:36 +00:00
Pedro Beschorner Marin
a7fa62781f Better handling no webcam scenarios. Reverted to the old disabling button logic because I couldnt justify myself any other way 2016-11-08 20:00:10 +00:00
Pedro Beschorner Marin
e288b8271e Fixed videoconf autoStart-skipCheck race condition 2016-11-08 14:55:35 +00:00
Pedro Beschorner Marin
51dc8322f0 Fixed layout lock issues and adjusted shared notes minimized window bar layout 2016-11-07 16:40:21 +00:00
Fred Dixon
258bcc1241 Merge pull request #3432 from riadvice/breakout-room-recording-option 
Added flag to config.xml to enable/disable the visibility of the Record option
 2016-11-04 15:37:46 -04:00
Anton Georgiev
d4e0494be0 remove some unnecessary logging 2016-11-04 16:11:16 +00:00
Pedro Beschorner Marin
5ad77eda18 Client reading meeting metadata for wont record message 2016-11-01 19:44:56 +00:00
Pedro Beschorner Marin
4331aaa8d6 Any sign of activity will interrupt and clean the inactivity warning message 2016-10-31 17:28:56 +00:00
Ghazi Triki
ea9460b1bf Move client breakout rooms configuration to a new node and added a new option to enable/disbale recordings for breakout rooms. 2016-10-31 10:12:22 +01:00
Pedro Beschorner Marin
5416d01dcc Syncing note if a problem is detected while patching 2016-10-26 17:25:49 +00:00
Richard Alam
d02a26eeed - close port test connection right after test. The connection is kept open until the 
user leaves the meeting.
 2016-10-26 16:01:38 +00:00
Richard Alam
a7d6b385b1 - modify reconnection logic of screenshare 2016-10-24 21:15:39 +00:00
Pedro Beschorner Marin
079c24a75f An applause icon that better fit the other hand icons theme 2016-10-24 19:37:47 +00:00
Pedro Beschorner Marin
af7ba7caac Added applause status and fixed icons dimensions and colors 2016-10-24 19:20:01 +00:00
Pedro Beschorner Marin
67189dff4e Sending sharednotes undo and redo status with current documents message as client starts 2016-10-24 15:42:45 +00:00
Pedro Beschorner Marin
cc13708a27 Capturing CTRL-Z and CTRL-Y as undo and redo events 2016-10-24 13:04:55 +00:00
Ghazi Triki
6103151edd New option to logout user when he stops the recording. 2016-10-24 12:15:34 +01:00
Pedro Beschorner Marin
c2decd1d2a Cleanup 2016-10-21 19:46:32 +00:00
Pedro Beschorner Marin
ddd1459d4c Refactored sharednotes UNDO operation and implemented REDO 2016-10-21 19:33:30 +00:00
Richard Alam
2facff623a Merge pull request #3411 from riadvice/unique-meeting-id-breakout-rooms 
Unique meeting id for breakout rooms & additional improvements
 2016-10-21 15:11:28 -04:00
Pedro Beschorner Marin
1eb1aea65e More sofisticated control of sharednotes undo button 2016-10-20 19:56:57 +00:00
Pedro Beschorner Marin
758adb3b8e First functional version of sharednotes undo operation 2016-10-20 17:52:37 +00:00
perroned
399081d684 Fixes issue with viewer window not re-opening 2016-10-17 19:46:40 +00:00
Pedro Beschorner Marin
43c0a1ab17 Stating implementing sharednotes undo and redo 2016-10-17 16:15:23 +00:00
Pedro Beschorner Marin
5648b6c62d Fixed paricipant audio process at flash client 2016-10-17 13:32:34 +00:00
Pedro Beschorner Marin
bd0033eb0e Users media and status buttons alignment 2016-10-17 12:21:59 +00:00
Ghazi Triki
415e34fb28 Added new property redirectOnJoin to CreateBreakoutRoomsRequest. 2016-10-14 21:28:44 +01:00
Ghazi Triki
c694f632ea Added redirect property to RequestBreakoutJoinURL. 2016-10-14 20:46:34 +01:00
perroned
a8406765c8 Fixes issue with deskshare reusing window 2016-10-14 15:43:49 +00:00
Pedro Beschorner Marin
eb433b34b7 Reverting a small change so moderators will apply the last broadcasted layout as they join 2016-10-13 21:28:55 +00:00
Pedro Beschorner Marin
ab58583470 Fixed shared notes get current document timer initialization 2016-10-13 20:34:52 +00:00
Pedro Beschorner Marin
3055ab2d7e User settings menu as a well positioned menu 2016-10-13 19:22:26 +00:00
Pedro Beschorner Marin
0949a7b69a Mood menu as a well positioned menu 2016-10-13 19:06:31 +00:00
Pedro Beschorner Marin
2440f5e7ae Fixed presentation hidding issue when minimizing window 2016-10-13 16:46:32 +00:00
Ghazi Triki
8e8fee7826 Re-enable recording option for breakout rooms. 2016-10-13 17:43:53 +01:00
Ghazi Triki
b078628ad9 Store breakout room externalMeetingID to be used for generating join URL. 2016-10-13 17:17:47 +01:00
Chad Pilkey
fef5acace6 remove old deskshare module and out-dated Java checks 2016-10-12 18:13:02 -04:00
Ghazi Triki
f8beb9e4e7 Breakout rooms are now sorted by their sequence number. 2016-10-12 12:41:57 +01:00
Ghazi Triki
c95d208da7 Added sequence property breakout room. 2016-10-11 22:13:22 +01:00