Oswaldo Acauan
|
14f586faad
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design
|
2017-08-03 09:23:12 -03:00 |
|
Oswaldo Acauan
|
00db9ee5bb
|
Comment out compact user-list toggle
|
2017-08-03 09:06:59 -03:00 |
|
Oswaldo Acauan
|
92da0ace60
|
Fix error when a user have no subName and hide compact toggle
|
2017-08-03 09:05:17 -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 |
|
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 |
|
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 |
|
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 |
|
Richard Alam
|
216932eff8
|
Merge pull request #4185 from ritzalam/remove-bbb-user2x-bind-warnings
- remove binding warnings
|
2017-08-01 14:32:50 -04:00 |
|
Richard Alam
|
629939ccc7
|
- remove binding warnings
|
2017-08-01 11:31:39 -07:00 |
|
Oswaldo Acauan
|
35fd834397
|
Fix error when a user have no subName
|
2017-08-01 14:50:33 -03:00 |
|
Oswaldo Acauan
|
df35a22676
|
Merge branch 'bbb-2x-mconf' into userlist-2x-design
|
2017-08-01 14:29:12 -03:00 |
|
Klaus
|
0a9abf6273
|
Remove user.listenOnly
|
2017-08-01 14:02:41 -03:00 |
|
Fred Dixon
|
52fefdb6d6
|
Merge pull request #4183 from riadvice/2x-client-theme
Fix presentation conversion pages number and setting to current.
|
2017-08-01 13:53:26 -03:00 |
|
Ghazi Triki
|
a760d93c9f
|
Fix presentation conversion pages number and setting to current.
|
2017-08-01 17:50:50 +01:00 |
|
Pedro Beschorner Marin
|
ca36ec29d8
|
Included missing getters and setters for recordings size and raw size
|
2017-08-01 16:33:45 +00:00 |
|
Klaus
|
6cc46b8627
|
Add const to voiceUser
|
2017-08-01 13:04:20 -03:00 |
|
Pedro Beschorner Marin
|
73443fe2db
|
Clean up unused redis message service
|
2017-08-01 15:14:03 +00:00 |
|
Pedro Beschorner Marin
|
835f7d5371
|
Removed unused playbacks included with mconf merge
|
2017-08-01 15:11:49 +00:00 |
|
Klaus
|
fc6713013a
|
Move method to VoiceUser
|
2017-08-01 12:00:07 -03:00 |
|
Anton Georgiev
|
04a7781ea6
|
Merge pull request #4172 from mmarangoni/call-manager
[HTML5] Remove audio API duplication & Join Audio fix
|
2017-08-01 10:23:09 -04:00 |
|
Klauswk
|
7935c843b3
|
Merge branch 'bbb-2x-mconf' into slides-refactor-2x
|
2017-08-01 11:07:58 -03:00 |
|
Klaus
|
ed7d9a3a63
|
Change wrong log
|
2017-08-01 10:55:00 -03:00 |
|
Klaus
|
11cf4b8d78
|
A few fixes on client
|
2017-08-01 10:41:24 -03:00 |
|
Anton Georgiev
|
c0b940b063
|
Merge pull request #4173 from antobinary/fix-presentation
[HTML5 2.0] Handle PresentationConversionCompletedEvtMsg
|
2017-08-01 09:20:35 -04:00 |
|
Klaus
|
9d42ca9bd7
|
Move from users to voice-users
|
2017-08-01 10:10:12 -03:00 |
|