Commit Graph

2953 Commits

Author SHA1 Message Date
Richard Alam
da30ea9e1b - send poll messages from server to client 2013-06-25 15:33:23 +00:00
Richard Alam
ba9c36c425 - receive and process poll messages 2013-06-24 21:13:53 +00: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
3fef969f56 write some tests 2013-06-21 19:52:53 +00:00
Richard Alam
3051b66072 Merge branch 'master' into make-users-user-conn-invoke
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationRoom.java
2013-06-21 17:42:09 +00:00
Chad Pilkey
390630d269 Merge pull request #152 from SenecaCDOT-BigBlueButton/global-hotkey-focus-fix
Global hotkey focus fix
2013-06-21 07:56:46 -07:00
jtrobinson
747a6be5c0 Timer removed until a more effective notification procedure is developed. 2013-06-21 07:53:43 -07: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
a2748cb307 - implement sending of create poll message to server 2013-06-19 21:16:03 +00:00
Richard Alam
5e749d9dca - add more polling models
- upgrade minimum Flash player version to 11.2
2013-06-19 19:49:02 +00:00
Richard Alam
8b16f42dc2 - cleanup formatting 2013-06-19 18:36:51 +00:00
Richard Alam
e4606d0a47 - start implementing receiving of messages from server for polling 2013-06-19 18:36:21 +00:00
Richard Alam
2eca78d600 Merge pull request #185 from SenecaCDOT-BigBlueButton/poll-hotkeys-64
Poll hotkeys
2013-06-18 08:40:36 -07:00
jtrobinson
cc3e376c6d Added local hotkeys back into Voting window. 2013-06-18 07:53:42 -07:00
jtrobinson
70e5639483 Added local hotkeys to Polling Stats window 2013-06-18 06:52:01 -07:00
jtrobinson
65f06c07ec Fixed local hotkeys in Instructions window. 2013-06-17 12:03:52 -07:00
jtrobinson
d2d8c58f77 Found the culprit: Missing handlers in the Event Map. 2013-06-17 11:52:36 -07:00
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
jtrobinson
aa3db37692 More hotkeys code. Hotkeys still not quite functional. 2013-06-17 11:26:42 -07: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
Chad Pilkey
14b79c762d the meeting name is now available inside the meeting 2013-06-14 09:11:12 -07:00
jtrobinson
9d7c3e3888 Added necessary code back in to other files. 2013-06-14 08:22:12 -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
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
jtrobinson
e4236a0e39 Added logic to support global Poll Menu hotkey to Poll Event Map and Polling Manager 2013-06-13 11:45:00 -07:00
jtrobinson
c61638a04f Added all locale strings for polling. 2013-06-13 11:14:46 -07:00
jtrobinson
abb9cabfb0 Added hotkeys to Voting window. 2013-06-13 10:45:43 -07:00
jtrobinson
d99c3cbbad Added hotkeys to Poll Statistics window 2013-06-13 10:24:53 -07:00
jtrobinson
e4d110b56f Added hotkeys to Instructions window 2013-06-13 10:03:37 -07:00
jtrobinson
fe7b38efc4 Added polling strings to BigBlueButton.mxml, ShortcutEvent, and Shortcut help window. Also merged upstream/master. 2013-06-13 08:32:32 -07: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
75f4affb25 - modify layout module to not use shared objects for messaging 2013-06-12 19:06:10 +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
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
Chad Pilkey
f61482a987 improved disabling private chat so that the whole tab doesn't disappear 2013-06-11 12:40:36 -07:00
Richard Alam
fb23b44e03 - add JS API to querly list of presentations, display a presentation, and delete a presentation 2013-06-11 18:19:35 +00:00
jtrobinson
eb4897af46 Updated Voting Window. 2013-06-11 10:36:11 -07:00
jtrobinson
1f3e59f914 Removed some code from PollingWindowManager that was interfering with proper tab order. 2013-06-11 08:53:42 -07:00
jtrobinson
d8bb373924 Updated Polling Statistics window 2013-06-11 07:30:35 -07:00
Chad Pilkey
16fbdd9ab5 added config.xml property to control showing the meeting name in the toolbar 2013-06-10 15:08:30 -07:00