Chad Pilkey
|
cb597c6f0b
|
Merge remote-tracking branch 'upstream/development' into poll-client
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
|
2015-06-24 14:39:10 -04:00 |
|
Chad Pilkey
|
16aab6378a
|
first pass at creating buttons for voting
|
2015-06-24 14:17:48 -04:00 |
|
Chad Pilkey
|
46840dd727
|
moved some poll strings to locales
|
2015-06-24 14:17:25 -04:00 |
|
Chad Pilkey
|
67cc2fc651
|
fixed some compiler warnings in PollGraphic
|
2015-06-24 14:11:31 -04:00 |
|
Richard Alam
|
ad84c4e5be
|
Merge pull request #670 from ritzalam/implement-polling-v3
- cleanup of unused polling code
|
2015-06-24 12:04:36 -04:00 |
|
Richard Alam
|
be9becacc1
|
- cleanup of unused polling code
|
2015-06-24 16:02:17 +00:00 |
|
Richard Alam
|
6a54c6e664
|
Merge pull request #669 from ritzalam/implement-polling-v3
Implement polling v3
|
2015-06-24 11:34:22 -04:00 |
|
Richard Alam
|
a0345d23b3
|
- add some way to test polling
|
2015-06-24 15:32:24 +00:00 |
|
Richard Alam
|
6f9fcd87e1
|
- handle poll messages in the client
|
2015-06-24 15:16:36 +00:00 |
|
Pedro Beschorner Marin
|
5a6c3efd7d
|
Better control of reconnection presenter status change
|
2015-06-24 13:33:11 +00:00 |
|
Richard Alam
|
d9295115c8
|
- handle voting, stop, and show result in the client
|
2015-06-23 21:50:38 +00:00 |
|
Pedro Beschorner Marin
|
b1638f3184
|
The welcome message is only sent once
|
2015-06-23 20:42:45 +00:00 |
|
Richard Alam
|
a5645e29af
|
Merge pull request #668 from ritzalam/implement-polling-v3
Implement polling v3
|
2015-06-23 15:37:07 -04:00 |
|
Richard Alam
|
dcfa4ee8fb
|
- cleanup unneded polling events
- process start poll message
|
2015-06-23 19:34:58 +00:00 |
|
Richard Alam
|
da76271e92
|
Merge branch 'development' of https://github.com/bigbluebutton/bigbluebutton into implement-polling-v3
|
2015-06-23 19:30:35 +00:00 |
|
Richard Alam
|
c1aa51b66f
|
Merge pull request #667 from capilkey/poll-client
fixed the poll start button css
|
2015-06-23 15:30:19 -04:00 |
|
Richard Alam
|
d46053d05e
|
- start poll message now sent from client and then back to clients
|
2015-06-23 19:29:09 +00:00 |
|
Pedro Beschorner Marin
|
0ed67e9ecd
|
Refresh public chat history after reconnection
|
2015-06-23 19:19:13 +00:00 |
|
Chad Pilkey
|
628d47968d
|
fixed the poll start button css
|
2015-06-23 15:09:44 -04:00 |
|
Pedro Beschorner Marin
|
fb0bd078c5
|
Refactored video refresh
|
2015-06-23 16:47:54 +00:00 |
|
Richard Alam
|
5d50d5bc2d
|
Merge pull request #666 from capilkey/poll-client
Poll start button and start of publish poll
|
2015-06-23 11:41:52 -04:00 |
|
Chad Pilkey
|
078f9accb9
|
added a poll image to the branding folder
|
2015-06-23 11:34:43 -04:00 |
|
Chad Pilkey
|
49366a5782
|
started on the publish poll client code
|
2015-06-23 11:34:09 -04:00 |
|
Chad Pilkey
|
4d8b14c0b7
|
added a button to start the polls
|
2015-06-23 11:33:07 -04:00 |
|
Pedro Beschorner Marin
|
24eec8a713
|
Refresh video window when reconnecting
|
2015-06-23 14:53:04 +00:00 |
|
Richard Alam
|
84446f93fa
|
Merge pull request #665 from ritzalam/implement-polling-v3
Implement polling v3
|
2015-06-22 17:30:24 -04:00 |
|
Richard Alam
|
acb8a8c89a
|
- implement sending of polling messages thru redis
|
2015-06-22 21:27:44 +00:00 |
|
Richard Alam
|
b8128945f4
|
- add new polling messages
|
2015-06-22 21:13:11 +00:00 |
|
Pedro Beschorner Marin
|
3e6f6c3cd7
|
Resetting presenter status and some cleanup
|
2015-06-22 20:53:34 +00:00 |
|
Richard Alam
|
4df38f47a4
|
Merge pull request #664 from ritzalam/implement-polling-v3
Start implementing redis messages between red5 and bbb-apps
|
2015-06-22 11:36:03 -04:00 |
|
Richard Alam
|
8b84fd92b4
|
- implement redis messages for polling
|
2015-06-19 21:10:25 +00:00 |
|
Richard Alam
|
7c3cfa665f
|
- implement poll message handlers
|
2015-06-19 16:07:21 +00:00 |
|
Richard Alam
|
2e65d9bcec
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into implement-polling-v3
|
2015-06-19 14:30:49 +00:00 |
|
Richard Alam
|
25b99bcef6
|
Merge pull request #662 from gthacoder/meteor-client-sliding-in-on-top
HTML5 client: new sliding menu.
|
2015-06-19 10:26:22 -04:00 |
|
Richard Alam
|
9a30d48a1a
|
Merge pull request #663 from ritzalam/implement-polling-v3
- implement message handlers
|
2015-06-19 10:25:06 -04:00 |
|
Richard Alam
|
35ebeb3bce
|
- try to fix log location
|
2015-06-19 14:24:29 +00:00 |
|
Richard Alam
|
cbce9d61eb
|
- implement message handlers
|
2015-06-18 22:09:08 +00:00 |
|
Maxim Khlobystov
|
e765987170
|
Fixed the issue with the screen not darkening after opening one of the menus while the other one is open.
|
2015-06-18 17:05:18 -04:00 |
|
Maxim Khlobystov
|
21ff2bdffb
|
Removed unused sliding menu code and restructured some event handlers.
|
2015-06-18 16:33:48 -04:00 |
|
Maxim Khlobystov
|
ed83915fc6
|
Made sure the page is never darkened in landscape orientation.
|
2015-06-18 16:22:16 -04:00 |
|
Maxim Khlobystov
|
b5530a6f0e
|
Made the page darker when side menu is open.
|
2015-06-18 16:14:54 -04:00 |
|
Pedro Beschorner Marin
|
809a77468d
|
Added a reconnection timeout
|
2015-06-18 19:13:49 +00:00 |
|
Maxim Khlobystov
|
2a0c002ebc
|
Added animations to the sliding menu.
|
2015-06-18 12:09:17 -07:00 |
|
Richard Alam
|
c72d9a9bd2
|
Merge pull request #661 from capilkey/poll-client
Disabled the sample poll display
|
2015-06-18 14:53:01 -04:00 |
|
Chad Pilkey
|
c668cfdebd
|
disabled the sample poll display
|
2015-06-18 14:50:37 -04:00 |
|
Richard Alam
|
aab372e481
|
Merge pull request #660 from capilkey/poll-client
First pass of poll visualization
|
2015-06-18 14:30:55 -04:00 |
|
Chad Pilkey
|
da9bb8b4a1
|
added license information to new poll files
|
2015-06-18 12:55:59 -04:00 |
|
Chad Pilkey
|
d1ed8158eb
|
the example poll now starts in the bottom right and the sizing is more accurate
|
2015-06-18 12:53:11 -04:00 |
|
Chad Pilkey
|
9e4e6c107b
|
The resizable poll graphic now moves smoothly
|
2015-06-18 12:51:02 -04:00 |
|
Chad Pilkey
|
5bde72ada8
|
The poll visualization scales smoothly now
|
2015-06-18 12:49:07 -04:00 |
|