Commit Graph

6029 Commits

Author SHA1 Message Date
Richard Alam
0536939bc7 synching up with master
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/maps/PresentEventMap.mxml
2013-06-17 18:32:09 +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
Fred Dixon
70f26a27f2 Minor updates to welcome message 2013-06-16 07:19:32 -07:00
Fred Dixon
81988c2e68 Updated index.html page to read 0.81-beta 2013-06-16 06:59:08 -07: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
Fred Dixon
d05d2df02e Updated release to 0.81-beta 2013-06-15 03:00:45 -07:00
Fred Dixon
4854934faf Added --setsecret and --secret 2013-06-15 02:28:18 -07:00
Fred Dixon
37107430b7 Update API example to use setConfigXML, not setConfigXML.xml 2013-06-15 01:47:41 -07:00
Fred Dixon
5b963b5c58 Added --setsecret 2013-06-14 23:38:19 -07:00
Fred Dixon
e7af666fe9 Fixed https://code.google.com/p/bigbluebutton/issues/detail?id=1557 2013-06-14 22:39:57 -07: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
340c7dabf0 Merge pull request #183 from SenecaCDOT-BigBlueButton/fix-meeting-title
the meeting name is now available inside the meeting
2013-06-14 09:33:03 -07:00
Chad Pilkey
14b79c762d the meeting name is now available inside the meeting 2013-06-14 09:11:12 -07: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
b67c6762bc Merge pull request #182 from fcecagno/disabling-network-monitor
Disabled temporarily the network monitor and the bandwidth measurement
2013-06-13 16:28:59 -07:00
Felipe Cecagno
ae7468f9de disabling temporarily the network monitor and the bandwidth estimation measurement 2013-06-13 20:20:08 -03: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
21d63e08e9 - display pre-uploaded presentation 2013-06-13 19:26:19 +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
Richard Alam
e347942134 - cleanup 2013-06-12 20:21:02 +00:00
Richard Alam
75f4affb25 - modify layout module to not use shared objects for messaging 2013-06-12 19:06:10 +00:00
Richard Alam
2f394650c8 - startup redis pubsub receivers and wire receivers properly 2013-06-12 16:19:41 +00:00
Richard Alam
3230af24c9 Merge branch 'master' into upgrade-to-grails-1.3.9 2013-06-12 14:43:28 +00:00
Richard Alam
4bc4f6ce84 - fix issue where we cannot send message using SO 2013-06-11 22:46:33 -04:00
Fred Dixon
37cecc3259 Removed auto focus from joining demo meeting 2013-06-11 17:51:49 -07:00
Fred Dixon
8080c4c969 Simplifying the default welcome presentation 2013-06-11 16:23:19 -07:00
Richard Alam
341509e817 - remove some dependencies 2013-06-11 22:43:40 +00:00
Richard Alam
0edc415b2e - continue wiring beans 2013-06-11 22:32:43 +00:00
Gustavo Salazar
2483f76ee6 create audio.webm to play it in IE 2013-06-11 17:20:34 -05:00
Gustavo Salazar
e89bb22e9f no need to publish events.xml 2013-06-11 17:02:12 -05:00
Gustavo Salazar
f1cd2f071e publish audio files only if video is not available 2013-06-11 17:00:08 -05:00
Richard Alam
ecff26dbb1 - get it to start 2013-06-11 21:55:38 +00:00
Richard Alam
d6297642ba Merge pull request #181 from SenecaCDOT-BigBlueButton/disable-drawing-when-notpresenter
when you lose presenter you lose the ability to draw
2013-06-11 14:47:54 -07:00
Chad Pilkey
1016e1e29a when you lose presenter you lose the ability to draw 2013-06-11 14:36:31 -07:00
Richard Alam
5e173b931b - fix compile issues 2013-06-11 20:31:29 +00:00
Richard Alam
4b7fc8ffc6 Merge pull request #179 from SenecaCDOT-BigBlueButton/poll-tab
Poll tab
2013-06-11 13:18:05 -07:00
Richard Alam
68ca2b333b Merge pull request #159 from SenecaCDOT-BigBlueButton/access-presenter-alert
Added audio alert; when Presentership is moved to or from a screen-reade...
2013-06-11 13:16:38 -07:00
Richard Alam
d901c70963 Merge pull request #180 from SenecaCDOT-BigBlueButton/disable-private-chat
improved disabling private chat so that the whole tab doesn't disappear
2013-06-11 13:15:10 -07:00
Richard Alam
6e53c9496f Merge pull request #178 from SenecaCDOT-BigBlueButton/add-meeting-title
Add meeting title
2013-06-11 13:14:54 -07:00