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

6140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markos Calderon
136f332f21 Merge branch 'make-users-user-conn-invoke' of https://github.com/bigbluebutton/bigbluebutton into make-users-user-conn-invoke 2013-07-02 18:51:09 -05:00
Markos Calderon
8199113dfd store poll created 2013-07-02 18:50:57 -05:00
Richard Alam
8ecbc79ec0 - implement get polls from server 2013-07-02 21:18:36 +00:00
Richard Alam
2f68693023 - send create poll request to server 2013-07-02 16:08:53 +00:00
Richard Alam
92e6c941c1 - display bar chart 2013-07-02 15:56:56 +00:00
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
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
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
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
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
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
Richard Alam
2da1f7030d - send polling message from client and receive on server 2013-06-21 22:08:08 +00:00
Richard Alam
886534cd32 cleanup 2013-06-21 20:21:31 +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
Richard Alam
e9e20d54d8 - fix unit test 2013-06-21 16:37:39 +00:00
Richard Alam
c82689cbb7 - handle polling message from flash client 
- write unit test for conversion of messages
 2013-06-21 15:37:52 +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
Chad Pilkey
58e6ecbee1 Merge pull request #187 from SenecaCDOT-BigBlueButton/notification-hotfix 
Timer removed until a more effective notification procedure is developed...
 2013-06-21 07:55:36 -07:00