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

997 Commits

Author SHA1 Message Date
Anton Georgiev
63dd66669b switched a few more messages to print instead of dispatching 2014-04-30 17:41:01 +00:00
Richard Alam
75d908625c - setup messaging classes 2014-04-30 15:53:27 +00:00
Richard Alam
6aaf071987 - remove test message 2014-04-28 20:11:26 +00:00
Anton Georgiev
664b882ccb switched all variables to CamelCase 2014-04-28 15:49:22 +00:00
Anton Georgiev
042c1ad937 updating 2014-04-24 18:41:44 +00:00
Anton Georgiev
f207c6fa16 Listener for some participants' events 2014-04-24 18:30:44 +00:00
Anton Georgiev
867c9fdb46 chat messages on channel "bigbluebutton:meeting:anton" are handled in bigbluebutton-apps and appear inside the flash client 2014-04-23 22:35:40 +00:00
Anton Georgiev
fe8d969093 some work on listener for private/public chat messages 2014-04-23 20:54:03 +00:00
Felipe Cecagno
92eac1e988 Merge branch 'global-audio' into merge-global-audio 
Most of the client implementation is going to be rewritten on next commits.
 2014-04-23 16:13:40 -03:00
Richard Alam
f785c06e83 Merge branch 'connect-bbb-apps-html5' of github.com:bigbluebutton/bigbluebutton into connect-bbb-apps-html5 2014-04-22 19:22:23 +00:00
Richard Alam
daf1f662b9 - add some TODO comment 2014-04-22 19:21:57 +00:00
Richard Alam
1337de5ed2 - create doc for messages 2014-04-19 12:53:08 -07:00
Richard Alam
f4de100179 - fix compile problem 2014-04-19 09:22:51 -07:00
Richard Alam
12921b1e24 Merge branch 'connect-bbb-apps-html5' into merge-with-upgrade-red5-branch 2014-04-18 17:21:44 -07:00
Richard Alam
4a428a4c5c - format all messages 2014-04-18 15:08:37 -07:00
Richard Alam
402994cfea - more messages 2014-04-18 13:28:33 -07:00
Richard Alam
4dd173b963 - continue with messages 2014-04-18 10:52:04 -07:00
Richard Alam
125c22c102 - format messages 2014-04-18 10:31:15 -07:00
Richard Alam
69e2cbc303 - slowly transform messages 2014-04-18 09:57:51 -07:00
Richard Alam
f530d45f27 - add more message names 2014-04-18 09:23:40 -07:00
Richard Alam
be9ef0a681 - create message name constants 2014-04-17 19:46:41 -07:00
Richard Alam
08a4650b82 - add more messages 2014-04-17 18:45:44 -07:00
Richard Alam
95614166b0 - format more messages 2014-04-17 18:01:47 -07:00
Richard Alam
c66c252e24 - start to format messages 2014-04-17 17:37:40 -07:00
Richard Alam
25bd559473 - remove some debug logs 2014-04-17 17:50:20 +00:00
Richard Alam
5a95138dd3 Merge branch 'bbb-apps-message-logging' into connect-bbb-apps-html5 2014-04-16 18:36:03 +00:00
Anton Georgiev
c09fa735c4 instead of printing the dispatched messages, we will push them to a list 2014-04-16 17:09:44 +00: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
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
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
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
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
f8d8079f59 - make sure to record the EndAndKickAllEvent 2014-04-04 14:51:14 +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
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
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
Anton Georgiev
83bfd513b7 substituted some of the hard-coded values with values from the msg object 2014-03-24 19:03:34 +00:00
Anton Georgiev
edf31e2724 whiteboad_draw_event message sent and the html5 client handles it. have to modify the channel the message is sent to. in the html5 client performed a check to see if header.name is whiteboard_draw_event and if yes overwrote the channel to bigbluebutton:bridge 2014-03-24 16:14:41 +00:00
Anton Georgiev
65cd93ec1a created a WhiteboardEventRedisPublisher. When I draw in the flash client I get a simple json message in the console of the html5 client 2014-03-21 20:21:20 +00:00
Anton Georgiev
0b5330e0d1 added a chat event listener. Now a simple chat json injected into pubsub will be displayed in the red5 console and will go through the listener "ChatMessageListener.java" 2014-03-21 17:59:54 +00:00
Richard Alam
102cd186d7 - hook up whiteboard recorder 2014-03-12 19:43:39 +00:00
Richard Alam
e5eb48a90f - fix recording 2014-03-12 18:37:11 +00:00
Richard Alam
d89459f938 - formatting cleanup 2014-03-11 17:58:26 -04:00
Richard Alam
31926bd26d - implement end and destroy meeting 2014-03-10 21:38:03 +00:00
Richard Alam
86abffc79b - add timer to check meeting duration 2014-03-09 14:41:24 -04:00
Richard Alam
6ec6553534 - send end meeting message from bbb-web 2014-03-09 00:05:43 -05: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
50f1b272f1 - continue making changes to whiteboard 2014-03-05 22:20:34 +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
bc5f60923c - figure out why we can't get to the next page 2014-03-03 21:41:18 +00:00
Richard Alam
89e2f6363a - display presentation page 2014-03-03 18:39:04 +00:00
Richard Alam
10b4b6ee3a - fix compile issues 2014-02-28 19:26:58 +00:00
Richard Alam
d15e8c3a5b - continue cleaning up presentation 2014-02-27 21:41:25 +00:00
Richard Alam
feb49951a5 - add presentation ids to presentation conversion 2014-02-27 17:23:44 +00:00
Richard Alam
dcfe856f46 - fix issue where users show up as joined voice when a client loads 2014-02-24 19:24:23 +00:00
Richard Alam
8a2990284e - cleanup and formatting 2014-02-21 20:02:54 +00:00
Richard Alam
4fc48da1b2 - change user joining sequence 2014-02-20 21:39:29 +00:00
Richard Alam
02e3e8cbc3 - set up flow for validating auth token when user joins 2014-02-20 18:01:55 +00:00
Richard Alam
6159029711 - cleanup 2014-02-19 21:54:15 +00:00
Richard Alam
e05d310908 - removing dependency on FS userid to manage voice for each user 2014-02-19 19:23:17 +00:00
Richard Alam
ae36cb7997 - try to fix why we can't handle user leaving voice 2014-02-18 19:07:07 -05:00
Richard Alam
f4ac082d06 - add userid in mute and talking message 2014-02-14 17:06:13 -05:00
Richard Alam
67b591001a - move users model 2014-02-14 15:42:20 -05:00
Richard Alam
57ec10a241 - more clean up 2014-02-13 21:13:34 +00:00
Richard Alam
2ba79f49a0 - more cleanup of unused code 2014-02-13 20:35:42 +00:00
Richard Alam
dec6ad2ee2 - remove polling and whiteboard unused code 2014-02-13 19:59:52 +00:00
Richard Alam
5caa551a05 - implement start/stop voice recording 2014-02-13 19:05:32 +00:00
Richard Alam
06cc0127aa - fix recording of events 2014-02-13 18:25:17 +00:00
Richard Alam
0bd25997a9 - implement start/stop recording. 
- TODO: alert doesn't popup when clicking on the record button
 2014-02-12 18:25:28 -05:00
Richard Alam
6cef7ecdac - fix share webcam 2014-02-12 15:27:10 -05:00
Richard Alam
d967f86750 - fix get users reply message 2014-02-12 12:33:28 -05:00
Richard Alam
9325aeb7aa - fix issue where we are not getting events from FS 2014-02-12 10:30:46 -05:00
Richard Alam
0f59af0aad - fix voice users commands and events 
- TODO: figure out why we are not receiving mute/talk events from FS ESL
 2014-02-11 22:45:24 -05:00
Richard Alam
f071e65235 - finally! got presentation to work...needs some cleanup 2014-02-11 14:52:13 -05:00
Richard Alam
e30ef32867 - now sending correct messages to client 2014-02-11 13:33:14 -05:00
Richard Alam
dcd5e0e8ec - modify how we store whiteboard shapes as latecomers are not getting any shapes for the current page 2014-02-10 23:00:01 +00:00
Richard Alam
858f1fef88 - try to figure out why whiteboard history isn't working 2014-02-10 21:48:24 +00:00
Richard Alam
5552583bbe - fix typo as it's driving CHad nuts :) 2014-02-10 21:21:15 +00:00
Richard Alam
1f080c78e0 - now late comers can display current presentation page 2014-02-10 19:39:05 +00:00
Richard Alam
03d4b05217 - continue fixing presentation. Looks like it synchs. Need to fix why 
current page of presentation doesn't display for late comer.
 2014-02-09 15:51:05 -05:00
Richard Alam
0993a06af3 - fix issue where in goto page, the previous page is still marked as current page 2014-02-09 15:17:42 -05:00
Richard Alam
d4b02df765 - fix go to slide message 2014-02-08 19:51:46 -05:00
Richard Alam
f12ec75377 - slowly making presentation work again 2014-02-08 17:56:13 -05:00
Richard Alam
aa8f68076f - try to figure out logging 
- send presentation messages as JSON
 2014-02-08 15:29:12 -05:00
Richard Alam
ff333b9232 - handle get presentation info message 2014-02-08 14:20:05 -05:00
Richard Alam
9fa2ca2e38 - fix presentation conversion message 2014-02-07 22:35:52 -05:00
Richard Alam
1c5c3cbdf3 - try to fix presentation messages 2014-02-07 17:23:11 -05:00
Richard Alam
cf321098ac - try to get presentation working again 2014-02-07 14:14:28 -05:00
Richard Alam
307e9856c4 - breakdonw presentation messages into spearate messages 2014-02-07 09:10:14 -05:00
Richard Alam
f70d82f1ca - fix message handling issue 2014-02-06 16:17:40 -05:00
Richard Alam
06d03298c4 - wire app voice conference service 2014-02-06 15:00:31 -05:00
Richard Alam
c2bda20c82 - implement handling of FS ESL messages 2014-01-17 16:25:14 -05:00
Richard Alam
5037c4472c - propagate voice user join event 2014-01-17 04:13:45 -05:00
Richard Alam
8a74d3a41a - fix compile issues 2014-01-16 23:19:23 -05:00
Richard Alam
973237f6ca - fix compile issue 2014-01-16 18:40:05 -05:00
Richard Alam
5b583368ff - fix some compile errors 2014-01-16 17:12:15 -05:00
Richard Alam
baa735dbc9 - refactor how we process voice commands and events 2014-02-03 22:55:39 +00:00
Richard Alam
579b10b96b - start simplifying integration with FreeSWITCH 2014-01-31 22:43:31 +00:00
Richard Alam
b209dad293 Merge branch 'merge-master-with-new-polling-feature-branch' into merge-polling-with-master 
Conflicts:
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/lock/LockService.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/ParticipantsService.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonGateway.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/User.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
 2014-01-31 20:07:55 +00:00
Richard Alam
d8f1c2eabb - cleanup 2014-01-31 16:33:30 +00:00
Richard Alam
6f502672be - make bbb-apps start again 
- add configgy logging to bbb-apps
 2014-01-31 16:21:49 +00:00
Richard Alam
11d935a4fe - try to implement lock settings feature 2014-01-30 22:29:32 +00:00
Richard Alam
c9f7996128 Merge branch 'master' into merge-master-with-new-polling-feature-branch 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.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/RoomsManager.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/ParticipantsService.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	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/modules/present/ui/views/SlideView.mxml
 2014-01-30 16:50:09 +00:00
Richard Alam
18b352a2a2 - try to compile 2014-01-29 19:50:41 +00:00
Richard Alam
f251892cab - fix compile errors 2014-01-28 22:01:45 +00:00
Richard Alam
29e94500c4 Merge branch 'refactor-voice-users' into merge-polling-with-master 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/red5/voice/ClientManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/ConferenceService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserJoinedEvent.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomImp.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomManager.java
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
 2014-01-28 21:12:01 +00:00
Richard Alam
5559a2b8cc Merge branch 'master' into merge-polling-with-master 
- there are compile issues we need to fix

Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.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/RoomsManager.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/ParticipantsService.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	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/modules/present/ui/views/SlideView.mxml
 2014-01-23 20:49:04 +00:00
Felipe Cecagno
3070127a8e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
 2014-01-15 17:53:10 -02:00
Tiago Daniel Jacobs
8c912df459 Implemented lock settings in bbb-client and bbb-apps. 2014-01-09 03:52:03 -02:00
mohamed-ahmed
129ab9f5ca fixed it so that shapes won't be erased when changing slides 2013-10-29 14:47:26 +00:00
Richard Alam
e54f942d5a - continue refactoring voice app 2013-10-17 20:47:53 +00:00
Richard Alam
2e44fa1313 - handle voice user messages 2013-10-16 22:02:38 +00:00
Richard Alam
025454ebbe - get unlocked users 2013-10-16 21:25:53 +00:00
Richard Alam
00b8ed2206 - add tests for users 2013-10-16 18:28:43 +00:00
Richard Alam
5f3aaee6c8 - clean up 2013-10-15 21:53:21 +00:00
Richard Alam
c55291b98d - add some tests 2013-10-15 21:37:06 +00:00
Richard Alam
57e823b759 - make it compile 2013-10-15 19:04:45 +00:00
Richard Alam
d0e006d8c4 - continue making change 2013-10-10 15:25:06 +00:00
Richard Alam
626406c760 - renaming a bunch of stuff 2013-10-09 22:03:00 +00:00
Richard Alam
7c12cf47aa - voice refactoring is compiling successfully 2013-10-09 19:54:27 +00:00
Richard Alam
69feca2a07 - continue making changes to voice app 2013-10-08 21:47:49 +00:00
Richard Alam
35833418a1 - start refactorign voice app 2013-10-04 21:53:41 +00:00
Richard Alam
7a4285c20b - implement recorder 2013-10-04 19:31:12 +00:00
Richard Alam
290785e784 - clean up 2013-10-04 19:30:55 +00:00
Richard Alam
ea2f3a1bf2 - refactor recording for whiteboard 2013-10-04 19:21:45 +00:00
Richard Alam
33fa967e7d - continue refactoring whiteboard...works mostly now...except undo and recording 2013-10-04 18:02:19 +00:00
Richard Alam
22b0aa1579 - continue refactoring whiteboard 2013-10-03 17:08:53 +00:00
Richard Alam
d0d790c282 - continue refactoring whiteboard 2013-10-02 21:05:22 +00:00
Richard Alam
ad7baa983e - start making chnages to whiteboard 2013-10-02 15:27:13 +00:00
Richard Alam
15b0d4e8a6 - start refactoring whiteboard 2013-10-01 21:01:10 +00:00
Richard Alam
9f036f5e97 - refactoring chat application to use messaging 2013-10-01 19:32:22 +00:00
Richard Alam
65f59a0219 - cleanup 2013-09-30 21:25:24 +00:00
Richard Alam
a88898215f - start refactoring layout application 2013-09-30 21:13:20 +00:00
Richard Alam
bad2631de7 - add gradle properties file to externalize version numbers 2013-09-30 18:09:21 +00:00
Richard Alam
78be69ecc8 - add spring rabbit, integrations, data-redis dependencies 2013-09-30 18:08:40 +00:00
Richard Alam
d8ae699a36 - update gradle build 2013-09-27 17:43:32 +00:00
Felipe Cecagno
bce20f4112 fixed the issue commented on the previous commit, about losing the recording flag when the last participant leaves the room 2013-09-25 01:27:32 -03:00
Felipe Cecagno
33d98bbff2 implemented the record button both client-side and server-side; still needs more work on the processing scripts; still needs to update the record button icons 2013-09-23 18:33:30 -03:00
mohamed-ahmed
2a1d2f7525 simplified a function 2013-09-20 19:15:15 +00:00
Richard Alam
a939588df8 - upgrade to gradle 1.7 
STEPS
cd ~/dev/tools
wget http://services.gradle.org/distributions/gradle-1.7-bin.zip
unzip gradle-1.7-bin.zip
ln -s gradle-1.7 gradle
vi ~/.profile

export GRADLE_HOME=$HOME/dev/tools/gradle
export PATH=$PATH:$GRADLE_HOME/bin

source ~/.profile
 2013-09-17 18:10:52 +00:00
mohamed-ahmed
58ab406e12 html5 client now handles the zoom event I created 2013-09-16 15:45:58 +00:00
Richard Alam
9dcdedcf55 - fix issue where question is displayed as multiple choice when it's supposed to be multi-select 2013-09-13 18:24:14 +00:00
Richard Alam
8ac1beb606 - add show and hide poll result messages 2013-09-12 18:13:49 +00:00
Richard Alam
090f7e44d0 - automatically share presentation when completing conversion. This is a workaround where there is a race 
condition between creating the meeting and processing pre-uploaded presentations.
 2013-09-12 15:46:12 +00:00
mohamed-ahmed
7a50b35873 added 'move_and_zoom' event to pubsub 2013-09-10 20:54:49 +00:00
mohamed-ahmed
df5721ecae ellipse tool can now draw prefect circle in html5 client 2013-08-27 21:30:54 +00:00
jent46
614fad9aae Merge remote branch 'downstream/html5-bridge' into html5-bridge 2013-08-13 16:12:41 -07:00
Gary Deng
ebe17628f5 send undo and clrPaper events to html5-client, and enable html5-client to see square while Ctrl keypressed 2013-08-01 08:10:59 -07:00
Jorge Nunez
5b1d62f5d2 Merge remote branch 'upstream/master' into html5-bridge 
Conflicts:
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2013-07-31 17:27:33 -07:00
Markos Calderon
f019e0065d fix presentation preupload 2013-07-22 12:23:44 -05:00
Markos Calderon
d246af64cb fix for presenter icon 2013-07-17 15:57:17 -05:00
Richard Alam
ef7c97d848 - publish poll events 2013-07-11 20:56:03 +00:00
Richard Alam
34a9875766 - enable webhooks 2013-07-11 19:20:11 +00:00
Richard Alam
30ac4dba25 - minor cleanup 2013-07-10 22:00:28 +00:00
Richard Alam
14d3b615bc - handle prescreated polls and display them in client 2013-07-10 20:56:32 +00:00
Richard Alam
c6611f6f4e - have bbb-web send create/destroy meeting to red5 2013-07-09 20:52:57 +00:00
Richard Alam
23dc0b0f54 - store if poll has started and stopped 2013-07-09 17:26:56 +00:00
Hugo Lazzari
46522fc943 Begin the global-audio with bbb 0.81 2013-07-08 10:55:53 -03:00
Markos Calderon
d26265b71a use a different event 2013-07-05 16:11:26 -05:00
Richard Alam
2987659a2a - cleanup 2013-07-05 08:40:04 -04:00
Richard Alam
319dd82832 - handle user leaving from meeting 2013-07-05 08:38:54 -04:00
Richard Alam
4bb112daf2 - bunch of cleanup 
- handle start and stop poll events
 2013-07-05 05:33:21 -04:00
Markos Calderon
d08fef0c2d Merge branch 'make-users-user-conn-invoke' of https://github.com/bigbluebutton/bigbluebutton into make-users-user-conn-invoke 2013-07-04 18:26:23 -05:00
Markos Calderon
5e6cfb73ea fixing bugs in sending messages to bbb-web 2013-07-04 18:26:13 -05:00
Richard Alam
526f6d69a6 - implement taking poll 2013-07-04 20:49:23 +00:00
Richard Alam
4324655bc3 - add methods to get moderators and viewers 2013-07-04 18:00:51 +00:00
Richard Alam
ed1766d7e6 - change how we append to array 2013-07-04 16:26:21 +00:00
Richard Alam
04a1fd3d85 Merge branch 'make-users-user-conn-invoke' of github.com:bigbluebutton/bigbluebutton into make-users-user-conn-invoke 2013-07-04 16:19:56 +00:00
Richard Alam
fadf54c558 - modify so that users model is in own class 2013-07-04 16:19:24 +00:00
Markos Calderon
870ac75ceb Added remaining record events for polling module 2013-07-03 19:15:34 -05:00
Richard Alam
0d7aa1dbe6 - handle taking poll response 2013-07-03 21:49:52 +00:00
Richard Alam
6dd2dc0a26 - fix show poll result 2013-07-03 19:14:14 +00:00
Richard Alam
4460612462 - fix update poll 2013-07-03 18:38:06 +00:00
Richard Alam
2d21f6730a Merge branch 'make-users-user-conn-invoke' of github.com:bigbluebutton/bigbluebutton into make-users-user-conn-invoke 2013-07-03 15:50:41 +00:00
Richard Alam
1b2534ee30 - implement remove poll 2013-07-03 15:50:18 +00:00
Markos Calderon
136f332f21 Merge branch 'make-users-user-conn-invoke' of https://github.com/bigbluebutton/bigbluebutton into make-users-user-conn-invoke 2013-07-02 18:51:09 -05:00
Markos Calderon
8199113dfd store poll created 2013-07-02 18:50:57 -05:00
Richard Alam
8ecbc79ec0 - implement get polls from server 2013-07-02 21:18:36 +00:00
Richard Alam
96819b7d88 - start working on the UI 2013-06-25 20:50:32 +00:00
Markos Calderon
6c1123fd11 user leave now uses the html5 bridge 2013-06-25 14:29:06 -05:00
Richard Alam
2ee386df71 cleanup 2013-06-25 16:11:47 +00:00
Richard Alam
54c977a0b4 fix synching issue 2013-06-25 16:11:11 +00:00
Richard Alam
d55e114936 Merge branch 'make-users-user-conn-invoke' of github.com:bigbluebutton/bigbluebutton into make-users-user-conn-invoke 2013-06-25 15:33:51 +00:00
Richard Alam
da30ea9e1b - send poll messages from server to client 2013-06-25 15:33:23 +00:00
Markos Calderon
84a4bf5893 Merge branch 'make-users-user-conn-invoke' of https://github.com/bigbluebutton/bigbluebutton into make-users-user-conn-invoke 
Conflicts:
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
 2013-06-24 17:35:16 -05:00
Markos Calderon
f520bef467 mark bbb-apss down if server doesn't respond back 2013-06-24 17:33:39 -05:00
Richard Alam
ba9c36c425 - receive and process poll messages 2013-06-24 21:13:53 +00:00
Richard Alam
edcb307cc8 - clean up and simply structure 2013-06-24 18:01:12 +00:00
Richard Alam
ce55210ac5 write some tests for the PollModel 2013-06-24 16:32:11 +00:00
Markos Calderon
451f6a6250 Merge branch 'make-users-user-conn-invoke' of https://github.com/bigbluebutton/bigbluebutton into make-users-user-conn-invoke 2013-06-21 20:38:34 -05:00
Markos Calderon
b327e16e56 sending and handling keepalive messages 2013-06-21 20:38:14 -05:00
Richard Alam
4e0d5c7751 send and receive poll response message 2013-06-21 22:52:34 +00:00
Richard Alam
2da1f7030d - send polling message from client and receive on server 2013-06-21 22:08:08 +00:00
Richard Alam
886534cd32 cleanup 2013-06-21 20:21:31 +00:00
Richard Alam
3fef969f56 write some tests 2013-06-21 19:52:53 +00:00
Richard Alam
e9e20d54d8 - fix unit test 2013-06-21 16:37:39 +00:00
Richard Alam
c82689cbb7 - handle polling message from flash client 
- write unit test for conversion of messages
 2013-06-21 15:37:52 +00:00
Richard Alam
9c4a629a8c - recieve create poll message on server 2013-06-20 20:55:58 +00:00
Richard Alam
f741e677d3 - create poll 2013-06-20 20:40:14 +00:00
Richard Alam
07ba395c27 fix switch presenter 2013-06-20 17:55:41 +00:00
Richard Alam
bc82800f03 - handle pre-uploaded presentation 2013-06-20 15:28:42 +00:00
Markos Calderon
c7db3b220b Merge branch 'make-users-user-conn-invoke' of https://github.com/bigbluebutton/bigbluebutton into make-users-user-conn-invoke 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
 2013-06-19 20:00:35 -05:00
Markos Calderon
288a3872fc adding some configurations in spring 2013-06-19 19:59:25 -05:00
Richard Alam
6d17310990 - try to figure out why pre-uploaded slides are not showing up 2013-06-19 22:05:00 +00:00
Richard Alam
a2748cb307 - implement sending of create poll message to server 2013-06-19 21:16:03 +00:00
Markos Calderon
7e06dc75e3 Implementing keepAliveMessage 2013-06-19 10:27:23 -05:00
Richard Alam
a5824295b5 - send get polls reply 2013-06-18 15:45:34 -04:00
Richard Alam
335a1cd115 - setup up red5 sender to Flash client 2013-06-18 13:20:14 -04:00
Richard Alam
d9ffa1ce20 - implement sending of polling messages 2013-06-18 12:30:10 -04:00
Richard Alam
adabc39197 - implement some polling logic 2013-06-18 11:39:04 -04:00
Richard Alam
c4abeb827f - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1558 2013-06-18 10:47:30 -04:00
Richard Alam
ec3f714c95 add keep alive message between bbb-web and bbb-apps 2013-06-17 21:59:32 +00:00
Richard Alam
0c9fb34243 start implementing logic for polling 2013-06-17 21:51:49 +00:00
Richard Alam
ff13395782 - do a bunch of cleanup of unnecessary code 2013-06-17 16:12:40 +00:00
Richard Alam
753a728098 - modify presentation bbb-app 2013-06-16 15:20:54 -04:00
Richard Alam
e0c012fb7a - swithover presentation 2013-06-15 17:13:09 -04:00
Richard Alam
17fc410f63 - change var to val 2013-06-15 15:33:56 -04:00
Richard Alam
698b4c8e5f - fix compile problem 2013-06-15 15:02:32 -04:00
Richard Alam
d3c469dd3e - save events 2013-06-14 22:47:22 +00:00
Richard Alam
ae15589425 - fix swithc presenter 2013-06-14 22:28:54 +00:00
Richard Alam
09ffd2a89b - send user events to flash 2013-06-14 22:16:20 +00:00
Richard Alam
c33cb4d56b - try sending user reply message 2013-06-14 20:33:25 +00:00
Richard Alam
3bc1beeca1 - cleanup 2013-06-14 16:11:03 +00:00
Richard Alam
e69582ab41 - refactor how we send messages 2013-06-14 16:00:02 +00:00
Richard Alam
bb533a4eb3 - set up outgoing messages 2013-06-13 23:12:06 +00:00
Richard Alam
c9b15f8f84 - reorganiz messages 2013-06-13 22:32:42 +00:00
Richard Alam
1f4e14fa7a - handle pre uploaded presentations 2013-06-13 19:00:24 +00:00
Richard Alam
936e81bdd8 - try to fix presentation 2013-06-13 14:11:06 +00:00
Richard Alam
c2d24a8d38 - continue refactoring presentation 2013-06-13 00:49:52 +00:00
Richard Alam
6db900f3d6 - reafactor presentation 2013-06-12 23:52:55 +00:00