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

1012 Commits

Author SHA1 Message Date
Maxim Khlobystov
d03defeb33 (merging from Maxim) Implemented switching slides. 
Conflicts:
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-presentation.xml
	labs/meteor-client/client/views/whiteboard/whiteboard.coffee
	labs/meteor-client/client/views/whiteboard/whiteboard.html
	labs/meteor-client/server/redispubsub.coffee
 2015-05-06 19:55:29 +00:00
Mateus Dalepiane
0662a242aa Merge branch 'bigbluebutton/master' into 090-new-videodock 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
 2015-04-29 12:10:41 -03:00
Mateus Dalepiane
1d2f980f85 Reset line endings to original 2015-04-29 11:12:50 -03:00
Anton Georgiev
70d3c00e74 include permissions info in the reply for GetAllMeetingsRequest 2015-04-24 21:21:10 +00:00
Anton Georgiev
ff934cf472 Merge branch 'master' into listen-only-prototype 2015-04-22 14:05:05 +00:00
perroned
554ce1d06b Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call 
Conflicts:
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/stylesheets/style.less
	bigbluebutton-html5/app/client/views/chat/chat_bar.html
 2015-04-22 06:03:46 -07:00
Anton Georgiev
fa4cd71ff4 publishing to redis channel "meeting" instead of handling the event on channel "voice" 2015-04-16 19:06:04 +00:00
Richard Alam
933b9d04ef - make a moderator presenter when the current presenter leaves (e.g. disconnected). This way, as long as 
there is a moderator in the meeting, there will always be a presenter.
 2015-04-14 14:40:24 +00:00
Anton Georgiev
fdbc62ccd1 Cherry pick Anton's server side listen only. Fix conflicts 2015-04-06 05:10:56 -07:00
Felipe Cecagno
71313059e0 Merge branch 'meeting-created-params' into meeting-created-params-master 2015-03-20 12:39:17 -03:00
Mateus Dalepiane
85497ea6c3 Adding information to the event "meeting_created_message" 
The following information was added:
+ moderator_pass (Moderator password)
+ viewer_pass (Viewer password)
+ create_time (Create time)
+ create_date (Create date)
 2015-03-20 12:32:43 -03:00
Tiago Daniel Jacobs
4fff479e03 Added lockOnJoinConfigurable property to lock config. 2015-03-12 20:52:38 +00:00
Fred Dixon
cf5ab25ca0 Revert "Revert "Bbb lock settings fix"" 2015-03-04 16:47:35 -05:00
Chad Pilkey
34fdfb9f83 Revert "Bbb lock settings fix" 2015-03-04 11:49:13 -05:00
Tiago Daniel Jacobs
34e2e48be2 Merging 2015-03-03 06:52:56 +00:00
Tiago Daniel Jacobs
647c0a83bc Code clean up and fixes to lock settings 2015-03-03 04:49:56 +00:00
Tiago Daniel Jacobs
95cf0167f2 Restored ability to lock/unlock individual users 2015-03-03 00:44:34 +00:00
Tiago Daniel Jacobs
bf62dd66a2 Fixed mute on start, added lock on join option 2015-03-02 18:06:09 +00:00
Richard Alam
e8c61c5356 - lower log level on some logs so we can filter 
- add a detection when a meeting actor has hung resulting in users not being able to do anything
 2015-02-26 16:02:21 +00:00
Anton Georgiev
b6bde6fb97 removing merging traces for smooth pull req 2015-02-19 21:06:01 +00:00
Anton Georgiev
6416469172 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 
Conflicts:
	bbb-api-demo/src/main/webapp/demoHTML5.jsp
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2015-02-19 20:47:08 +00:00
Anton Georgiev
7911046a70 allowing " and \ chars in the chat strings from the HTML5 client 2015-02-19 19:29:26 +00:00
Richard Alam
1baf405a31 - remove storing of connection as we query the connection from Red5 directly 2015-02-18 01:31:32 +00:00
Anton Georgiev
cd0fe0bd58 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2015-02-17 23:47:23 +00:00
Richard Alam
55059a4c60 - remote CollectorActor as we don't use it. Found that sometimes it's sendBuffer gets too large and 
not sure if the Actor died and isn't processing the messages.
 2015-02-17 17:01:17 +00:00
Richard Alam
18403d03bc - update red5 to bring in fix for connections not cleanedup properly which may be cause OOM Exception 2015-02-11 22:31:23 +00:00
Richard Alam
96e8fde865 - change format of logs to add timezone 2015-02-09 18:40:31 +00:00
Anton Georgiev
ee4db621fc Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into chat-quotes 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
 2015-02-03 15:28:35 +00:00
Anton Georgiev
dced2a0902 allowing " and \ chars in the chat strings from the HTML5 client 2015-02-02 23:33:17 +00:00
Richard Alam
d2a2b4b5db - use the new userid information to identify the red5 connection 2015-02-02 19:40:25 +00:00
Richard Alam
b91b7087c5 - treat authToken and userid differently. Before, userid and authtoken had the same values. 2015-02-02 19:38:18 +00:00
Richard Alam
fd061d82d1 - use the userid instead of having sessionid as the sessionid is just a duplicate info 2015-02-02 19:37:00 +00:00
Richard Alam
f17ae89b6f - remove duplicate register user as we now only process the register user message from bbb-web not from the client 2015-02-02 19:35:50 +00:00
Richard Alam
98c9868bb3 - try to fix usr joining sequence 2015-01-31 09:39:43 -08:00
Richard Alam
a900eed3ce - start modifying messages to use sessionid to identify user 2015-01-30 23:01:48 +00:00
Anton Georgiev
1f7b751ee6 user join was not triggering for html5 client users. using the token instead of userID to find the user 2015-01-30 22:12:31 +00:00
Felipe Cecagno
9a7bae79a8 Merge branch '090-new-videodock' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	record-and-playback/deploy.sh
 2015-01-28 20:33:28 -02:00
Richard Alam
332c252b92 - fix the presentation text file url 2015-01-28 21:52:17 +00:00
Felipe Cecagno
a4d5c2a67b fix the problem where the user shares two cameras, then unshare one of them, and a new user receives hasStream=false for that particular user 2015-01-28 19:18:38 -02:00
Richard Alam
5798f727c5 - add sessionId in user info so we know if user is connected using Red5 or NodeJS 2015-01-23 20:00:13 +00:00
Richard Alam
192a2ccd0d - remove unused code 2015-01-23 19:54:15 +00:00
Richard Alam
0d44571674 - update to latest red5 with local connection ishared object fix 2015-01-13 18:08:03 +00:00
Anton Georgiev
a6d2ecc8a4 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
 2015-01-09 16:32:10 +00:00
Richard Alam
53630e758c Merge branch 'master' into format-logging-when-user-joins-global-audio 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
 2015-01-08 21:19:19 +00:00
Richard Alam
fca1798868 - increase the number of log history 2015-01-08 20:21:47 +00:00
Richard Alam
e1c4edae45 - add more logging to help debug where demo meeting disappears on test-install 2015-01-07 13:39:56 -08:00
Richard Alam
ca9931e2dc - fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1850 2015-01-05 19:59:46 +00:00
Richard Alam
7936ee3e7c - upgrade to red5 1.0.4 release 2014-12-29 10:37:35 -08:00
Richard Alam
8d80e1d527 - try one more time...please make it align! :) 2014-12-16 18:59:44 +00:00
Richard Alam
74f07d4e3a - try to fix indents 2014-12-16 18:54:51 +00:00