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

13815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Dixon
9f96f6883f Updated restart of libreoffice for systemd 2016-11-08 17:55:44 -06:00
Chad Pilkey
f818b0e5c2 Flex 4 AIR: switch from png to font icons 2016-11-08 18:46:00 -05:00
Richard Alam
c0124957ec Merge pull request #3447 from ritzalam/add-connect-success-log 
- add log to indicate successful connection to bbb-apps
 2016-11-08 17:02:56 -05:00
Richard Alam
934de7e563 - add log to indicate successful connection to bbb-apss 2016-11-08 21:42:36 +00:00
Richard Alam
ef2d2fc4aa Merge pull request #3444 from jfederico/extension_preview_escaped_thumbnail_xml_response 
bbb-web: Escaped strings used in freemarker template for thumbnails
 2016-11-08 11:43:28 -05:00
Fred Dixon
4001f73144 Merge pull request #3443 from jfederico/extension_preview_no_thumbnails_for_default 
record-and-playback: No thumbnails for default presentation
 2016-11-07 19:08:54 -05:00
jfederico
dd1fb9e6ac bbb-web: Escaped strings used in freemarker template for thumbnails 2016-11-07 18:55:27 +00:00
jfederico
737697968c record-and-playback: Removed preview extension (thumbnails) from recordings when only has default presentation 2016-11-07 18:50:28 +00:00
KDSBrowne
2296a122f5 Actions button only available to Presentor 2016-11-07 10:19:00 -08:00
KDSBrowne
2e3fe72cf4 Lock settings available to Presentor/Moderator 2016-11-07 09:52:21 -08:00
Anton Georgiev
4efad507cd Merge pull request #3425 from oswaldoacauan/refactor-meetings-api 
[HTML5] Refactor of Meetings API
 2016-11-07 11:59:07 -05:00
Anton Georgiev
d1dfdf4738 Merge branch 'refactor-meetings-api' of github.com:oswaldoacauan/bigbluebutton into test-meetings-api 2016-11-07 16:52:51 +00:00
Gabriel Carvalho de Campes
0021a9619c Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5 
* upstream/master:
  Update config.xml.template
  Remove /tmp/tmp.XXXXXXXX file created by bbb-record
  remove some unnecessary logging
  Fixed stream to streams
  - updating latest locales except for zh_TW as it's failing to compile.
  Move client breakout rooms configuration to a new node and added a new option to enable/disbale recordings for breakout rooms.
  record-and-playback: Encoded text coming from the slide for being used in thumbnails
  Format line in bbb-conf using spaces.
  bbb-conf stops and starts redis server & checks video and freeswitch recordings directories
 2016-11-07 13:53:04 -02:00
Gabriel Carvalho de Campes
a262430871 Add code to handle breakout rooms in html5 2016-11-07 13:52:39 -02:00
Fred Dixon
a6deb821a4 Update config.xml.template 2016-11-04 15:41:01 -04: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
Fred Dixon
346161a8dc Merge pull request #3440 from ffdixon/rm-temp-file 
Remove /tmp/tmp.XXXXXXXX file created by bbb-record
 2016-11-04 13:06:13 -04:00
Fred Dixon
ad8a12923f Remove /tmp/tmp.XXXXXXXX file created by bbb-record 2016-11-04 12:05:41 -05:00
Fred Dixon
cf1e0de3d2 Merge pull request #3439 from antobinary/new-master 
Remove some unnecessary logging
 2016-11-04 12:56:50 -04:00
Anton Georgiev
d4e0494be0 remove some unnecessary logging 2016-11-04 16:11:16 +00:00
Fred Dixon
38c724afac Merge pull request #3438 from ffdixon/fix-directory-streams-bbb-config 
Fixed stream to streams (syntax error in bbb-config)
 2016-11-04 12:10:20 -04:00
Fred Dixon
48b5cf89fe Fixed stream to streams 2016-11-04 11:09:34 -05:00
Richard Alam
316b7d69b5 Merge pull request #3437 from ritzalam/update-latest-locales-from-transifex 
- updating latest locales except for zh_TW as it's failing to compile.
 2016-11-04 11:50:55 -04:00
Richard Alam
c6684ca2f6 - updating latest locales except for zh_TW as it's failing to compile. 2016-11-04 15:47:31 +00:00
Oswaldo Acauan
41f06644c2 Fix import in stunturn reply handler 2016-11-03 17:23:00 +00:00
Oswaldo Acauan
6a8f997b00 Fix handleStunTurnReply function name 2016-11-03 13:35:05 +00:00
Oswaldo Acauan
71fb7abd70 Refactor stuns/turns handler 2016-11-03 13:33:14 +00:00
JaeeunCho
aedf4561de HTML5-client messages for logged out user on chat 2016-10-31 15:17:06 -07:00
JaeeunCho
e541487596 Merge remote-tracking branch 'upstream/master' into messages_v1 2016-10-31 14:18:37 -07: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
Fred Dixon
d4828f27ad Merge pull request #3413 from riadvice/bbb-conf-redis-and-recordings 
Update to bbb-conf for --check, --stop and --start
 2016-10-30 20:13:31 -07:00
Chad Pilkey
df5116928f Flex4: AIR transition to common library usage (main, part, chat finished) 2016-10-28 19:33:32 -04:00
Richard Alam
be09a83c1f Merge pull request #3431 from jfederico/master 
record-and-playback: Encoded text coming from the slide for being use…
 2016-10-27 17:37:11 -04:00
jfederico
64a4f4dc08 record-and-playback: Encoded text coming from the slide for being used in thumbnails 2016-10-27 17:35:58 -04:00
Gabriel Carvalho de Campes
e8974fe929 Add initial file structure for breakouts api 2016-10-27 15:47:40 -02:00
Richard Alam
9e86e95275 Merge pull request #3430 from ritzalam/random-port-test-ids 
close port test connection right after test.
 2016-10-26 13:10:04 -04: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
Anton Georgiev
6b0c136191 Merge pull request #3428 from mmarangoni/html5-stun-audio 
HTML5 audio plus stun request
 2016-10-26 11:31:09 -04:00
Fred Dixon
1db9b6326e Merge pull request #3429 from riadvice/lower-swf-conversion-text-threshold 
Lower SWF conversion threshold from 2500 to 2000 for text objects.
 2016-10-26 06:54:31 -07:00
Ghazi Triki
1c45633028 Lower SWF conversion threshold from 2500 to 2000 for text objects. 2016-10-26 14:36:27 +01:00
Matthew Marangoni
7fb492894e Added exiting audio 2016-10-25 14:16:40 -07:00
Richard Alam
9a507b256b Merge pull request #3427 from ritzalam/fix-exception-on-getmeetinginfo 
- getmeetinginfo is throwing exception
 2016-10-25 16:50:25 -04:00
Richard Alam
662218a96f - getmeetinginfo is throwing exception 2016-10-25 20:47:04 +00:00
JaeeunCho
8bb915e8cd HTML5-clent messages on chat 2016-10-25 10:22:55 -07:00
Richard Alam
9b43acc32f Merge pull request #3420 from ritzalam/try-to-cleanup-connection 
remove defunct connection when client auto-reconnects.
 2016-10-25 12:55:46 -04:00
Matthew Marangoni
d21545c847 added html5 stun request and reply 2016-10-25 07:59:14 -07:00
Richard Alam
a7d6b385b1 - modify reconnection logic of screenshare 2016-10-24 21:15:39 +00:00
Matthew Marangoni
0d3f231ac1 Merge remote-tracking branch 'upstream/master' into html5-stun-audio 2016-10-24 09:08:13 -07:00
Matthew Marangoni
374698c338 beginning work on html5 audio 2016-10-24 09:01:50 -07:00
Gabriel Carvalho de Campes
5aaafa8202 Merge remote-tracking branch 'upstream/master' into refactor-poll-api 
* upstream/master: (26 commits)
  - fix check for breakout room  - insert breakout metadata into events.xml  - delete breakout metadata from redis
  Rename meteor method on the client
  Remove left over debug
  Fix chat being always inserted when the server start
  Add debug message when handler is completed with errors
  Fix bug on the clearChats and addChat modifiers
  HTML5 - fixed linebreak with lint
  HTML5 - fixes fullscreen toggle to un-fullscreen
  Monitoring for number of user is not triggered for breakout rooms.
  Updated bbb-record rules to detect recording directories.
  Added new property redirectOnJoin to CreateBreakoutRoomsRequest.
  Added redirect property to RequestBreakoutJoinURL.
  Fix handler for 'get_whiteboard_shapes_reply' not calling the cb
  Store breakout meeting info in redis under "meeting:breakout" key instead of "meeting:info"
  Using blank-presentation.pdf as default breakout room presentation when no current presentation is set to the parent room.
  Re-enable recording option for breakout rooms.
  Store breakout room externalMeetingID to be used for generating join URL.
  Store breakout room sequence in akka-apps and bbb-web.
  Revert replacing the deprecated shaHex DigestUtils by sha1Hex and updated API controller.
  Deleted unused imports from bigbluebutton-apps and bigbluebutton-web
  ...
 2016-10-24 13:39:37 -02:00