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

7203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Anton Georgiev
b0f8719480 user_left_event: when a user leaves an additional event is now dispatched - of the structure supported by the html5 client 2014-04-02 18:18:37 +00:00
Richard Alam
090cb4115b - fix issue where getMeetings and getRecordings calls just loops back resulting in StakOverflow 2014-04-02 16:17:24 +00:00
Anton Georgiev
e253c76b05 worked on user_joined_event 2014-04-01 21:59:51 +00:00
Anton Georgiev
7bfdf6de7a at this stage joining of a user via flash can be updated(displayed) on the html5 client! (kind of hard-coded) 2014-04-01 21:57:52 +00:00
Richard Alam
1a9857d493 - start/stop FS recording when first user joins and last user leaves the voice conference 2014-04-01 20:10:26 +00:00
Richard Alam
aeb15546e9 - send start/stop recording to FS 2014-04-01 18:18:47 +00:00
Anton Georgiev
9bd51abe1d temporary reducing the number of messages in the log - keep alive logging is removed. Also I commit a block of code for changing the channel of an incoming message from pubsub 2014-04-01 16:08:54 +00:00
Anton Georgiev
2287b24fc2 modified the login page so you can enter manually the meetingID that you want 2014-04-01 15:30:10 +00:00
Anton Georgiev
fdff666836 @Richard: I am attempting to trigger a joined_event_message to be sent and to be handled by Node 2014-04-01 15:11:06 +00:00
Gustavo Salazar
ff96b6a97a absolute path to ffmpeg and ffprobe. 2014-03-31 18:13:52 -05:00
Anton Georgiev
eb133320d1 minor console logging changes 2014-03-31 15:48:49 +00:00
Anton Georgiev
6952184799 handles a bug where empty users are added to the array 2014-03-31 15:45:32 +00:00
Anton Georgiev
727ca898c6 user_joined_event: when received, the user is added to the list of users 2014-03-31 15:43:34 +00:00
firstuser
e36170f2a0 - update build to gradle 1.10 2014-03-29 13:39:03 -07:00
Fred Dixon
6424af41dc Algin calls in bbb-conf to bbb-record-core init.d script 2014-03-29 18:46:16 +00:00
Jesus Federico
1191e8f406 Merge pull request #313 from jfederico/merge-polling-with-master 
Merge polling with master
 2014-03-28 17:32:12 -04:00
Jesus Federico
fd3bac4b31 Merge branch 'master' into merge-polling-with-master 2014-03-28 17:25:47 -04:00
Richard Alam
214957e52c - localize text 2014-03-28 16:02:33 +00:00