BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,135 Commits 13 Branches 260 Tags 1.1 GiB
81ccc65a4a
Commit Graph

2976 Commits

Author SHA1 Message Date
Richard Alam
81ccc65a4a - open create poll window 2013-07-02 15:47:14 +00:00
Richard Alam
2cbd85ce6f - display poll when opening take poll window 2013-07-01 19:11:45 -04:00
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
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
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
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
96819b7d88 - start working on the UI 2013-06-25 20:50:32 +00:00
Richard Alam
2ee386df71 cleanup 2013-06-25 16:11:47 +00:00
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