Commit Graph

1300 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
643d55938c Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-16 19:24:59 -07:00
Anton Georgiev
5f1fb7542e Merge pull request #4204 from Klauswk/fix-missing-state
[HTML5 2.0] Fix Audio Modal on Meeting Join
2017-08-15 15:11:47 -04:00
Anton Georgiev
f6e8e743e0 Merge pull request #4244 from KDSBrowne/fix-meeting-title
[HTML5] - Meeting title fix
2017-08-15 15:11:27 -04:00
KDSBrowne
66d1a3b06a fix meeting title 2017-08-15 10:24:58 -07:00
Oleksandr Zhurbenko
9035386e76 Added multi-cursors 2017-08-14 17:15:11 -07:00
Klaus
dc62d15ad0 Change variable name 2017-08-14 16:19:35 -03:00
Klaus
de6b40a666 Fix counter in breakout notification 2017-08-11 17:17:35 -03:00
Klaus
babc981867 Messages been correct handle 2017-08-11 14:14:50 -03:00
Oleksandr Zhurbenko
f90a1d446f Made whiteboard-toolbar display when multi-user mode is on 2017-08-08 13:55:38 -07:00
Klauswk
0ce41afabb Merge branch 'bbb-2x-mconf' into html5-toggle-mute 2017-08-08 13:59:00 -03:00
Oswaldo Acauan
716ee5902f Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design 2017-08-08 11:52:26 -03:00
Klaus
024fd2a796 Fix removed logic from the AudioContainer 2017-08-04 17:33:25 -03:00
Klaus
0807960da4 Fix missing method for mute user 2017-08-04 17:05:18 -03:00
Oswaldo Acauan
e07c8b41af Add autofocus when switching/entering chat 2017-08-04 15:32:21 -03:00
Oswaldo Acauan
720dddec24 Fix chat styles 2017-08-04 15:17:15 -03:00
Oswaldo Acauan
0022c121d3 Fix chat bug and styles 2017-08-04 14:58:55 -03:00
Klaus
0c6ac6364c Fix missing state of audio modal 2017-08-04 09:24:57 -03:00
Klaus
e4e7f1da2c Move domain functions to service.js 2017-08-03 11:10:05 -03:00
Oswaldo Acauan
b53636ec19 Fix avatar colors and text capitalization 2017-08-03 09:36:26 -03:00
Oswaldo Acauan
14f586faad Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design 2017-08-03 09:23:12 -03:00
Klaus
e02e5d75ce Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options 2017-08-03 09:17:50 -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
Oleksandr Zhurbenko
fa1458c3eb Handling and publishing multi-user mode switch 2017-08-02 18:24:38 -07:00
Klaus
4495c2e897 Move from annotation/ to annotations/ 2017-08-02 16:52:13 -03:00
Klaus
e7b9eab5b6 Move makeCall to service file 2017-08-02 14:05:20 -03: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
d45ae64558 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x 2017-08-02 11:29:33 -03:00
Oleksandr Zhurbenko
b207a1275e Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-01 13:49:46 -07: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
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
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
Matthew Marangoni
2494f48f52 removed unused constructor 2017-07-31 13:54:18 -07:00
Anton Georgiev
7b40122c89 Merge pull request #4121 from mmarangoni/call-manager
[HTML5] Implemented AudioManager
2017-07-31 14:29:42 -04:00
Oleksandr Zhurbenko
9e58c33b10 Added 'resize' event to the notifications bar
To scale the whiteboard
2017-07-28 18:52:06 -07:00
Oleksandr Zhurbenko
c61dcbce36 Fixed a cursor display/publish for both presenters and viewers
Plus linting warnings, no multi-user yet
2017-07-28 17:29:40 -07: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
Anton Georgiev
13b406313e drop handling of fsesl->akka-apps events 2017-07-27 11:27:06 -04:00
Klaus
c13155aa6a Move shapes to annotations 2017-07-27 09:35:55 -03:00
Matthew Marangoni
7c0d802f27 fixed undefined extension 2017-07-26 10:58:39 -07: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