BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,997 Commits 13 Branches 260 Tags 1.1 GiB
339acc9166
Commit Graph

7997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mateus Dalepiane
339acc9166 Send UserJoined only after guests are accepted 
This means that the guest will be displayed on participants list
only after they accepted
 2014-11-03 17:54:39 -02:00
Mateus Dalepiane
c97cd3f3af Sending guest flag also through redis now 
This parameter was missing, and causing exceptions in bbb-web.
 2014-10-29 18:58:12 -02:00
Mateus Dalepiane
d7d93c04ce Fixed problem with guest logout 
The guest is removed from the waiting list if he logout.
 2014-10-29 18:12:32 -02:00
Mateus Dalepiane
f51bc9a6bb Trying to fix guest logout problem 
Currently, the guest is not removed from the waiting list if he logout.
There is a problem @BigBlueButtonApplication.java, @roomConnect. I am not
sure of how to use those paramenters, neither where they come from.
 2014-10-23 15:31:50 -02:00
Mateus Dalepiane
f0dc019311 Show guest rejected message 
The message window height still need to be fixed.
 2014-10-22 17:36:48 -02:00
Mateus Dalepiane
dfa32dcd6d cleanup 
TODO:
+ Show guest the rejectred message
+ Handle guest disconnection
 2014-10-21 17:40:06 -02:00
Mateus Dalepiane
14745ab53b Extending guest-role support for redis 2014-10-21 16:20:34 -02:00
Mateus Dalepiane
0427328e35 Fix misplacement of settings button 
Also, settings button no longer appear for guest moderators
 2014-10-21 14:59:03 -02:00
Mateus Dalepiane
a8131da8a6 Fixing bug at guest-role port 
+ Approval window appears whenever necessary now
+ Guest approval and denial is working
- Settings button is misplaced
 2014-10-21 02:48:31 -02:00
Mateus Dalepiane
f75fa7f972 Implemented guest-role on bbb-client 
Known issues:
+ Guest approval window does not appear for moderators already on the room
+ Guest approval and denial is not working
+ Settings button position is wrong
 2014-10-20 17:44:45 -02:00
Mateus Dalepiane
f3a7c460f4 Completed guest role implementation at bbb-apps 
Implementation in bbb-client still pending.
 2014-10-20 02:45:50 -02:00
Mateus Dalepiane
f94dbf250b Implementing guest support at bbb-apps 
Now bbb-apps compiles, but guest support does not work yet.
Response messages are missing.
Guests waiting list is missing.
 2014-10-17 17:30:36 -03:00
Mateus Dalepiane
36af1da3df Port of guest role to bbb-090 
**WARNING**: Not tested yet.
bbb-client and bbb-web compile.
bbb-apps does not compile yet.

@bbb-apps: Missing scala implementation.
@bbb-client: Missing message receiver implementation.
Conflicts:
	bbb-api-demo/src/main/webapp/bbb_api.jsp
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonSession.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ParticipantUpdatingRoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/User.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/UsersConnectionEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	bigbluebutton-web/grails-app/conf/BigBlueButtonFilters.groovy
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/UserSession.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessageListener.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
 2014-10-16 16:58:10 -03:00
Richard Alam
da59fb35e4 - updating locales 2014-10-12 07:12:50 -07:00
Richard Alam
0fb0e603ef - increase log file size and number of backups kept 2014-10-12 05:43:18 -07:00
Fred Dixon
576e8badbd Merge pull request #406 from SenecaCDOT-BigBlueButton/update-audioselection-logout 
Minor client upgrades
 2014-10-10 20:49:12 -04:00
Chad Pilkey
e8d8a8b33d moved the AudioPathSelectionWindow resize function to initialize from creationComplete 2014-10-10 16:30:55 -07:00
Chad Pilkey
fdb763571d made AudioPathSelection less squished, added automatic redirect on logout 2014-10-10 16:11:03 -07:00
Richard Alam
8f38fa1f30 - find audio wav files even if they are located in sub dirs 2014-10-08 13:50:41 -07:00
Richard Alam
745dcc7688 Merge pull request #405 from kepstin/recording-updates 
Fix publish step failing when multiple recordings processed in one run
 2014-10-08 11:26:02 -04:00
Calvin Walton
49b66d6eb6 Fix publish step failing when multiple recordings processed in one run 
The logic for deleting the process done files was wrong, resulting in
the script (attempting and failing) deleting all of the done files for
all of the processed recordings after the publish completes for one of
them.

Fix the logic to only delete the process done file for the recording that
just completed publishing.
 2014-10-08 11:08:22 -04:00
Richard Alam
a3f594172f - update locales from transifex 2014-10-07 09:29:31 -07:00
Richard Alam
f7ff1bee42 Merge pull request #404 from SenecaCDOT-BigBlueButton/webrtc-connection-upgrades 
Fixed some issues where people got stuck at connecting with webrtc
 2014-10-06 18:22:59 -04:00
Chad Pilkey
7d9b26912e Merge remote-tracking branch 'upstream/master' into fix-no-presentation-problems 
Conflicts:
	bigbluebutton-client/resources/prod/BigBlueButton.html
 2014-10-06 15:09:36 -07:00
Chad Pilkey
4ec65bc300 enhannced LoggedOutWindow to allow for easy reconnect 2014-10-06 15:07:22 -07:00
Chad Pilkey
de7dbd0b44 Multiple fixes to our webrtc implementation. Hopefully there's less holes now 2014-10-06 14:14:34 -07:00
Richard Alam
55532d326d Merge pull request #401 from SenecaCDOT-BigBlueButton/localization 
resized and positioned some of the components to fit with Russian and Ge...
 2014-10-01 15:36:59 -04:00
syeshchenko
14b401851d resized and positioned some of the components to fit with Russian and German locales, changed and added some Russian translation 2014-10-01 15:18:31 -04:00
Jesus Federico
5a152c0cb7 bbb-lti: ssl_enabled is now validated only once 2014-09-29 14:48:21 -04:00
Jesus Federico
9c394bba4a bbb-lti: Fixed issue with ssl ping when tiemeout is too long 2014-09-29 14:01:06 -04:00
Jesus Federico
ac02f6f8e8 Merge pull request #400 from jfederico/master 
bbb-lti: Updated css
 2014-09-29 13:14:16 -04:00
Jesus Federico
4f1b907daf bbb-lti: Updated css 2014-09-29 13:11:57 -04:00
Fred Dixon
9e87ffa02a Added libraries to make audio work with demo11.jsp (javascript API demo) 2014-09-21 19:01:58 -04:00
Fred Dixon
c89b9c63d8 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2014-09-18 08:53:08 -04:00
Fred Dixon
b4d49a0f2b Added build numbers into loading JS libraries to ensure they don't get cached 2014-09-17 17:38:19 -04:00
Fred Dixon
6d26b076d3 Added detection for OpenVZ IP address in bbb-conf 2014-09-17 17:37:43 -04:00
Richard Alam
27b38d89b2 Merge pull request #399 from SenecaCDOT-BigBlueButton/fix-no-presentation-problems 
Multiple fixes to the presentation module
 2014-09-17 17:26:37 -04:00
Chad Pilkey
00ef1d50a1 fixed a crash related to deleting presentations, two ui problems with presentations, and cleaned up an event listener that wasn't used anymore 2014-09-17 11:47:25 -07:00
Richard Alam
3581eb9354 Merge pull request #398 from SenecaCDOT-BigBlueButton/deskshare-resize-enhancements 
added default background color to the move icon
 2014-09-17 14:31:54 -04:00
syeshchenko
3dcce2a7d6 added default background color to the move icon 2014-09-17 14:28:21 -04:00
Richard Alam
90bf3ade5d - new jars with better controls for deskshare applet dragging and resizing 2014-09-17 10:33:17 -07:00
Richard Alam
400f62102c Merge pull request #397 from SenecaCDOT-BigBlueButton/deskshare-resize-enhancements 
added resize and move cursors to make moving and resizing more accessibl...
 2014-09-17 13:12:58 -04:00
syeshchenko
d49ca935d6 added resize and move cursors to make moving and resizing more accessible for users 2014-09-17 13:08:14 -04:00
Richard Alam
51cdd5ab42 Merge branch 'SenecaCDOT-BigBlueButton-chrome-camera-settings' 2014-09-15 13:56:52 -07:00
Richard Alam
58302721c0 Merge branch 'chrome-camera-settings' of https://github.com/SenecaCDOT-BigBlueButton/bigbluebutton into SenecaCDOT-BigBlueButton-chrome-camera-settings 2014-09-15 13:36:24 -07:00
syeshchenko
4a1c793390 fixed Chrome permission hint arrow 2014-09-15 13:28:26 -07:00
Richard Alam
a0a6172a4f - fix lock settings for muteme and webcam buttons for mods and presenter 2014-09-15 09:38:05 -07:00
Richard Alam
50352c0204 - make sure to cancel the thread after presentation conversion 2014-09-15 09:05:03 -07:00
Richard Alam
e313379355 - changed the wrong field to be zero based. Should be the slide field instead of num. 2014-09-15 08:29:15 -07:00
Fred Dixon
1f930c90d4 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2014-09-14 19:42:10 -04:00