Commit Graph

6207 Commits

Author SHA1 Message Date
Richard Alam
9f0c185215 Merge branch 'make-users-user-conn-invoke' of github.com:bigbluebutton/bigbluebutton into make-users-user-conn-invoke
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/DisplayResultWindow.mxml
2013-06-29 21:55:28 -07:00
Richard Alam
0b16f969ee open take poll window 2013-06-29 21:53:17 -07:00
Markos Calderon
f74b69a5c0 Merge branch 'make-users-user-conn-invoke' of https://github.com/bigbluebutton/bigbluebutton into make-users-user-conn-invoke
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/DisplayResultPieChartPanel.mxml
2013-06-28 22:47:37 -05:00
Markos Calderon
b87440525e Adding bar chart 2013-06-28 22:45:41 -05:00
Richard Alam
4002b3d2d1 - cleanup 2013-06-28 18:46:43 -07:00
Richard Alam
8c32601c40 - display result in pie chart 2013-06-28 18:43:26 -07:00
Richard Alam
8c656f0a2d Merge pull request #193 from SenecaCDOT-BigBlueButton/fix-whiteboard-marks
fixed the ghost whiteboard objects
2013-06-28 14:55:57 -07:00
Richard Alam
20435e2cc4 - try to display results 2013-06-28 18:44:43 +00:00
Richard Alam
595fbaecf9 - hook up display results and update window 2013-06-28 18:35:50 +00:00
Richard Alam
bb4de5a889 open display result window 2013-06-28 18:00:09 +00:00
Richard Alam
ee3af50c08 cleanup and wrap pie chart result in window
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/polling/managers/PollingWindowManager.as
2013-06-28 17:44:39 +00:00
Richard Alam
8611986597 open main poll window 2013-06-28 16:38:29 +00:00
Markos Calderon
b91621f72b Merge branch 'make-users-user-conn-invoke' of https://github.com/bigbluebutton/bigbluebutton into make-users-user-conn-invoke
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/polling/managers/PollingWindowManager.as
2013-06-28 10:41:23 -05:00
Markos Calderon
c65313347d polling charts 2013-06-28 10:38:51 -05:00
Richard Alam
1815c7ea71 - implement updating of poll UI 2013-06-27 22:07:36 +00:00
Richard Alam
4d37da1ff2 Merge pull request #194 from SenecaCDOT-BigBlueButton/expose-room-mute-state
added a room mute indicator to the users window
2013-06-27 14:23:51 -07:00
Chad Pilkey
b930bb30cb added a room mute indicator to the users window 2013-06-27 13:57:06 -07:00
Richard Alam
c91ca88b59 collect responses to questions 2013-06-27 20:22:47 +00:00
Richard Alam
40db605fee - implement take poll UI and handle responses 2013-06-27 20:12:05 +00:00
Richard Alam
5e76338f89 - start implementing UI for taking a poll 2013-06-27 16:10:24 +00:00
Chad Pilkey
6ba928924f fixed the ghost whiteboard objects 2013-06-26 16:42:16 -07:00
Richard Alam
643952a108 - implement create new poll window UI 2013-06-26 21:39:03 +00:00
Richard Alam
e387bbf122 implement create or select poll UI 2013-06-26 20:45:10 +00:00
Richard Alam
4415a72825 Merge pull request #191 from SenecaCDOT-BigBlueButton/fix-https-links
fixed https chat linking
2013-06-26 10:55:12 -07:00
Richard Alam
19dfb6f884 Merge pull request #190 from SenecaCDOT-BigBlueButton/chat-access-hotfix
Chat access hotfix
2013-06-26 10:54:52 -07:00
Richard Alam
6cbfffea4a Merge pull request #189 from SenecaCDOT-BigBlueButton/modular-hotkeys
Modular hotkeys
2013-06-26 10:54:32 -07:00
Markos Calderon
36bf5c4ceb Merge branch 'make-users-user-conn-invoke' of https://github.com/bigbluebutton/bigbluebutton into make-users-user-conn-invoke 2013-06-25 18:27:15 -05:00
Markos Calderon
5a09b5a6d2 adding a response when server is down 2013-06-25 18:26:49 -05:00
Richard Alam
96819b7d88 - start working on the UI 2013-06-25 20:50:32 +00:00
Chad Pilkey
16aa23e01a fixed https chat linking 2013-06-25 13:19:24 -07:00
jtrobinson
0a8b8cc91f Changed hotkey for Repeat Current Message to the Spacebar. 2013-06-25 12:40:02 -07:00
jtrobinson
55168dc935 Improved 'Repeat Current Message' functionality for repeating the Welcome message before any other navigation happens (an edge case, but an easy one to address) 2013-06-25 12:00:31 -07:00
jtrobinson
a330e1f85b Improved Chat Box navigation logic and initial accessibility description. 2013-06-25 11:32:35 -07:00
Markos Calderon
78074528c8 BBB filter 2013-06-25 13:29:28 -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
jtrobinson
1fecc7130f Localized some special-case strings being used in Shortcut Window. 2013-06-25 07:36:31 -07: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
jtrobinson
306e82406f Changed ChatBox.mxml to use the arrow keys to navigate chat messages. 2013-06-24 13:13:58 -07: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
jtrobinson
7ecb6ab1e7 Moved global hotkey resource array to static member in ShortcutOptions. 2013-06-24 08:30:05 -07:00
jtrobinson
d97102015b Shortcut window correctly displays/hides hotkeys depending on what modules are and are not included. 2013-06-24 07:49:52 -07: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