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

3410 Commits

Author SHA1 Message Date
Richard Alam
eef2c87cd4 - cleanup 2014-05-05 18:45:18 +00:00
Tiago Daniel Jacobs
97ad5e28f4 Changes to support RTMPS connections 2014-04-24 17:16:03 -03:00
Richard Alam
bee1320463 Merge branch 'merge-polling-with-master' into connect-bbb-apps-html5 
Conflicts:
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
 2014-04-08 19:07:37 +00:00
Anton Georgiev
2d89a73c0c Merge branch 'addMsgLib' of /home/ubuntu/dev/antonHtml5/bigbluebutton into connect-bbb-apps-html5 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RedisMessagingService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.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/presentation/ConversionUpdatesProcessor.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-web/grails-app/conf/UrlMappings.groovy
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
	bigbluebutton-web/ivy.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/SwfSlidesGenerationProgressNotifier.java
 2014-04-08 15:55:04 +00:00
Gustavo Salazar
1d647470b7 Skip flash error 2038 2014-04-04 12:15:13 -07:00
Richard Alam
3742ebc1c2 - prevent the user from rejoining meeting when meeting has ended 2014-04-02 19:45:58 +00:00
Richard Alam
214957e52c - localize text 2014-03-28 16:02:33 +00:00
Richard Alam
0e1945118f - fix toolbar icon display when user leaves voice conf using webrtc 2014-03-28 15:05:38 +00:00
Richard Alam
d007fecd9f - leave voice conference when logging out even if the browser hasn't fully redirected away from the client yet 2014-03-27 19:36:02 +00:00
Richard Alam
bddd6f747d i - fix issue where user cannot leave voice conference when clicking on headset icon 2014-03-27 15:23:28 +00:00
Richard Alam
7e528c6890 - don't connect using flash when we want webrtc 2014-03-26 20:40:37 +00:00
Richard Alam
cc624dfa5e - fix race condition where we hangup the chotest and join the conference at the same time. 
We should stop echo test then join voice conference.
 2014-03-26 19:00:39 +00:00
Richard Alam
963468d729 Merge branch 'merge-polling-with-master' into implement-join-voice-with-flash 2014-03-26 16:58:13 +00:00
Richard Alam
5fb8dee4cd - hide mic settings when user has joined the voice conference 2014-03-26 16:56:38 +00:00
Richard Alam
9a001ed324 - close mic settings when user has joined voice conference 2014-03-25 21:33:58 +00:00
Richard Alam
4a495e0f6a - start stop echo test 2014-03-25 21:22:24 +00:00
Richard Alam
e065b4a63b connect to echo test app 2014-03-25 20:05:33 +00:00
Richard Alam
cd552664bc - continue implementing joining voice conf using flash 2014-03-25 17:16:42 +00:00
Gustavo Salazar
9a2b05a7ee allow username with spaces 2014-03-24 17:18:39 -05:00
Richard Alam
e27c8000f8 Merge branch 'merge-polling-with-master' into implement-join-voice-with-flash 2014-03-23 16:05:28 +00:00
Richard Alam
35daebbf86 - don't go through echo test again when user has already done it 2014-03-23 16:02:40 +00:00
Richard Alam
3f66908f4d - reinit mic 2014-03-21 22:08:50 +00:00
Richard Alam
bd0a54e9f1 - continue implementing Flash Mic Settings dialog 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/PhoneManager.as
 2014-03-21 21:43:19 +00:00
Richard Alam
ce3432fb1b - disable flash calling for webrtc testing 2014-03-21 14:37:09 +00:00
Richard Alam
0bc45659fc - show elcome message in chat window 2014-03-21 14:20:27 +00:00
Richard Alam
98d851c582 - add new commands 2014-03-20 20:46:46 +00:00
Richard Alam
5bb2a2cb2b - continue implementing join voice using flash 2014-03-20 19:10:09 +00:00
Richard Alam
148e3be430 - start implementing joining voice using flash 2014-03-19 21:34:09 +00:00
Richard Alam
a08be6298f - implement flow for user to join vonce conf uwing webrtc 2014-03-18 19:14:27 +00:00
Richard Alam
bb5db33eac - implement user joining voice using webrtc 2014-03-17 19:47:45 +00:00
firstuser
915f9aa3d7 - continue implementing mic settings for webrtc 2014-03-15 18:15:28 -07:00
Richard Alam
61d90933f4 - display different mic setting for ff and chrome 2014-03-14 22:44:53 +00:00
Richard Alam
04a77ddaca - figure out how to display mic permissions for FF and Chrome 2014-03-14 21:06:31 +00:00
Richard Alam
3b4b818841 i - do echo test and then join voice conference using webrtc 2014-03-14 19:21:21 +00:00
Richard Alam
4cc16f1b00 - add bin-debug dir to ignore 2014-03-14 16:03:23 +00:00
Richard Alam
d869dab51e - start implementing echo test and join conference using webrtc 2014-03-14 16:02:54 +00:00
Richard Alam
680fa7709a - minot cleanup 2014-03-12 18:36:33 +00:00
Richard Alam
dd0ed0df37 - fix query presentations from JS API 2014-03-12 14:18:14 +00:00
Richard Alam
31926bd26d - implement end and destroy meeting 2014-03-10 21:38:03 +00:00
Richard Alam
62f89ebe2d - start deskshare properly 2014-03-09 20:23:39 -04:00
Richard Alam
1a5251621d - display poll button if presenter when user joins 2014-03-02 18:16:52 -05:00
Richard Alam
a418190169 - sync presentation position for latecomer 2014-03-02 16:43:04 -05:00
Richard Alam
a535412629 - fix switching presentation 2014-03-02 15:15:42 -05:00
Richard Alam
46bb7633ca - fix undo and clear whiteboard 2014-03-06 20:35:00 +00:00
Richard Alam
bb11712a19 - display whiteboard shapes 2014-03-06 19:23:18 +00:00
Richard Alam
e27274bf8c - use wb id instead of pres/pagenumber for whiteboard 
- the whiteboard id matches presId/page id for the current page
 2014-03-06 16:37:03 +00:00
Richard Alam
6b855aa351 - start refactoring whiteboard 2014-03-05 21:43:35 +00:00
Richard Alam
2f9650d1d3 - fix uploading of presentation 2014-03-05 19:54:32 +00:00
Richard Alam
a43c942314 - fix upload 2014-03-04 22:51:35 +00:00
Richard Alam
371e2da0b0 - allow changing of page usng thumbnail 2014-03-04 20:52:23 +00:00