Commit Graph

4583 Commits

Author SHA1 Message Date
Tainan Felipe
1c04aacb24 fix intl showing intl ids 2018-07-23 13:46:53 -03:00
Bobak Oftadeh
b4022f40af Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into client-logger 2018-07-23 09:16:52 -07:00
Bobak Oftadeh
c3172a7691 The client logger can now be configured on the production settings 2018-07-23 09:15:50 -07:00
KDSBrowne
37c9599a70 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into 01-bug-fixes 2018-07-23 15:37:28 +00:00
Anton Georgiev
8b0ec94405 remove duplicate import causing app to crash 2018-07-23 15:06:25 +00:00
Anton Georgiev
cbb4bbc2fc
Fixed missed unmerged code from #5808 2018-07-23 10:40:54 -04:00
Anton Georgiev
5dc3fe82c2
Merge branch 'v2.0.x-release' into custom-parameters 2018-07-23 10:29:29 -04:00
KDSBrowne
1f7ff24b63 add return to prevent cam unsharing on first route change 2018-07-22 17:45:33 +00:00
KDSBrowne
c502027427 use withModalMounter to prevent the modal re-opening 2018-07-22 17:45:14 +00:00
prlanzarin
727e6b3fc5 Removed trailing comma from locale 2018-07-20 20:16:04 +00:00
prlanzarin
75f70ad06c Added SFU error handling in video-provider component with localized messages 2018-07-20 19:34:50 +00:00
Bobak Oftadeh
e1fbc5059b Desktop share button moved to the action bar component 2018-07-20 10:07:10 -07:00
Bobak Oftadeh
0db93d35b9 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into client-logger 2018-07-20 09:42:11 -07:00
Anton Georgiev
13691f0df2
Merge pull request #5880 from Tainan404/issue-5852
Allow guest user join via html5 client
2018-07-20 11:28:39 -04:00
Tainan Felipe
06b4504876 Fix recording not update 2018-07-20 09:43:09 -03:00
Lucas Fialho Zawacki
8e023d57c9 Ids for share video and share screen buttons 2018-07-19 17:45:03 -03:00
Lucas Fialho Zawacki
ffcf35b7da react key for screenshare video area 2018-07-19 17:44:51 -03:00
Lucas Fialho Zawacki
125e90582c Add processing of userdata parameters and correct bug while processing metadata 2018-07-19 17:44:20 -03:00
Tainan Felipe
193edcb8fd remove comment 2018-07-19 15:12:04 -03:00
Anton Georgiev
488f6c04e1
Merge pull request #5865 from Tainan404/issue-5675
Add user when moderator join via audio only in breakout room
2018-07-19 14:09:54 -04:00
Anton Georgiev
daf5cea886
Merge pull request #5878 from MaximKhlobystov/presentation-upload-current
Presentation selected to be uploaded (or the first one of them) becomes current.
2018-07-19 13:39:26 -04:00
Bobak Oftadeh
6d2d701127 Altered client logger functions 2018-07-19 09:21:26 -07:00
Tainan Felipe
005310d22a Allow guest user join via html5 client 2018-07-19 09:46:44 -03:00
Maxim Khlobystov
3d0b41c166 Pre-select one of the presentations that are about to be uploaded. 2018-07-18 14:47:40 -04:00
Anton Georgiev
94d3d52a77
Merge pull request #5821 from musickiper/fix-navbar-problem-on-iphone
Adjust Navbar not to cover on the top of any list in mobile view
2018-07-18 13:59:42 -04:00
James Jung
617446f89b Change the overflow setting of the public chat to make the navbar not cover the public chat save button 2018-07-18 13:42:02 -04:00
Bobak Oftadeh
8119e10167 Updated how targets are added to the client logger 2018-07-18 09:04:40 -07:00
James Jung
696399fc3a Fix the header not to overlap the options list of public chat on iphone 2018-07-17 14:59:44 -04:00
Tainan Felipe
5b84652fc4 Add speak icon when is voice only 2018-07-16 15:17:49 -03:00
Tainan Felipe
42a2bfff58 Add user when voice only user join in the meeting 2018-07-16 14:03:01 -03:00
Ghazi Triki
66a050b00b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.2-merge-with-2.0
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/imports/api/users/server/handlers/guestApproved.js (Not Fixed)
2018-07-16 16:08:38 +01:00
Bobak Oftadeh
5a2d2934fa Updated settings for client-logger 2018-07-13 12:44:22 -07:00
Bobak Oftadeh
a5354c9c10 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fixes3 2018-07-13 12:18:55 -07:00
Bobak Oftadeh
c98bd10024 Replaced console.errors with client logger and alterted logger configurations 2018-07-13 12:16:50 -07:00
Anton Georgiev
f50cf96100
Merge pull request #5840 from Tainan404/issue-5833
Comply audio lock setting.
2018-07-12 14:38:19 -04:00
Anton Georgiev
97fb0e9b4f
Merge pull request #5827 from Tainan404/issue-5562
Allow html5 user to join in any breakout room
2018-07-12 12:21:14 -04:00
Tainan Felipe
54aa1cddc3 Add line break 2018-07-12 13:19:54 -03:00
Anton Georgiev
2e3c071419
Merge pull request #5812 from musickiper/tweak-usrMenu-for-all-text
Allow longer menu labels (think DE) to spread over several rows within the menu
2018-07-12 11:39:46 -04:00
Tainan Felipe
80681142e7 check lockSettigProps existence 2018-07-12 11:35:37 -03:00
James Jung
9f0a7ea08a chg mute/unmute icon 2018-07-11 15:13:59 -04:00
Anton Georgiev
466bcf054a
Merge pull request #5854 from prlanzarin/video-attach-response-fixes
Trying to fix WebRTC video tag attachment
2018-07-11 13:41:09 -04:00
prlanzarin
5bf5a126b5 Cleaning ping/pong interval on SFU listen only exit 2018-07-11 16:32:52 +00:00
prlanzarin
7fb2f063dd Trying to fix video tag attachment race condition and correctly checking peer availability on server messages 2018-07-11 16:32:19 +00:00
Anton Georgiev
80715cc133
Merge pull request #5851 from antobinary/guests
Disable HTML5 waiting screen for guest approve
2018-07-11 09:53:18 -04:00
Anton Georgiev
4dbe681a46 disable HTML5 waiting screen for guest approve 2018-07-11 12:46:44 +00:00
James Jung
7b286df2f5 Adjust the list view looks better 2018-07-10 13:01:17 -04:00
Anton Georgiev
5bcbc330af
Merge pull request #5842 from prlanzarin/audio-video-ss-stun-turn
[HTML5] STUN/TURN config support for SFU client-side apps and general improvements
2018-07-10 11:24:37 -04:00
prlanzarin
123ec6f3a3 Reverted wrong config changes 2018-07-09 21:33:32 +00:00
prlanzarin
d2bdb67ed3 Propagating configs to WebRTC screenshare script and added support for STUN/TURN config to SFU components 2018-07-09 21:29:59 +00:00
Tainan Felipe
e424970018 Comply audio lock setting 2018-07-09 16:23:16 -03:00
Tainan Felipe
f8b683a611 Tiny fixes 2018-07-09 09:13:11 -03:00
Anton Georgiev
b50dda8566
Merge pull request #5232 from oswaldoacauan/fix-4987
Implement basic GroupChat messages
2018-07-06 16:45:14 -04:00
James Jung
82229e1a8a Add 1px option for the pencil thickness 2018-07-06 14:47:50 -04:00
Tainan Felipe
3468447f81 add message in en.json 2018-07-06 14:47:06 -03:00
Tainan Felipe
b6aa7e5136 remove breakout URL of nav bar and remove code of service 2018-07-06 14:46:07 -03:00
Tainan Felipe
4e87260b59 add free join interface 2018-07-06 14:38:14 -03:00
Tainan Felipe
425c5da4ee allow get all meetings when is free join breakout room 2018-07-06 14:07:08 -03:00
Tainan Felipe
ccd045dbef add Method for request Breakout join URL 2018-07-06 14:00:44 -03:00
JamesJung
7350c1f81b Don't push chat notification if chat is open (#5773)
* Make the public/private chat notification not to be pushed when public/private chat is opened

* Make the public/private chat notification not to be pushed when public/private chat is opened

* Make the public/private chat notification not to be pushed when public/private chat is opened

* Make the public/private chat notification not to be pushed when public/private chat is opened

* Make the public/private chat notification not to be pushed when public/private chat is opened

* Make the public/private chat notification not to be pushed when public/private chat is opened

* Change variable name to more make sense

* Refactoring codes to make functions more readable

* Remove useless condition code

* Remove useless variable and condition
2018-07-06 11:23:47 -03:00
Tainan Felipe
9756517392 fix white blocks when hover toast 2018-07-06 09:08:50 -03:00
James Jung
3187cdd3c5 Adjust Navbar not to cover on the top of any list in mobile view 2018-07-05 17:09:43 -04:00
James Jung
430872e506 Adjust Navbar not to cover on the top of any list in mobile view 2018-07-05 17:04:18 -04:00
Anton Georgiev
bc410c290c
Revert "Prevent screen from moving while drawing" 2018-07-05 16:05:02 -04:00
Anton Georgiev
2939f1f980
Merge pull request #5814 from BobakOftadeh/Phone-Icon-Slashed
Leave audio icon updated
2018-07-05 15:33:31 -04:00
Maxim Khlobystov
f3e8f18a1c DIsabled chat push notifications by default. 2018-07-05 15:04:53 -04:00
Bobak Oftadeh
c4d310c9e7 Font files updated. 2018-07-05 11:36:34 -07:00
Bobak Oftadeh
bc3e068e2e Client logger implemented 2018-07-04 14:02:10 -07:00
Oswaldo Acauan
3e2008be3e Prevent screen from moving while drawing. Closes #5672 2018-07-04 17:11:04 -03:00
James Jung
09b604f954 tweak user menu to allow all text to be displayed 2018-07-04 14:41:05 -04:00
Maxim Khlobystov
5bdc1bb88c
Merge pull request #5805 from MaximKhlobystov/move-current-user-to-top
Move current user to the top of the users list.
2018-07-04 14:11:18 -04:00
Maxim Khlobystov
fefec54832 Typo. 2018-07-04 13:51:59 -04:00
Maxim Khlobystov
0902bb33e6 Cleanup: removed unnecessary condition. 2018-07-04 13:48:58 -04:00
Maxim Khlobystov
6b9159ad28 Used sorting by whether the user is current or not. 2018-07-04 13:27:15 -04:00
Tainan Felipe
957a2ef02c Tiny fixes in chat and notifications (#5807)
* don't notify old messages when user reload the client

* fix chat height
2018-07-04 14:12:08 -03:00
Maxim Khlobystov
d0ade399ce Modified the userlist sorting order by pushing the current user to the top. 2018-07-04 11:33:54 -04:00
James Jung
7462710905 adjust view of mobile user actions list 2018-07-03 17:03:27 -04:00
Anton Georgiev
eca2e50e1a Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into current 2018-07-03 20:17:42 +00:00
Anton Georgiev
576214f465 pull locales July 03, 2018 2018-07-03 19:17:54 +00:00
Anton Georgiev
3414948f0e
Merge pull request #5795 from MaximKhlobystov/mod-only-message
Moderator only message support.
2018-07-03 11:48:08 -04:00
Anton Georgiev
4b30bb7a37
Merge pull request #5759 from KDSBrowne/fix-5637
Prevent settings modal re-opening after dismiss
2018-07-03 11:45:54 -04:00
Maxim Khlobystov
4a7a3cfcf9 Clearing user system messages when adding a user. 2018-07-03 11:45:44 -04:00
Anton Georgiev
3eeef57944
Merge pull request #5748 from musickiper/adj-chatlist-view-on-iphone-view
Typing chat on iPhone partially hides the post button
2018-07-03 11:44:32 -04:00
Maxim Khlobystov
d7b99f5ed4 Cleanup. 2018-07-03 11:37:06 -04:00
Anton Georgiev
cd6417aa33
Merge pull request #5779 from oswaldoacauan/whiteboard-fixes
Whiteboard fixes and improvements
2018-07-03 11:33:35 -04:00
Maxim Khlobystov
593a2ab744 Typo. 2018-07-03 11:31:00 -04:00
Anton Georgiev
915c1bae8b
Merge pull request #5757 from Tainan404/issue-5714
Add some messages about audio errors
2018-07-03 11:22:45 -04:00
Maxim Khlobystov
efbc24db6f Add support for moderator only message. 2018-07-03 11:13:38 -04:00
KDSBrowne
49f75c32c5 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fix-5637 2018-07-03 15:09:31 +00:00
KDSBrowne
8e84c83e9f clean up 2018-07-03 15:09:20 +00:00
Anton Georgiev
52a0c68d64
Merge pull request #5792 from prlanzarin/audio-state-fix
Fixed audio state bug (#5519)
2018-07-03 10:18:49 -04:00
Anton Georgiev
ff34d648e9
Merge pull request #5793 from prlanzarin/sfu-opt-audio
Fixed full audio exit when SFU listen only is enabled
2018-07-03 09:37:45 -04:00
prlanzarin
19f2802ef9 Fixed full audio exit when kurento listen only is enabled 2018-07-02 16:50:09 +00:00
prlanzarin
8c50ddf762 Removed audio failure listeners on graceful exit 2018-07-02 16:36:54 +00:00
prlanzarin
769143ad48 Fixed audio state bug regarding ICE connection 2018-07-02 15:36:48 +00:00
Anton Georgiev
381e72beed
Merge pull request #5790 from antobinary/v2.2-dev-recover
HTML5: Adjust guest status body params
2018-06-29 18:32:28 -04:00
Anton Georgiev
e2b86eb37c adjust guest status body params 2018-06-29 22:29:55 +00:00
Richard Alam
914f36630a Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-latest-20-branch 2018-06-29 13:25:09 -07:00
Oswaldo Acauan
1ca504ff2c Remove console.log 2018-06-29 15:11:11 -03:00
Oswaldo Acauan
1d823fdf83 Remove console.log 2018-06-29 15:10:56 -03:00
Oswaldo Acauan
c2f590e3fc Fix cursor and shapes listener not working in some areas. Closes #5768 2018-06-29 14:58:31 -03:00