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

7500 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
6544017d51 Merge pull request #317 from gugat/issue1746 
delete old raw dir from published recordings
 2014-04-14 21:37:42 -04:00
Gustavo Salazar
7d291abcfd delete old raw dir from published recordings 2014-04-14 15:14:14 -07:00
Richard Alam
9953f915ca - add script to build all bbb red5 apps 2014-04-14 14:07:26 -07:00
Richard Alam
7328d21099 - remote log dependency 2014-04-14 12:55:21 -07:00
Richard Alam
7970495c58 - try to fix why BBB apps isn't starting 2014-04-14 10:44:25 -07:00
Richard Alam
f67688857d - minor changes 2014-04-14 07:58:20 -07:00
Richard Alam
307038a6d2 - get request/response working 2014-04-13 19:18:21 -07:00
Richard Alam
df9ac02e79 - don't use classes 2014-04-13 17:16:37 -07:00
Richard Alam
8d50ea3e7f - trying to setup message handlers 2014-04-13 16:39:18 -07:00
Anton Georgiev
bfd3da083a fixed users[] in GetUsersReply 2014-04-11 20:27:33 +00:00
Anton Georgiev
30605a7afe fixed msg.shapes for GetWhiteboardShapesReply 2014-04-11 19:05:21 +00:00
Anton Georgiev
1b80e53582 worked on complex structures - history, settings, etc... 2014-04-11 17:40:11 +00:00
Anton Georgiev
1c8917cbc4 Commented out logging for mouse moves. Commented out lines causing errors 2014-04-10 18:20:28 +00:00
Anton Georgiev
26b8a9645a minor changes in the debugging messages 2014-04-09 21:08:36 +00:00
Anton Georgiev
1729ab06df minor formatting fixes 2014-04-09 20:50:36 +00:00
Anton Georgiev
d7f4dad7df "OUT" messages are now in place too. 2014-04-09 20:43:09 +00:00
Anton Georgiev
3bab42b4d1 all "IN" messages are in place now 2014-04-09 16:53:19 +00:00
Anton Georgiev
d3787a6266 working on improving the logging for events (DISPATCHING) 2014-04-08 22:01:55 +00: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
Richard Alam
6ab5feb117 - fix compile issues 2014-04-08 18:49:29 +00:00
Richard Alam
3bd5840e3c - make bbb-apps compile 2014-04-08 18:37:51 +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
Anton Georgiev
ab6922b329 user_left_event in channel bigbluebutton:meeting:anton results in the leaving of the flash client user with that name 2014-04-07 21:33:37 +00:00
Anton Georgiev
efc89524de user_joined_event in pubsub on channel bigbluebutton:meeting:anton results in the user added to the userlist in the flash client 2014-04-07 21:17:04 +00:00
Richard Alam
e7448cf9c4 Merge pull request #315 from gugat/fix-sanity 
set absolute path to ffmpeg
 2014-04-07 15:13:04 -04:00
Gustavo Salazar
4989b195f4 set absolute path to ffmpeg 2014-04-07 12:14:47 -07:00
Anton Georgiev
fcc8379e90 added a listener for participants (user join, user leave) events. Worked on redirecting json messages of the new format to their proper handler 2014-04-07 18:43:29 +00:00
Richard Alam
e709ff4fbd - build with red5 1.0.2-M1 2014-04-07 17:31:49 +00:00
Richard Alam
28e99fe05f - fix compile issue 2014-04-05 09:37:53 -07:00
Richard Alam
17868b5dba - try to upgrade to red5 1.0.2-M1. Need to fix compile and startup issues 2014-04-05 09:22:01 -07:00
Richard Alam
00974ecaae - send proper name when recording chat 2014-04-04 20:42:29 +00:00
Richard Alam
cdffdf4062 - fix typo 2014-04-04 20:41:58 +00:00
Richard Alam
16b9935ce3 - setup collecting of incoming and outgoing messages 2014-04-04 19:12:08 +00:00
Richard Alam
0714d25c4a Merge pull request #314 from gugat/flash-error-2038 
Flash error 2038
 2014-04-04 15:11:36 -04:00
Gustavo Salazar
3f469a2884 Merge branch 'merge-polling-with-master' of https://github.com/bigbluebutton/bigbluebutton 2014-04-04 12:17:09 -07:00
Gustavo Salazar
1d647470b7 Skip flash error 2038 2014-04-04 12:15:13 -07:00
Richard Alam
bafedc0c07 - enable recording when there is only 1 user in fs 2014-04-04 15:28:30 +00:00
Richard Alam
f8d8079f59 - make sure to record the EndAndKickAllEvent 2014-04-04 14:51:14 +00:00
Anton Georgiev
e45a77f080 minor changes 2014-04-04 14:26:09 +00:00
Richard Alam
460dfb52bf - modify scripts so we can run it manually 2014-04-03 20:23:49 +00:00
Anton Georgiev
fa0ce4e1b0 fixed minor bugs that were causing errors due to 'null' 2014-04-03 19:13:13 +00:00
Anton Georgiev
8d05809c39 now the flash client user is displayed just once in the user list 2014-04-03 18:45:44 +00:00
Anton Georgiev
f4a21302b3 userJoining (the user starting from html5 client) is also joined via user_joined_event 2014-04-03 18:34:19 +00:00
Richard Alam
00ef6c0998 Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into merge-polling-with-master 2014-04-02 22:12:47 +00:00
Richard Alam
3956daf327 - playing around with api in coffee 2014-04-02 22:11:59 +00:00
Fred Dixon
11b0d0eca7 Bumped footer message in chat to say 0.9.0-dev 2014-04-02 21:35:40 +00:00
Fred Dixon
636793d651 Fix build for bigbluebutton-lti 2014-04-02 21:31:52 +00:00
Richard Alam
7e0af3e042 - check if meeting has been forciblyEnded and don't let the user join if it is 2014-04-02 20:01:29 +00:00
Richard Alam
3742ebc1c2 - prevent the user from rejoining meeting when meeting has ended 2014-04-02 19:45:58 +00:00
Anton Georgiev
47b19a4f39 user_left_event is now handled by the client. The username is moved to the left-hand side (was supposed to remove it) 2014-04-02 18:20:41 +00:00