Commit Graph

10795 Commits

Author SHA1 Message Date
Maxim Khlobystov
88fb41263e Modified the UI styling to start using CSS pixels + separated phone, tablet and desktop views. 2015-08-20 15:45:26 -04:00
Maxim Khlobystov
8b06d43aec Fixed the mechanism of toggling the chat bar and made sure user is unable to resize the whiteboard when the chat is closed. 2015-08-19 12:47:00 -04:00
Maxim Khlobystov
f5fe166b50 Styling for the side menus. 2015-08-18 20:02:00 -04:00
Maxim Khlobystov
9fb02eae05 Made sure all the side menu elements are clickable. 2015-08-18 19:35:14 -04:00
Maxim Khlobystov
e98c96bd8b Fixed the issue of not being able to toggle userlist in landscape mode on mobile devices. 2015-08-18 18:09:24 -04:00
Maxim Khlobystov
3b73497bea Added phone/tablet detection, made the navbars look bigger on a mobile phone in landscape orientation. 2015-08-18 15:01:49 -04:00
Maxim Khlobystov
6d0808c93b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-mobile-view 2015-08-17 17:25:20 -04:00
Chad Pilkey
78e71785c6 Merge pull request #2723 from capilkey/fix-pollresultmodal-dottimer
fixed a null pointer issue with PollResultsModal dotTimer
2015-08-14 19:10:35 -04:00
Chad Pilkey
b851428443 fixed a null pointer issue with PollResultsModal dotTimer 2015-08-14 18:58:44 -04:00
Richard Alam
88963ee103 Merge pull request #2722 from capilkey/make-modal-more-alive
Improvements to PollResultsModal
2015-08-13 18:31:56 -04:00
Chad Pilkey
3c80e1fd6b listen for the PollStoppedEvent in PollResultsModal 2015-08-13 18:20:13 -04:00
Fred Dixon
5eb52d683a Merge pull request #2721 from ffdixon/master
Removed uneeded script
2015-08-13 17:33:49 -04:00
Fred Dixon
c99da48041 Removed uneeded script 2015-08-13 17:32:03 -04:00
Chad Pilkey
0dc0b7221c increase the size of the responders label 2015-08-13 17:20:15 -04:00
Chad Pilkey
7125687951 Make it clear that PollingResultsModal is live 2015-08-13 17:19:25 -04:00
Richard Alam
44556e04ee Merge pull request #2720 from ritzalam/fix-quick-poll-npe
- return empty string instead of null to prevent NPE
2015-08-12 13:27:40 -04:00
Richard Alam
bd1cf9183f - return empty string instead of null to prevent NPE 2015-08-12 17:26:06 +00:00
Richard Alam
a8e5dc0931 Merge pull request #758 from bigbluebutton/development
Development
2015-08-11 17:10:36 -04:00
Richard Alam
ca2de434d5 Merge pull request #757 from capilkey/misc-polling-changes
Misc polling changes
2015-08-11 16:39:11 -04:00
Richard Alam
6156cdf9f7 Merge pull request #756 from ritzalam/fix-issue-1966
- fix issue https://code.google.com/p/bigbluebutton/issues/detail?id
2015-08-11 16:38:33 -04:00
Richard Alam
cde602ac9b Merge pull request #755 from kepstin/poll-recording
Add poll result display to the 'presentation' recording format
2015-08-11 16:38:12 -04:00
Chad Pilkey
bfd6e15ad7 moved stuff around in PollResultsModal 2015-08-11 15:35:12 -04:00
Richard Alam
9570a9e765 - fix formatting 2015-08-11 19:24:27 +00:00
Richard Alam
f47344b134 - fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1966 2015-08-11 18:57:40 +00:00
Calvin Walton
e3e0f0ef61 Add poll result display to the 'presentation' recording format
Note that this requires a new dependency be added to the
"bbb-playback-presentation" format; the "gnuplot" package is now
required (it's used to actually generate the chart images)
2015-08-11 14:55:59 -04:00
Richard Alam
700ddecd43 Merge pull request #754 from ritzalam/fix-presentation-delete
- fix issue where deleting presentation doesn't remove the presentat…
2015-08-11 13:25:49 -04:00
Richard Alam
4e4270912b - fix issue where deleting presentation doesn't remove the presentation from file upload window 2015-08-11 17:21:09 +00:00
Chad Pilkey
e063eedab7 quick poll matches true/false, yes/no 2015-08-11 12:55:30 -04:00
Chad Pilkey
6e3ea8dbb0 make sure the poll whiteboard object clears on redraw 2015-08-11 11:58:50 -04:00
Chad Pilkey
08b0ffda1a improved the poll graphic scaling 2015-08-11 11:58:16 -04:00
Fred Dixon
cf55faabda Merge pull request #753 from ffdixon/development
Added check in bbb-conf for version of LibreOffice
2015-08-10 17:39:42 -04:00
Fred Dixon
a38e278e2b Added check in bbb-conf for version of LibreOffice 2015-08-10 17:39:01 -04:00
Richard Alam
9451876c72 Merge pull request #752 from ritzalam/update-to-red5-2015-08-10-snapshot
Update to red5 2015 08 10 snapshot
2015-08-10 17:33:32 -04:00
Richard Alam
cacfbf7e35 - update jar to latest red5 2015-08-10 21:32:00 +00:00
Richard Alam
6070a42985 Merge branch 'development' into prepare-merge-with-latest-red5 2015-08-10 15:36:39 +00:00
Richard Alam
603afafa2d Merge pull request #751 from ritzalam/fix-poll-stopping
- stop poll when presenter change happens while poll is running
2015-08-10 11:31:40 -04:00
Richard Alam
987397250c - stop poll when presenter change happens while poll is running 2015-08-10 15:21:38 +00:00
Richard Alam
cbe948a0d6 Merge pull request #750 from ritzalam/fix-presentation-sync
- presentation sync broke on svg conversion changes
2015-08-10 10:30:46 -04:00
Richard Alam
a2e2ef73cf - presentation sync broke on svg conversion changes 2015-08-10 14:29:14 +00:00
Fred Dixon
e329f195b7 Merge pull request #749 from ffdixon/development
Updated bbb-conf to update URLS for http/https and rtmp/rtmps
2015-08-08 23:27:16 -04:00
Fred Dixon
02dc138689 Updated bbb-conf to update URLS for http/https and rtmp/rtmps 2015-08-08 23:26:09 -04:00
Richard Alam
1efea72d09 Merge pull request #748 from ritzalam/remove-some-printlns
- remove some printlns to lessen noise
2015-08-07 17:42:30 -04:00
Richard Alam
15a368f444 - remove some printlns to lessen noise 2015-08-07 21:37:16 +00:00
Fred Dixon
4c6935a1ca Merge pull request #747 from ffdixon/development
Updated bbb-conf to assign hostname to publishURI parameter in config…
2015-08-07 15:58:57 -04:00
Fred Dixon
b23a6df190 Updated bbb-conf to assign hostname to publishURI parameter in config.xml 2015-08-07 15:56:35 -04:00
Richard Alam
6fa29a4077 Merge branch 'gthacoder-svg-conversion' into development 2015-08-07 19:48:47 +00:00
Richard Alam
3357529104 - update properties file 2015-08-07 19:48:27 +00:00
Richard Alam
bc7aadcd22 - create new bbb-commons jar 2015-08-07 19:46:52 +00:00
Richard Alam
839e7ebf58 Merge branch 'svg-conversion' of https://github.com/gthacoder/bigbluebutton into gthacoder-svg-conversion 2015-08-07 18:28:16 +00:00
Fred Dixon
7d571de04b Merge pull request #745 from capilkey/change-quickpoll-regex
changed quick poll regex to match only one character
2015-08-07 13:16:57 -04:00