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

12645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felipe Cecagno
3e98233326 fix quick poll button that was visible for non presenters 2016-03-04 20:22:19 -03:00
Felipe Cecagno
bbcfe1f34a Merge remote-tracking branch 'bigbluebutton/master' into mconf 
Conflicts:
	bigbluebutton-html5/app/client/globals.js
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
 2016-03-04 20:19:55 -03:00
Pedro Beschorner Marin
7e0da6999c Cleanup 2016-03-04 21:08:15 +00:00
Pedro Beschorner Marin
b891be2e95 Client now react to warning messages and refactored server 2016-03-04 20:45:56 +00:00
RafaFP
5931219032 Fixing of unnecessary line changes. 
refs #1931
 2016-03-04 18:38:22 +00:00
RafaFP
5cd8a45ab0 Fixing of unnecessary line changes. 
refs #1931
 2016-03-04 18:26:10 +00:00
RafaFP
89ac2fd60a Improved the code to meet the peer review results. 
refs #1931
 2016-03-04 17:40:48 +00:00
jfederico
b7de6d897b bbb-lti: Implemented changes to the LTI integration 
- Fixed issue with app not responding to https requests
- Added configuration for ignoring/considering lti key/secret
- Extended logParameters to show them ordered
 2016-03-03 15:56:54 -05:00
Lucas Zawacki
6b56521fbd html5: Correctly kick user out of voice in markUserOffline 
The old code was wrongly setting obj.voiceUser when it should set obj.user.voiceUser
and caused problems when for example:

* user joins audio
* user hits F5
* user reconnects without webrtc audio enabled
* html5 client reports user still in audio and leaving/joining doesnt work anymore
 2016-03-03 17:38:26 -03:00
Pedro Beschorner Marin
225fbbb483 Meeting's inactivity detection. Still needs some refactoring and cleanup. 2016-03-03 20:30:56 +00:00
Calvin Walton
e343354bb4 Merge pull request #3036 from kepstin/recording-last-slide 
recording: Restore the $meeting_start/end global variables
 2016-03-03 11:33:34 -05:00
Calvin Walton
3a3d349553 recording: Restore the $meeting_start/end global variables 
These were commented out, apparently by accident, when the metadata code
was being refactored. The effect was that the $meeting_end variable was
treated as if it had a value of zero, meaning that the last slide had a
start time of some positive number and an end time of zero. As a result,
it was never shown (and didn't get any shapes either).

Fixes #3021
 2016-03-03 11:27:28 -05:00
Fred Dixon
e76bcd360f Merge pull request #3035 from ffdixon/remove-old-php-library 
Remove old php library
 2016-03-03 08:21:08 -05:00
Fred Dixon
62d46424a5 Remove old php library (new: https://github.com/bigbluebutton/bigbluebutton-api-php) 2016-03-03 08:18:28 -05:00
Anton Georgiev
d89f51f392 Merge pull request #3034 from lfzawacki/user-voice-plus-emojis 
HTML5: Small corrections to userUpdateVoice and emoji refactoring
 2016-03-02 15:01:41 -05:00
Lucas Zawacki
85a0fda657 Correct Meteor.log for unsupported json messages 2016-03-02 15:44:25 -03:00
RafaFP
932de9c07f Updated class and method names to better correspond to the implemented function. 
Improved the recording code.

refs #1931
 2016-03-02 16:02:30 +00:00
Lucas Zawacki
72591a6e9d Refactor icons to make it easier to extend and modify 2016-03-02 12:48:29 -03:00
Lucas Zawacki
92d5aaf5d0 Remove extra calls to updateVoiceUser in user mute/unmute 
This is supossed to be called when handling messages from the redis queue
and when called here would cause errors because it had no callback function.

The correct way is not calling it here, but handling the muting/unmiting when
receiving messages (which is already done).
 2016-03-02 12:44:34 -03:00
Felipe Cecagno
e4da408c08 Merge branch 'mconf' into bigbluebutton/bigbluebutton@master 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationService.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingServiceHelper.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java
	bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftl
	record-and-playback/presentation/playback/presentation/0.9.0/playback.html
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-03-02 01:19:09 -03:00
Felipe Cecagno
66392e0a6b Merge remote-tracking branch 'mconf/mconf-live0.7.4' into mconf 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
 2016-03-02 00:19:30 -03:00
Lucas Zawacki
480fb7762f Mconf emoji format on the HTML5 client 2016-03-01 23:59:35 -03:00
Lucas Zawacki
9315a596f7 Refactor icons to make it easier to extend and modify 2016-03-01 23:54:16 -03:00
Felipe Cecagno
ebd6be1c02 apply canvas calculation when toolbar or footer are resized or hidden 2016-02-29 14:28:40 -03:00
Chad Pilkey
7fe8f57a50 changed the flash client canvas height to calculated value 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2016-02-29 10:51:06 -03:00
Fred Dixon
5b8531bb5f Merge pull request #3032 from ffdixon/fix-bbb-conf-2 
Fixed on bug in matching for http/https
 2016-02-28 18:59:31 -05:00
Fred Dixon
1f7023cd06 Fixed on bug in matching for http/https 2016-02-28 18:58:25 -05:00
Fred Dixon
07bdba35e2 Merge pull request #3031 from ffdixon/add-https-bbb-conf 
Updates to bbb-conf to support HTTPS configuration
 2016-02-28 18:31:20 -05:00
Fred Dixon
539d70a993 Updates to bbb-conf to support HTTPS configuration 2016-02-28 18:30:09 -05:00
Fred Dixon
3ab8baf478 Merge pull request #3030 from ffdixon/update-demos-https 
Update API demos to work with https
 2016-02-28 14:02:36 -05:00
Fred Dixon
39c397b05a Update API demos to work with https 2016-02-28 13:59:45 -05:00
Richard Alam
6c9ab887d5 - we are seeing redis sub reconnecting because of exception on null emoji status in akka-apps. 
set the emojistatus to "none" (default) when it is null
 2016-02-26 18:30:58 -05:00
RafaFP
32f937def8 Implemented the clearing of text in the recordings player. 
Recordings will now clear the chat box for every clear command received during the recording.

refs #1931
 2016-02-26 21:18:14 +00:00
Richard Alam
ec6b9cc6a7 Merge pull request #3028 from pedrobmarin/issue-2892 
Added missing div to fix WebRTC audio for JavaScript API demo
 2016-02-26 13:38:33 -05:00
Pedro Beschorner Marin
ca5f974bde Added missing div to fix WebRTC audio for JavaScript API demo 2016-02-26 18:27:42 +00:00
Fred Dixon
639b206418 Merge pull request #3026 from ffdixon/fix-flash-player-gif 
Fix missing get_flash_player.gif error message in nginx logs
 2016-02-26 07:21:44 -05:00
Fred Dixon
de9ba3e0a9 Fix missing get_flash_player.gif error message in nginx logs 2016-02-26 07:20:25 -05:00
RafaFP
dec98ab7cf Interface upgrade and correction to public chat clearin only. 
refs #1931
 2016-02-25 19:01:42 +00:00
RafaFP
029aa4a6d7 Implemented a Warning PopUp Window to check that the moderator really wants to clear the chat. 
refs #1931
 2016-02-23 20:22:09 +00:00
RafaFP
65b181198c Implemented a button to clear chat history. 
New conversation joiners will not receive the history previous to the clearing.
Current conversation users will clear the local chat history and be notified that a moderator cleared the chat.

refs #1931
 2016-02-22 22:10:04 +00:00
Richard Alam
09da04a4f0 Merge pull request #3020 from antobinary/fix-3012 
fix for #3012 no presenter after ex-presenter kicked
 2016-02-22 10:07:27 -05:00
Anton Georgiev
107fa7c07a fix for #3012 no presenter after ex-presenter kicked 2016-02-19 16:52:56 +00:00
Fred Dixon
e6e0e60cf9 Merge pull request #3018 from jfederico/master 
The new directory [deleted] is now included when deleting recordings with bbb-record
 2016-02-18 17:00:20 -07:00
Chad Pilkey
9b4e264d1d Merge pull request #3016 from tdj-br/master 
Fix bigbluebutton/bigbluebutton#2710
 2016-02-18 17:41:52 -05:00
Tiago Daniel Jacobs
ac1990f426 Fix bigbluebutton/bigbluebutton#2710 (attempt 2) 2016-02-18 01:49:17 -02:00
Tiago Daniel Jacobs
f8c050aa25 Fix bigbluebutton/bigbluebutton#2710 2016-02-16 23:17:32 -02:00
jfederico
0d017dc265 bigbluebutton-config: Included the new directory [deleted] in shell for managing recordings 2016-02-16 15:14:46 -05:00
RafaFP
c1024c86d3 Changed the ChatToolbar position and changed the text in the buttons to icons. 
The toolbar will no longer stand in front of the last messages alowing for the user to select them.
Merged for use with the 0.8.0 version.

refs #1822
 2016-02-16 19:55:19 +00:00
Richard Alam
4bfa67f4c4 Merge pull request #3015 from jfederico/master 
Fix for bugs related to new states for recordings
 2016-02-16 10:35:45 -05:00
RafaFP
1f8f5b3bcb Changed the getTime function for messages on chat so that it will be executed by the server. 
Server time will be displayed on chat messages, after converted to the local timezone.

refs #1915
 2016-02-15 19:06:54 +00:00