Commit Graph

2677 Commits

Author SHA1 Message Date
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
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
Klaus
6cc46b8627 Add const to voiceUser 2017-08-01 13:04:20 -03: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
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
Klaus
9d42ca9bd7 Move from users to voice-users 2017-08-01 10:10:12 -03:00
Anton Georgiev
2fd4bc4330 handle PresentationConversionCompletedEvtMsg 2017-07-31 17:08:09 -04:00
Matthew Marangoni
2494f48f52 removed unused constructor 2017-07-31 13:54:18 -07:00
Klaus
1ff3df770a Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-voice-user 2017-07-31 17:01:04 -03:00
Klaus
d06c49a6b8 Move from voice-user to voice-users 2017-07-31 16:36:41 -03:00
Anton Georgiev
7d50c01a4a Merge pull request #4126 from Klauswk/html5-2x-handle-meeting-end
[HTML5 2.0] Handling meeting end
2017-07-31 15:29:15 -04:00
Anton Georgiev
1b2591653b Merge pull request #4168 from oswaldoacauan/user-join-req-msg
[HTML5] Implements the new join flow
2017-07-31 15:25:24 -04:00
Oswaldo Acauan
75d67cec33 Update Meteor to 1.5.1 2017-07-31 16:19:13 -03:00
Oswaldo Acauan
f217304e19 Add publish to UserJoinMetting to the auth flow 2017-07-31 15:48:56 -03:00
Anton Georgiev
7b40122c89 Merge pull request #4121 from mmarangoni/call-manager
[HTML5] Implemented AudioManager
2017-07-31 14:29:42 -04:00
Klaus
0a1091f871 Merge branch 'slides-refactor-2x' of https://github.com/klauswk/bigbluebutton into slides-refactor-2x 2017-07-31 09:04:07 -03:00
Klaus
03f0061e2c Fix lint 2017-07-31 09:03:46 -03:00
Oleksandr Zhurbenko
4e31181690 Resolve Alex cherry-pick 2017-07-31 08:30:08 -03:00
Klaus
9bc9116e5c handling a few messages 2017-07-31 08:10:52 -03:00
Oswaldo Acauan
dca47fcbb6 Add missing locales 2017-07-28 10:51:18 -03:00
Oswaldo Acauan
e93f3c0fd5 Remove logs 2017-07-28 10:49:48 -03:00
Oswaldo Acauan
83c117ddde Match user-list with the new styles 2017-07-28 10:43:39 -03:00
Klaus
e43a44e828 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options 2017-07-28 08:47:56 -03:00
Klaus
e2c0971e57 Add new icons 2017-07-27 17:45:40 -03:00
Klaus
eac898e81d Merge branch 'bbb-2x-mconf' into html5-2x-chat-options 2017-07-27 17:36:01 -03:00
Klauswk
e751bcdadf Merge branch 'bbb-2x-mconf' into slides-refactor-2x 2017-07-27 17:27:35 -03:00
Klaus
e23d75c16b Captions mapped 2017-07-27 17:18:44 -03:00
Anton Georgiev
b78f40b543 Merge pull request #4119 from JaeeunCho/new_icon
[HTML5 2.0] added new icons
2017-07-27 15:49:33 -04:00
Anton Georgiev
13b406313e drop handling of fsesl->akka-apps events 2017-07-27 11:27:06 -04:00
Klaus
b015c98f82 Mapped annotations 2017-07-27 10:45:40 -03:00
Klaus
c13155aa6a Move shapes to annotations 2017-07-27 09:35:55 -03:00
JaeeunCho
7fc1fa376f changed 'romm' to 'room' 2017-07-26 11:04:55 -07:00
Anton Georgiev
4c19d0589b reorganize object destruction 2017-07-26 14:01:38 -04:00
Matthew Marangoni
0ab3bcc599 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager 2017-07-26 10:59:05 -07:00
Matthew Marangoni
7c0d802f27 fixed undefined extension 2017-07-26 10:58:39 -07:00
Anton Georgiev
5ca6f63d7e Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into html5-2x-fix-audio 2017-07-26 13:49:57 -04:00
Klaus
a1e57c84c3 Mapped meeting 2017-07-26 14:36:57 -03:00
JaeeunCho
315dae97d7 Merge branch 'new_icon' of https://github.com/JaeeunCho/bigbluebutton into new_icon 2017-07-26 10:17:37 -07:00
Klaus
06b5538054 Mapped polls 2017-07-26 14:08:00 -03:00
Klaus
d05e3c6b14 Presentation mapped 2017-07-26 13:59:21 -03:00
Klaus
ff42dbc58b Refactored slides 2017-07-26 13:39:53 -03:00
Anton Georgiev
305b47e535 improve getSessionToken function and use it on verto_extension 2017-07-26 11:43:47 -04:00
Klaus
355f777d0d User mapped 2017-07-26 11:50:02 -03:00
Klaus
9ab4430f68 Fix merge stuff 2017-07-26 11:31:35 -03:00
Klaus
745b9070f6 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x 2017-07-26 11:11:40 -03:00
Klaus
eea2c0ee8b Refactor user 2017-07-26 11:09:07 -03:00
Anton Georgiev
dbcf6dbd2c screenshare displays except at refresh 2017-07-26 09:18:15 -04:00
Anton Georgiev
4e34a7f551 screenshare displays except at refresh 2017-07-25 16:56:40 -04:00
Klaus
d44299d221 Fix the missing string name 2017-07-25 15:57:20 -03:00
Klaus
9cd3ac3f87 Merge branch 'bbb-2x-mconf' into fix-presenter-rule 2017-07-25 13:43:26 -03:00
Klaus
22d80b605f Fix presenter assign 2017-07-25 13:21:07 -03:00
Anton Georgiev
1bdeb248c1 Merge pull request #4117 from Klauswk/html5-2x-fix-audio
[HTML5 2.0] Fix join audio on the HTML5 client 2.0
2017-07-25 10:30:43 -04:00
Klaus
51f7161e45 Flat breakouts 2017-07-25 10:51:33 -03:00
Klaus
b1bb4a6866 Flat poll 2017-07-25 09:26:45 -03:00
Klaus
916713b1df Add safe true, preventing mess with the arrays, and refactored the shapes 2017-07-24 17:32:35 -03:00
Anton Georgiev
75c39f9340 Merge branch 'html5-2x-screenshare' of github.com:antobinary/bigbluebutton into html5-2x-fix-audio 2017-07-24 16:06:52 -04:00
Anton Georgiev
350dd16fb7 Merge branch 'html5-2x-fix-audio' of github.com:Klauswk/bigbluebutton into html5-2x-fix-audio 2017-07-24 15:34:18 -04:00
Anton Georgiev
b7d6427e63 rename deskshare to screenshare and adjust condition for viewing 2017-07-24 15:29:34 -04:00
Matthew Marangoni
2f48cca53e Merge branch 'call-manager-2x' of https://github.com/Klauswk/bigbluebutton into Klauswk-call-manager-2x 2017-07-24 12:14:18 -07:00
Klaus
97b38fb0e6 Presentation reflects akkaApps 2017-07-24 15:46:53 -03:00
Matthew Marangoni
8902742573 wrapped BBB instantiation into init function and added to startup 2017-07-24 11:36:56 -07:00
Anton Georgiev
cacac6c9c6 Merge branch 'html5-2x-screenshare' of github.com:Klauswk/bigbluebutton into html5-2x-screenshare 2017-07-24 14:17:04 -04:00
Klaus
78a6fee038 Slides reflecting akkaApps 2017-07-24 14:50:44 -03:00
Klaus
d72df301c6 Move to 2.0 2017-07-24 11:15:46 -03:00
Klaus
5c2369b992 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager 2017-07-24 11:00:30 -03:00
Klaus
73068ff8d2 Handling meeting end 2017-07-21 16:34:28 -03:00
Klaus
fade555d55 Add check for user permission 2017-07-21 15:17:25 -03:00
Klaus
39288e6e70 Add clear history, copy and save as chat options 2017-07-21 13:27:28 -03:00
Klaus
a63d8d5cf4 Add function to export public chat to clipboard and file 2017-07-21 11:39:51 -03:00
Klaus
7cf05cdbf5 Add public history clear eventHandler and method 2017-07-21 11:39:40 -03:00
Matthew Marangoni
4e66ecf0e2 moved BBB import to startup 2017-07-20 08:57:12 -07:00
Matthew Marangoni
01f98fb4be renamed htmlBBB to simply BBB 2017-07-20 07:57:15 -07:00
JaeeunCho
4e382a819e changed @font-face and class 2017-07-19 14:16:35 -07:00
Matthew Marangoni
f521ef0402 Merge remote-tracking branch 'upstream/master' into call-manager 2017-07-19 11:55:45 -07:00
Matthew Marangoni
8139fa03ab fixed issue with status being improperly used in custom events 2017-07-19 11:54:48 -07:00
Klaus
b2556695c4 Fix show public messages 2017-07-19 14:57:07 -03:00
Klaus
2bf0fc65db Fix statment 2017-07-19 14:20:19 -03:00
JaeeunCho
0526edb27e HTML5 - added .woff file 2017-07-19 08:04:00 -07:00
JaeeunCho
9a3ba4b34f HTML5 - added new icons 2017-07-19 08:01:58 -07:00
Klaus
a4db665a47 Update container.jsx 2017-07-19 09:59:03 -03:00
Klaus
b70702dabe Dynamic fetching the stun/turn servers 2017-07-19 09:44:47 -03:00
Matthew Marangoni
1feb7629d6 detailed errors and error codes are displayed in the audio notifications when an audio failed case is received 2017-07-18 17:04:12 -07:00
Klaus
a7ca723fe6 Audio only working on html5 2017-07-18 11:59:05 -03:00
Anton Georgiev
2d4db1c9de Merge pull request #4113 from oswaldoacauan/fix-meeting-add
[HTML5 2.0] Fix meeting add
2017-07-18 10:02:08 -04:00
Oswaldo Acauan
507bb61fb2 Change user-list width 2017-07-18 10:55:19 -03:00
Oswaldo Acauan
a0de0545b4 Fix welcomeMessage from meeting object 2017-07-18 10:31:00 -03:00
Oswaldo Acauan
c6f517b3cb Fix selector and get welcomeMessage from meeting object 2017-07-18 10:25:11 -03:00
Oswaldo Acauan
04b6b753fe Fix missing prop on meeting object 2017-07-18 10:23:16 -03:00
Oswaldo Acauan
dbb6b5cd12 New user-list colors 2017-07-18 10:12:26 -03:00
Oswaldo Acauan
d04c392064 Fix body background color 2017-07-18 08:51:29 -03:00
Klauswk
7173c0e20c Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages 2017-07-17 16:54:37 -03:00
Anton Georgiev
ed5460cba6 Merge pull request #4040 from Klauswk/html5-2x-captions-messages
[HTML5 2.0] Move captions messages to 2.0
2017-07-17 15:52:15 -04:00
Anton Georgiev
bc9083c0cf Merge pull request #4109 from Klauswk/fix-sass-path
[HTML5 - 2.0] Change relative path of the sass imports to absolute
2017-07-17 14:58:02 -04:00
Klaus
6b0edb353e Change all from single quotes to double quotes 2017-07-17 15:56:05 -03:00
Klaus
5767583a86 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-captions-messages 2017-07-17 15:37:06 -03:00
Klaus
87943cb3f8 Change relative path of the sass to absolute 2017-07-17 15:21:45 -03:00