Commit Graph

22467 Commits

Author SHA1 Message Date
KDSBrowne
7673adee1b implement live results for poll 2018-10-10 15:52:39 +00:00
KDSBrowne
eefef1c207 remove the need for using findDOMNode() 2018-10-05 13:43:27 +00:00
KDSBrowne
7f2d8138ba replace for loop with range() and map() 2018-10-03 14:39:23 +00:00
KDSBrowne
0f277a66d1 replace if condition in map() with filter() 2018-10-03 11:51:04 +00:00
KDSBrowne
28d46b7ca8 change formatted message id's / replace reduce with map 2018-10-03 03:24:34 +00:00
KDSBrowne
c2e785b8c4 add poll max custom fields to config 2018-10-02 23:59:45 +00:00
KDSBrowne
26404c87f7 remove button color type 'primary-outlined' 2018-10-02 23:08:32 +00:00
KDSBrowne
8c60d03ccc add comment to explain regex 2018-10-02 20:45:41 +00:00
KDSBrowne
b241b93b8a replace indexOf() with includes() 2018-10-02 20:30:32 +00:00
KDSBrowne
b9736e9c08 fix poll results not displaying correctly for presenter 2018-09-28 14:40:53 +00:00
KDSBrowne
e1440de236 fix private chat not working 2018-09-27 16:27:05 +00:00
KDSBrowne
491f841401 prevent user access to poll panel after presenter is lost 2018-09-25 16:54:07 +00:00
KDSBrowne
cf23293e10 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-09-25 12:44:38 +00:00
Anton Georgiev
76180a0580
Merge pull request #6076 from jfsiebel/custom-user-settings
Custom user settings
2018-09-25 08:29:48 -04:00
KDSBrowne
86d48298c6 add ability to publish / stop poll 2018-09-24 22:43:54 +00:00
KDSBrowne
3430321a68 Merge remote-tracking branch 'upstream/master' into start-poll-01 2018-09-23 23:08:24 +00:00
KDSBrowne
8320493e6a add ability to start custom poll 2018-09-23 23:05:13 +00:00
KDSBrowne
f3bd048d56 clean up code / add formatted messages / fix bugs 2018-09-23 22:57:03 +00:00
Richard Alam
a30f1842ae
Merge pull request #6100 from kepstin/bbb-20-rec-fixes
Recording fixes for BBB 2.2
2018-09-21 14:38:40 -04:00
Calvin Walton
7a64756bba RaP: When generating poll image, grab the presentation name correctly.
It was previously trying to get the presentation name from the wrong variable,
which resulted in a nil value (which was treated as a blank string in
filenames). This caused the poll images to not be inside the presentation
subdirectories, and the poll image references in the svg contained a `//`
path, which would break the recording if it was uploaded to e.g. AWS S3.
2018-09-21 14:28:24 -04:00
Richard Alam
75a161adbf
Merge pull request #5207 from riadvice/mobile-no-force-debug
Remove force debug in LoadingScreenMediator
2018-09-21 11:36:21 -04:00
João Francisco Siebel
b832921be2 fix settings list 2018-09-19 17:34:23 -03:00
João Francisco Siebel
bb58a3fde6 let server handle parameters 2018-09-19 17:32:17 -03:00
Anton Georgiev
8c0394f52e
Merge pull request #6085 from oswaldoacauan/fix-missing-stuff-on-meeting-removal
Fix not clearing pods and token when removing a meeting
2018-09-19 14:45:02 -04:00
Anton Georgiev
7ca66965da
Merge pull request #6086 from oswaldoacauan/fix-6012
Fix fuzzy chat font rendering.
2018-09-19 14:40:32 -04:00
Anton Georgiev
8df901e0bf
Merge pull request #6087 from Tainan404/zoom-implementation
Zoom call only for presenter
2018-09-19 14:15:41 -04:00
Tainan Felipe
61c4c62e54 Zoom call only for presenter 2018-09-19 15:13:09 -03:00
Oswaldo Acauan
750f1bc35a Fix fuzzy chat font rendering. Closes #6012 2018-09-19 14:57:39 -03:00
Oswaldo Acauan
1c12b380a2 Fix not clearing pods and token when removing a meeting 2018-09-19 14:48:15 -03:00
Anton Georgiev
fd02b04a2d
Merge pull request #6025 from BobakOftadeh/chat-width-increased-window
Extended the Width of the Chat Area
2018-09-19 13:05:06 -04:00
Bobak Oftadeh
121e47982f Changed chat-width from pixel to precent. 2018-09-19 08:21:14 -07:00
Anton Georgiev
eb275cfc93
Merge pull request #6084 from Tainan404/zoom-implementation
Add hand in setting prod
2018-09-19 11:04:43 -04:00
Tainan Felipe
3bfce89396 change the setting prod 2018-09-19 12:00:49 -03:00
Anton Georgiev
8e81fc46af
Merge pull request #6010 from Tainan404/zoom-implementation
Zoom implementation for HTML5
2018-09-19 10:11:34 -04:00
Tainan Felipe
7d202ada62 Remove comment 2018-09-19 09:55:47 -03:00
Tainan Felipe
24e0fc55cd Remove unused code 2018-09-19 09:09:45 -03:00
Tainan Felipe
2d045b415c Put the hand by default in mobile 2018-09-18 11:16:11 -03:00
Tainan Felipe
210dbbbeaf Merge remote-tracking branch 'upstream/master' into zoom-implementation 2018-09-17 15:20:20 -03:00
Tainan Felipe
ab75ffdddd Add pinch and double-tap zoom 2018-09-17 15:02:52 -03:00
João Francisco Siebel
e750ceb0a1 make a single makeCall in auth 2018-09-17 14:05:39 -03:00
João Francisco Siebel
ebe4b83a10 remove unnecessary comments 2018-09-14 15:01:24 -03:00
João Francisco Siebel
ebad6cf6a4 remove debug 2018-09-14 14:53:29 -03:00
KDSBrowne
226adbe254 make poll menu render 2018-09-14 17:50:18 +00:00
KDSBrowne
589a9eb1fd add btn to toggle poll url 2018-09-14 16:29:19 +00:00
Richard Alam
3a8e4c8f5c
Merge pull request #6075 from ritzalam/update-akka-transcode-build
- try fixing this error
2018-09-13 18:22:03 -04:00
Richard Alam
abf7bfb417 - try fixing this error
/mnt/tmp/bbb-transcode-akka_2.2.0_xenial_m22/build.sbt:134: error: object ServerLoader is not a member of package com.typesafe.sbt.packager.archetypes
serverLoading in Debian := com.typesafe.sbt.packager.archetypes.ServerLoader.Systemd
2018-09-13 15:19:27 -07:00
Richard Alam
bdbd423e7f
Merge pull request #6074 from ritzalam/update-akka-transcode-build
- fix akka-transcode build failing on scalariform
2018-09-13 17:46:42 -04:00
Richard Alam
d1553df373 - fix akka-transcode build failing on scalariform 2018-09-13 14:44:40 -07:00
Calvin Walton
c6674833c7 RaP: Have <p> in presentation format inherit font size
This fixes font scaling in the presentation area, since that relied on
the <p> element inheriting the font size from the svg <g> that it was
inside of.

This was broken with the switch to the Foundation stylesheet base, which
set a fixed font size on the <p> element.
2018-09-13 17:22:25 -04:00
Richard Alam
499d56975f Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2018-09-13 13:11:25 -07:00