Richard Alam
|
279d3797ef
|
- not transfer works but user isn't removed from users list in breakout room
|
2017-08-03 15:16:29 -07:00 |
|
Richard Alam
|
30503d9c5d
|
Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf
|
2017-08-03 11:50:10 -07:00 |
|
Richard Alam
|
ebd8b704f4
|
Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme
|
2017-08-03 11:42:15 -07:00 |
|
Anton Georgiev
|
6afb7ca8b3
|
Merge pull request #4124 from Klauswk/html5-2x-chat-options
[HTML5 2.0] Add public chat new options
|
2017-08-03 14:33:32 -04:00 |
|
Anton Georgiev
|
1d465909e8
|
Merge pull request #4198 from KDSBrowne/x2.0.1-transifex-fetch-translation
[HTML5 2.0] - Transifex script & Translations.
|
2017-08-03 14:21:48 -04:00 |
|
Ghazi Triki
|
bd6530fcd8
|
Updated file download window.
|
2017-08-03 19:16:02 +01:00 |
|
Richard Alam
|
9bec8f1a22
|
Merge pull request #4199 from ritzalam/auto-assign-presenter
Auto assign presenter
|
2017-08-03 13:53:45 -04:00 |
|
Richard Alam
|
a4243ac87a
|
- auto-assign presenter when presenter is ejected from meeting
|
2017-08-03 10:50:58 -07:00 |
|
Richard Alam
|
dfef819823
|
- fix issue where if there is no presenter, we cannot assign a presenter.
|
2017-08-03 10:50:17 -07:00 |
|
Klaus
|
e4e7f1da2c
|
Move domain functions to service.js
|
2017-08-03 11:10:05 -03:00 |
|
Ghazi Triki
|
6a8d066b7a
|
Updated FileDownloadWindow and UploadedPresentationRenderer.
|
2017-08-03 15:09:55 +01:00 |
|
Anton Georgiev
|
1494c23858
|
Merge pull request #4189 from Klauswk/html5-hotfix-voiceuser
[HTML5 2.0] Fix VoiceUser microphone state
|
2017-08-03 08:53:01 -04:00 |
|
Klaus
|
e02e5d75ce
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options
|
2017-08-03 09:17:50 -03:00 |
|
Anton Georgiev
|
9252371948
|
Merge pull request #4154 from Klauswk/slides-refactor-2x
[HTML5 2.0] Refactor Code to reflect AkkaApps collections
|
2017-08-02 18:06:49 -04:00 |
|
Chad Pilkey
|
34fa2f22b2
|
Merge pull request #4195 from capilkey/record-extra-share-presentation
Record extra SharePresentationEvent when conversion complete and current
|
2017-08-02 17:30:30 -04:00 |
|
Chad Pilkey
|
4d16c73bde
|
record extra SharePresentationEvent when conversion complete and current
|
2017-08-02 17:26:02 -04:00 |
|
Richard Alam
|
e16a2711de
|
Merge pull request #4194 from kepstin/bbb-20-rec-fixes
Have presentation recording script remember current slide
|
2017-08-02 17:24:11 -04:00 |
|
Calvin Walton
|
0913534108
|
Have presentation recording script remember current slide
This fixes recording generation on BBB 2.0, where there is no longer
an automatic GotoSlide sent after every SharePresentation
|
2017-08-02 17:14:29 -04:00 |
|
Richard Alam
|
d6f5e13074
|
Merge pull request #4193 from ritzalam/route-end-meeting-message
Route end meeting message
|
2017-08-02 16:26:42 -04:00 |
|
Klaus
|
7b8eb8027c
|
Merge clear annotations and annotationsWhiteboard
|
2017-08-02 17:14:01 -03:00 |
|
Richard Alam
|
5ecf0c3651
|
- hook up end meeting from api
|
2017-08-02 13:06:16 -07:00 |
|
Richard Alam
|
f343719297
|
- set logging to debug not to clutter our client logs
|
2017-08-02 12:59:32 -07:00 |
|
Klaus
|
4495c2e897
|
Move from annotation/ to annotations/
|
2017-08-02 16:52:13 -03:00 |
|
Klaus
|
c5646069fd
|
Using the older insert method inside addShape
|
2017-08-02 16:46:29 -03:00 |
|
Richard Alam
|
876ff91372
|
Merge branch 'capilkey-fix-presenter-cursor-colour' into bbb-2x-mconf
|
2017-08-02 12:14:06 -07:00 |
|
Richard Alam
|
3089219981
|
Merge branch 'fix-presenter-cursor-colour' of https://github.com/capilkey/bigbluebutton into capilkey-fix-presenter-cursor-colour
|
2017-08-02 12:10:00 -07:00 |
|
Richard Alam
|
d14c93affa
|
Merge branch 'pedrobmarin-recordings-size' into bbb-2x-mconf
|
2017-08-02 11:33:53 -07:00 |
|
Richard Alam
|
b072b6e354
|
- log start voice recording message
|
2017-08-02 11:32:43 -07:00 |
|
Richard Alam
|
f6419cce4c
|
- ignore messages we don't want to record
|
2017-08-02 11:32:22 -07:00 |
|
Richard Alam
|
d169c417bc
|
- start recording voice conf when first user joins
|
2017-08-02 11:31:30 -07:00 |
|
Richard Alam
|
69268f8628
|
- fix exception when recording pencil whiteboard shape
|
2017-08-02 11:31:01 -07:00 |
|
KDSBrowne
|
daa1439099
|
add script to pull translation from transifex
|
2017-08-02 11:11:33 -07:00 |
|
Klaus
|
e7b9eab5b6
|
Move makeCall to service file
|
2017-08-02 14:05:20 -03:00 |
|
Chad Pilkey
|
43e6359029
|
make presenter cursor colour switch correctly
|
2017-08-02 13:04:09 -04:00 |
|
Richard Alam
|
beb7155121
|
Merge branch 'recordings-size' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-recordings-size
|
2017-08-02 08:22:02 -07:00 |
|
Ghazi Triki
|
8d0a74e904
|
Minor imprvements to icon sizes.
|
2017-08-02 16:12:52 +01:00 |
|
Klaus
|
63fee3b615
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options
|
2017-08-02 11:36:16 -03:00 |
|
Klaus
|
e0c1e295ee
|
Merge branch 'slides-refactor-2x' of https://github.com/klauswk/bigbluebutton into slides-refactor-2x
|
2017-08-02 11:32:16 -03:00 |
|
Klaus
|
d45ae64558
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x
|
2017-08-02 11:29:33 -03:00 |
|
Klaus
|
a0368e55cf
|
Fix voiceUser mic states
|
2017-08-02 10:11:53 -03:00 |
|
Ghazi Triki
|
dd9b71717a
|
Add icons to users settings menu and imporve BreakoutRoomSettings window layout.
|
2017-08-02 13:45:34 +01:00 |
|
Ghazi Triki
|
961b417e65
|
Improve users list icons and item renders layout.
|
2017-08-02 12:53:20 +01:00 |
|
Ghazi Triki
|
9f938d9cde
|
Remove warning in SharedNotesEventMapDelegate.as
|
2017-08-02 12:51:45 +01:00 |
|
Richard Alam
|
ae788b9b1d
|
Merge branch 'capilkey-restrict-remote-layout' into bbb-2x-mconf
|
2017-08-01 17:48:10 -07:00 |
|
Richard Alam
|
4889f66361
|
Merge branch 'restrict-remote-layout' of https://github.com/capilkey/bigbluebutton into capilkey-restrict-remote-layout
|
2017-08-01 17:35:47 -07:00 |
|
Chad Pilkey
|
89ea33359c
|
only apply remote layouts to non-moderators
|
2017-08-01 18:51:20 -04:00 |
|
Richard Alam
|
fd901bafa9
|
Merge pull request #4186 from ritzalam/fix-presentation-late-joiner
- fix issue where late joiners displays the wrong slide
|
2017-08-01 17:52:33 -04:00 |
|
Richard Alam
|
3b44d0eac2
|
- fix issue where late joiners displays the wrong slide
|
2017-08-01 14:50:44 -07:00 |
|
Anton Georgiev
|
1bafb292cb
|
Merge pull request #4169 from oswaldoacauan/meteor-1.5.1
[HTML5] Update Meteor to 1.5.1
|
2017-08-01 15:27:26 -04:00 |
|
Anton Georgiev
|
64b597c420
|
Merge pull request #4179 from Klauswk/html5-2x-voice-user
[HTML5 2.0] Move AudioUsers to his own Collection
|
2017-08-01 14:38:26 -04:00 |
|