Commit Graph

7477 Commits

Author SHA1 Message Date
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
Felipe Cecagno
4d49b6f0f4 trying to deal with the webrtc connection failed 2014-04-22 18:13:18 -03:00
Richard Alam
f167a6eddf add comments 2014-04-22 16:15:47 -04: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
a7ee746650 add some comments 2014-04-22 14:52:38 -04:00
Richard Alam
0b40c1a10d more messages 2014-04-19 13:19:40 -07:00
Richard Alam
3ad6df7fe7 - documenting more messages 2014-04-19 13:01:33 -07:00
Richard Alam
92ec595df9 - fix format 2014-04-19 12:55:24 -07:00
Richard Alam
1337de5ed2 - create doc for messages 2014-04-19 12:53:08 -07:00
Richard Alam
c44f4c90a3 - wire up png converter 2014-04-19 09:23:06 -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
78ea46ae35 Merge branch 'upgrade-to-red5-1.0.2-M1' into merge-with-upgrade-red5-branch 2014-04-18 15:58:53 -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
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