Commit Graph

22510 Commits

Author SHA1 Message Date
KDSBrowne
5c62507f0e prevent offline users being displayed in live results 2018-10-25 17:20:32 +00:00
KDSBrowne
defaea03fd add sound notification when poll starts 2018-10-16 22:07:42 +00:00
KDSBrowne
7b0498eb1a use - as symbol for users who have not responded to poll 2018-10-16 17:31:41 +00:00
KDSBrowne
51e14946db fix live results not being reset 2018-10-16 17:22:12 +00:00
KDSBrowne
cb6e988134 add missing items from setting.yml after merge 2018-10-16 15:25:45 +00:00
KDSBrowne
45eeb1d400 Merge remote-tracking branch 'Upstream/master' into start-poll-01 2018-10-16 15:19:24 +00:00
KDSBrowne
dcd6e5dbf9 add propTypes to poll and live-result components 2018-10-15 19:58:07 +00:00
Maxim Khlobystov
197a36a3bb
Merge pull request #6140 from jfsiebel/handle-system-messages
Handle system messages in public chat
2018-10-15 15:33:41 -04:00
KDSBrowne
6c377b97bf add formatted strings 2018-10-15 19:05:50 +00:00
KDSBrowne
262038520b improve styling / fix bugs 2018-10-15 14:36:26 +00:00
Fred Dixon
c52663bb3f
Merge pull request #6155 from jfederico/recording-ready-update
Updates for backward compatibility to recording-ready-callback script
2018-10-13 18:57:06 -04:00
Fred Dixon
7ccdf1fdae
Merge pull request #6156 from jfederico/bbb-lti-preview-bug
Fix for bug in preview not working for students
2018-10-13 18:56:15 -04:00
jfederico
54a14f8cb7 Fix for bug in preview not working for students 2018-10-12 21:52:39 +00:00
jfederico
bb078aab20 Updates for backward compatibility to recording-ready-callback script 2018-10-12 21:41:37 +00:00
KDSBrowne
9b42940d63 move polling options for viewer 2018-10-12 15:05:53 +00:00
Anton Georgiev
a815433fb0
Merge pull request #6143 from gustavotrott/master
Adds compatibility with Electron Chromium to choose one screen to share
2018-10-11 13:11:52 -04:00
Maxim Khlobystov
97ebd02595
Merge pull request #6090 from jfsiebel/ini-configuration-file
Remove settings and use yml file
2018-10-11 13:03:48 -04:00
Richard Alam
1a9e6486c9
Merge pull request #6147 from ritzalam/add-metrics-to-get-recordings-api
Return some data metrics on get recordings api
2018-10-11 10:52:14 -04:00
gustavotrott
4f607d304a Move duplicated parameters to a constant in the beginning 2018-10-11 10:24:12 -03:00
KDSBrowne
bc5592ef67 update css styles 2018-10-11 03:20:58 +00:00
KDSBrowne
a955a7c0f1 replace createContainer with withTracker 2018-10-11 03:01:59 +00:00
KDSBrowne
dc8bd0345d edit live-result style values 2018-10-10 19:04:09 +00:00
Richard Alam
f780a43c44 - implement data metrics on metadata.xml 2018-10-10 11:38:31 -07:00
KDSBrowne
5654f08b43 clean up code 2018-10-10 18:25:35 +00:00
KDSBrowne
7673adee1b implement live results for poll 2018-10-10 15:52:39 +00:00
gustavotrott
265275018e Added compatibility with Electron Chromium 2018-10-09 10:43:22 -03:00
João Francisco Siebel
74dfa52071 handle system messages on main public chat 2018-10-08 11:22:45 -03: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
Anton Georgiev
01e001f3ab
Merge pull request #6126 from Tainan404/fix-setting-dropdown-intl
change intl label for consistency with others options.
2018-10-03 09:55:58 -04: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
Calvin Walton
c5810ae953
Merge pull request #6113 from jfederico/record-and-playback
Added script for sending recording ready notifications
2018-10-02 16:17:22 -04:00
Tainan Felipe
aa24a4b3b5 change intl label for have concistency with others options 2018-10-02 16:39:09 -03:00
jfederico
90e3c6e360 Added script for recording ready notification 2018-10-02 18:57:15 +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
Anton Georgiev
c59e789ac4
Merge pull request #6114 from Tainan404/change-overlay-color
Change modal overlay color for client consistency.
2018-09-25 16:48:11 -04:00
Tainan Felipe
33655682f0 change modal overlay color for client consistency 2018-09-25 17:29:54 -03:00
Richard Alam
6c7fb11304
Merge pull request #6095 from jfederico/v2.2-dev
Fix meeting tag in recordings migrated from BBB 1.0 and before (fixed #6089)
2018-09-25 16:20:45 -04:00
Jesus Federico
35b2806b33
Merge pull request #5473 from mesutaydemir/patch-2
suggested solution timestamp issue for student role lti integration w…
2018-09-25 16:17:45 -04:00
jfederico
494f9b345a Added jwt and java_properties gems 2018-09-25 20:11:45 +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
João Francisco Siebel
531f739f12 Merge remote-tracking branch 'upstream/master' into ini-configuration-file 2018-09-25 09:42:24 -03:00
João Francisco Siebel
68aa29de68 rename file and add users-settings subscription 2018-09-25 09:37:45 -03:00