Commit Graph

1227 Commits

Author SHA1 Message Date
Matthew Marangoni
7feba2b01f moved callback to audio manager 2017-05-09 14:32:56 -07:00
Matthew Marangoni
e4dd786bd6 Merge remote-tracking branch 'upstream/master' into call-manager 2017-05-08 09:13:49 -07:00
Matthew Marangoni
2d8c5f26f1 inital call manager code 2017-05-05 14:39:16 -07:00
Klaus Klein
b2195da345 Fix client reconnection timeout 2017-05-05 11:30:15 -03:00
Anton Georgiev
93baf362e6 remove old import 2017-05-04 15:14:14 -04:00
Anton Georgiev
91ce6e20d5 unify user and audiouser in verto bridge 2017-05-04 14:44:20 -04:00
Fred Dixon
837654dc85 Merge pull request #3895 from perroned/update-verto-libs
Update verto libs and WebRTC Extension
2017-05-03 16:50:34 -04:00
Anton Georgiev
3904771fc3 if microphone lock is enforced, pick listenOnly join over using mic 2017-05-03 16:12:47 -04:00
Anton Georgiev
6d71e943a0 Merge pull request #3893 from antobinary/check-mute-user
HTML5: Update callServer to makeCall to fix user item calls
2017-05-03 13:54:15 -04:00
Klauswk
b668b24cac Merge branch 'ClientLog' into test-3865 2017-05-03 14:31:13 -03:00
Anton Georgiev
038405f907 some changes to logClient api 2017-05-03 13:19:21 -04:00
Klauswk
74c2219fc9 Update index.js 2017-05-03 14:09:33 -03:00
Anton Georgiev
8ab7865419 Merge branch 'ClientLog' of github.com:Klauswk/bigbluebutton into test-3865 2017-05-03 12:59:33 -04:00
Anton Georgiev
935219148a Merge pull request #3871 from Klauswk/LeaveButtonOnErrorScreen
Add leave button to error screen
2017-05-03 12:58:28 -04:00
Anton Georgiev
3a4b8cc388 update callServer to makeCall to fix user item calls 2017-05-03 12:56:27 -04:00
Klauswk
b0b455e591 Merge branch 'master' into ClientLog 2017-05-03 13:40:57 -03:00
Klaus Klein
5a37750bf6 Change leave button label 2017-05-03 13:19:45 -03:00
Anton Georgiev
02c6f6d80f Merge pull request #3860 from JaeeunCho/userlist_name_space
HTML5 - fixed display unread count for long name user
2017-05-03 11:16:23 -04:00
Anton Georgiev
0521571218 Merge pull request #3838 from Klauswk/AddServerCallback
Add server callback with error
2017-05-03 11:11:35 -04:00
Anton Georgiev
8d037bc4fa resolve issues with modal on breakouts 2017-05-03 11:06:28 -04:00
perroned
66061fa33d Handle lib update/fix errors 2017-05-03 14:13:53 +00:00
Klaus Klein
bede8ab447 Fix missing line and tab problem 2017-05-03 09:27:33 -03:00
Anton Georgiev
30e73e7640 Merge pull request #3879 from KDSBrowne/accessibility-update-07
[HTML5] - Accessibility update 07
2017-05-02 15:12:21 -04:00
Anton Georgiev
78937a5ac9 Merge pull request #3831 from oswaldoacauan/modal-refactor-pr
[HTML5] Refactor of the Modal component state
2017-05-02 15:09:38 -04:00
Anton Georgiev
5087e5b24b Handle audio on refactored modal (#2)
* handle audio on refactored modal

* wrap component with withModalMounter
2017-05-02 13:18:01 -04:00
Klaus Klein
131f23f42d Fix lint problems 2017-05-02 08:30:32 -03:00
KDSBrowne
c3ce8192d1 fix lint issues 2017-05-01 12:59:17 -07:00
Oswaldo Acauan
d434ba6893 Fix the audio-modal 2017-05-01 16:52:57 -03:00
KDSBrowne
80d4feedcc fix tabIndex for the settings closed caption submenu 2017-05-01 12:46:21 -07:00
KDSBrowne
eef9fd782a fix merge conflict 2017-05-01 12:23:01 -07:00
KDSBrowne
f2e7e360ff remove extra list separator 2017-05-01 11:54:40 -07:00
KDSBrowne
aa0f51e62d fix console errors for missing key and invalid prop 2017-05-01 11:43:01 -07:00
Klauswk
30b7c3c1e4 Merge branch 'master' into AddServerCallback 2017-04-28 17:28:45 -03:00
Klaus Klein
5ba575e0aa Removed unused import 2017-04-28 17:24:47 -03:00
Klaus Klein
9c2c736e65 Add leave button to error screen 2017-04-28 17:16:07 -03:00
Klaus Klein
31ae8854c9 Lint problems fixed 2017-04-28 17:01:02 -03:00
Anton Georgiev
a2e8a84e80 Merge pull request #3870 from antobinary/more-locales
HTML5: Add localizations to hardcoded strings
2017-04-28 15:40:30 -04:00
Anton Georgiev
85d6f7aa6e add label descriptions for cancel and save 2017-04-28 15:13:42 -04:00
Anton Georgiev
5d0022f214 localize user popup menu 2017-04-28 14:28:55 -04:00
Klaus Klein
5a4f05a41a Fix requests on PR #3865 2017-04-28 14:12:08 -03:00
Oswaldo Acauan
edd64a97f4 Fix merge conflicts 2017-04-28 16:15:29 +00:00
Anton Georgiev
5abf6413a8 localize controls in Settings menu 2017-04-28 11:56:27 -04:00
Anton Georgiev
121cb47093 localize mute, unmute buttons 2017-04-28 11:34:20 -04:00
Oswaldo Acauan
4dd5e3c6ac Re-add messages concatenation 2017-04-28 15:01:50 +00:00
Oswaldo Acauan
3d0c0d38e1 Fix merge conflicts 2017-04-28 14:59:09 +00:00
Oswaldo Acauan
9467731f47 Improve chat performance 2017-04-28 14:52:54 +00:00
Klaus Klein
71d3c06d5e Fix few lint issues 2017-04-28 11:03:35 -03:00
Klaus Klein
1c8e78d1c1 Merge with master 2017-04-28 10:53:30 -03:00
Klaus Klein
245ba3c4e3 Add client log, HTML5 2017-04-28 10:47:07 -03:00
Anton Georgiev
9684195c5f minor changes in strings 2017-04-27 17:23:43 -04:00