Tainan Felipe
|
2b880141fb
|
changed icon for breakout room notification
|
2017-10-19 08:39:42 -02:00 |
|
Oswaldo Acauan
|
0686a596e9
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications
|
2017-10-19 08:07:42 -02:00 |
|
gcampes
|
b15322e7f2
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
|
2017-10-18 17:42:49 -02:00 |
|
gcampes
|
1dda597fca
|
Toast notifications on audio and overall changes
|
2017-10-18 17:40:01 -02:00 |
|
Tainan Felipe
|
114689d284
|
add toast notification for ended breakout room
|
2017-10-18 17:24:26 -02:00 |
|
gcampes
|
d1bc675465
|
changes setdevices to bridge
|
2017-10-17 17:16:42 -02:00 |
|
Tainan Felipe
|
376261f09d
|
add notify finish breakout room
|
2017-10-13 18:33:24 -03:00 |
|
Anton Georgiev
|
f1de51595d
|
Merge pull request #4515 from OZhurbenko/fix-warnings-assign-presenter
[HTML5] - Fix for the React console warnings
|
2017-10-13 14:06:31 -03:00 |
|
gcampes
|
2ae020ba9a
|
Merge remote-tracking branch 'oswaldo/toast-notifications' into audio-refactor-notifications
|
2017-10-13 10:43:27 -03:00 |
|
Tainan Felipe
|
873d227819
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter
|
2017-10-13 10:35:38 -03:00 |
|
Oleksandr Zhurbenko
|
b3572cec3a
|
Changed the way the object is assigned
|
2017-10-12 17:20:27 -07:00 |
|
Tainan Felipe
|
98b23640fd
|
solve bug no disppear modal presentation-upload
|
2017-10-12 21:12:00 -03:00 |
|
Joao Siebel
|
8b8456a1ac
|
Closes breakout room modal when the breakout room are closed
|
2017-10-12 19:39:03 -03:00 |
|
gcampes
|
f89e189a88
|
fixes listenonly issue
|
2017-10-12 16:22:10 -03:00 |
|
Oswaldo Acauan
|
c1ee189d57
|
Fix message propType
|
2017-10-12 16:03:48 -03:00 |
|
Oswaldo Acauan
|
b8261123d0
|
Add toast notifications
|
2017-10-12 15:53:33 -03:00 |
|
Tainan Felipe
|
4bda76c5bb
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter
|
2017-10-12 15:36:52 -03:00 |
|
gcampes
|
fafbba06cb
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
|
2017-10-12 13:58:39 -03:00 |
|
Anton Georgiev
|
4acecd358c
|
Merge pull request #4505 from OZhurbenko/merge-2.0-1.1-api
[HTML5] - Merged 2.0 and 1.1 api folders
|
2017-10-12 13:45:46 -03:00 |
|
gcampes
|
6b44504e5d
|
Adds timeout to transfer, fix css, remove logs
|
2017-10-12 11:49:50 -03:00 |
|
Anton Georgiev
|
0824bc1471
|
Merge pull request #4503 from oswaldoacauan/user-list-scroll-bg
[HTML5] Fix user-list scroll shadow and message list max height
|
2017-10-12 09:53:42 -03:00 |
|
gcampes
|
ceea7b7ed6
|
Implements audio transfer from echo test
|
2017-10-12 09:50:23 -03:00 |
|
Oleksandr Zhurbenko
|
015ca3d719
|
Changed imports and removed 'initializeCursor.js' since it's not needed
|
2017-10-11 19:00:28 -07:00 |
|
gcampes
|
3cba60201e
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
|
2017-10-11 18:22:36 -03:00 |
|
gcampes
|
f943e5dd08
|
changes error handlers in audio
|
2017-10-11 18:04:10 -03:00 |
|
Anton Georgiev
|
c06ebab63b
|
Merge pull request #4502 from KDSBrowne/z01-style-updates
[HTML5] - Update focus styles
|
2017-10-11 16:12:33 -03:00 |
|
Oleksandr Zhurbenko
|
21dcafb047
|
Fixed some of the console warning happenning when user is a moderator and he opens user-list/chat
|
2017-10-11 12:11:04 -07:00 |
|
Anton Georgiev
|
aa39361360
|
Merge pull request #4483 from OZhurbenko/presenter-functionality-2x
Fix for the Pencil Mongo additions
|
2017-10-11 15:22:39 -03:00 |
|
Oswaldo Acauan
|
34106e6de4
|
Fix user list messages max height
|
2017-10-11 15:11:48 -03:00 |
|
Tainan Felipe
|
d6a6ff5eca
|
remove .scss extension and changed path
|
2017-10-11 14:54:00 -03:00 |
|
Anton Georgiev
|
7c4e4a61d9
|
Merge pull request #4501 from antobinary/hide-lock-settings
[HTML5 client] Temporarily hide moderator view of lock settings
|
2017-10-11 14:31:23 -03:00 |
|
Oswaldo Acauan
|
2bebe4262a
|
Fix user-list scroll background
|
2017-10-11 14:28:34 -03:00 |
|
KDSBrowne
|
392d819905
|
apply new focus style to message input
|
2017-10-11 10:27:43 -07:00 |
|
Anton Georgiev
|
ac93460ba7
|
temporarily hide moderator view of lock settings
|
2017-10-11 13:51:41 -03:00 |
|
Tainan Felipe
|
c12a3f173b
|
revert modal fullscreen
|
2017-10-11 12:06:29 -03:00 |
|
Tainan Felipe
|
a667e3d05b
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter
|
2017-10-11 11:46:16 -03:00 |
|
gcampes
|
f8c50b8ef7
|
wire up audio errors to notifications. WIP
|
2017-10-11 09:05:57 -03:00 |
|
Tainan Felipe
|
50cc876cf7
|
fix errors linter
|
2017-10-10 19:08:51 -03:00 |
|
Maxim Khlobystov
|
6146f391f0
|
Made sure the locales that contain underscore are displayed properly when shown as current language in the Settings window.
|
2017-10-10 20:56:33 +00:00 |
|
gcampes
|
675c890961
|
fixes typo
|
2017-10-10 16:10:36 -03:00 |
|
gcampes
|
02cdcb2562
|
changes to styles and texts in audio flow
|
2017-10-10 15:03:29 -03:00 |
|
Tainan Felipe
|
5393051d9d
|
fix errors linter
|
2017-10-10 10:06:34 -03:00 |
|
Oleksandr Zhurbenko
|
4d8233fe10
|
Fix for the pencil Mongo additions
|
2017-10-09 18:30:29 -07:00 |
|
gcampes
|
317c3e5ee9
|
changes to bridge and audio components. WIP
|
2017-10-09 17:48:10 -03:00 |
|
Anton Georgiev
|
98e00a8056
|
Merge pull request #4464 from oswaldoacauan/qa-design
[HTML5] Fix some style issues
|
2017-10-09 14:12:13 -04:00 |
|
Oswaldo Acauan
|
d049c982a0
|
Fix user-list scroll styles
|
2017-10-06 15:11:19 -03:00 |
|
Anton Georgiev
|
bb1960ef6a
|
Merge pull request #4469 from Gcampes/fix-breakout-close
[HTML5] - Fix Breakout tab not closing
|
2017-10-06 13:56:22 -04:00 |
|
Oswaldo Acauan
|
38c8ff4abc
|
Update emoji menu to use emoji constants
|
2017-10-06 13:49:46 -03:00 |
|
Oswaldo Acauan
|
29117285ef
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into qa-design
|
2017-10-06 11:59:07 -03:00 |
|
gcampes
|
189760d393
|
fix breakout not closing on end
|
2017-10-06 11:58:21 -03:00 |
|
Anton Georgiev
|
edf569f479
|
Merge pull request #4466 from OZhurbenko/presenter-functionality-2x
HTML5 - Fix for an incorrectly displayed pop-up in the UserList
|
2017-10-06 10:00:36 -04:00 |
|
Oleksandr Zhurbenko
|
6639ee5e8e
|
Fixed incorrectly displayed dropdown in the user list, if it was scrolled down
|
2017-10-05 14:46:46 -07:00 |
|
Oswaldo Acauan
|
1e3470c136
|
Fix unread button styles
|
2017-10-05 17:49:02 -03:00 |
|
Oswaldo Acauan
|
37569a5158
|
Update more icon and rotate it 90deg
|
2017-10-05 17:21:33 -03:00 |
|
Oswaldo Acauan
|
30bf1b4425
|
Change chat-dropdown icon and vertical align it with the title
|
2017-10-05 17:13:29 -03:00 |
|
Oswaldo Acauan
|
901552abad
|
Add collapse style for system messages
|
2017-10-05 16:58:49 -03:00 |
|
Maxim Khlobystov
|
03c94bba73
|
Dropped the file extension from the stylesheet name.
|
2017-10-05 19:40:38 +00:00 |
|
Maxim Khlobystov
|
350bbdfcc9
|
Added a comment to not forget about the push notifications setting.
|
2017-10-05 19:21:57 +00:00 |
|
Maxim Khlobystov
|
a7798f6c1a
|
Fixed some ESLint errors.
|
2017-10-05 19:18:30 +00:00 |
|
Maxim Khlobystov
|
c3ba004bec
|
Hidden Push Notifications setting's UI until it is implemented.
|
2017-10-05 19:06:28 +00:00 |
|
Anton Georgiev
|
af0e0ff5a0
|
Merge pull request #4460 from KDSBrowne/xx-05-avatar-voiceUser-notification
[HTML5] Avatar indicator bug's
|
2017-10-05 13:02:13 -04:00 |
|
Oswaldo Acauan
|
360d8d12b2
|
Remove user list title
|
2017-10-05 11:52:34 -03:00 |
|
Oswaldo Acauan
|
a34ec8eb0d
|
Update chat list item text color
|
2017-10-05 11:47:35 -03:00 |
|
Oswaldo Acauan
|
0ec0121648
|
User avatar styles update
|
2017-10-05 11:43:08 -03:00 |
|
gcampes
|
40795950c2
|
updates to the audio manager
|
2017-10-04 17:49:11 -03:00 |
|
KDSBrowne
|
d4b8706926
|
fix talking style being shown when muted
|
2017-10-04 12:08:33 -07:00 |
|
Anton Georgiev
|
6b1a29eab4
|
Merge pull request #4426 from OZhurbenko/presenter-functionality-2x
HTML5 - Whiteboard/Presentation fixes, improvements, refactoring
|
2017-10-04 14:05:03 -04:00 |
|
Anton Georgiev
|
0bc3490ecc
|
Merge pull request #4419 from KDSBrowne/xx-03-kick-user-bug
[HTML5] - Handle UserEjectedFromMeetingEvtMsg
|
2017-10-04 11:47:07 -04:00 |
|
KDSBrowne
|
7225590c05
|
fix userEjected modifier and change if condition
|
2017-10-04 07:57:16 -07:00 |
|
Oleksandr Zhurbenko
|
ab95c87f48
|
Fixed wb toolbar console warnings cause by improper props validation
|
2017-10-03 14:28:44 -07:00 |
|
gcampes
|
81a430039d
|
add echo test component. WIP
|
2017-10-03 17:42:10 -03:00 |
|
KDSBrowne
|
0838e21674
|
change css classes to SASS placeholders
|
2017-10-03 11:00:04 -07:00 |
|
Oleksandr Zhurbenko
|
76bcdd55d6
|
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-10-03 10:34:10 -07:00 |
|
KDSBrowne
|
9bad8d8d5d
|
add kickVoiceUser and fix presenter assign bug
|
2017-10-03 08:25:56 -07:00 |
|
KDSBrowne
|
97aca5ee91
|
re apply userlist focus styles
|
2017-10-02 12:49:26 -07:00 |
|
KDSBrowne
|
10f95f11e1
|
fix merge conflicts
|
2017-10-02 12:37:51 -07:00 |
|
Oswaldo Acauan
|
230a2d5263
|
Fix silent changes caused by the old pr revert
|
2017-10-02 11:12:58 -03:00 |
|
gcampes
|
37456c9db4
|
updates do sip bridge
|
2017-09-29 17:42:34 -03:00 |
|
Oswaldo Acauan
|
89c2947d78
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into presentation-manager-merge
|
2017-09-29 17:32:31 -03:00 |
|
KDSBrowne
|
bc0647ad50
|
fix merge conflicts
|
2017-09-29 12:04:27 -07:00 |
|
Anton Georgiev
|
7c5683c866
|
Merge pull request #4291 from Klauswk/html5-refactor-userlist
[HTML5 2.0] Refactor UserList Components
|
2017-09-29 14:08:12 -04:00 |
|
Oswaldo Acauan
|
4063ae548b
|
Remove debug code
|
2017-09-29 14:47:16 -03:00 |
|
Oswaldo Acauan
|
f8421d4a62
|
Fix setPresentation on newly uploaded files
|
2017-09-29 14:44:18 -03:00 |
|
KDSBrowne
|
6bb93ff6fd
|
clean up css, remove duplications
|
2017-09-29 07:54:24 -07:00 |
|
Oswaldo Acauan
|
43685f84d3
|
Fix intl propType and linter
|
2017-09-29 11:03:08 -03:00 |
|
gcampes
|
6d0d6f6651
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into audio-refactor
|
2017-09-29 10:52:12 -03:00 |
|
Oswaldo Acauan
|
bb94ed6b25
|
Remove unused defaultProps
|
2017-09-29 10:51:41 -03:00 |
|
Oswaldo Acauan
|
4ac554af56
|
Fix typo
|
2017-09-29 10:51:17 -03:00 |
|
gcampes
|
d15f0e1183
|
linter autofix
|
2017-09-29 10:42:08 -03:00 |
|
gcampes
|
cbb897b23f
|
audio connects. WIP
|
2017-09-29 10:38:10 -03:00 |
|
Oswaldo Acauan
|
2a7fd5ba4d
|
Rename share method to set to match akka
|
2017-09-29 10:01:01 -03:00 |
|
Oswaldo Acauan
|
979514f7f1
|
Fix dropzone not being shown after a file drop
|
2017-09-29 09:50:20 -03:00 |
|
Oswaldo Acauan
|
d4af5bb028
|
Remove constraint for not deleting the current presentation
|
2017-09-29 09:49:42 -03:00 |
|
Oswaldo Acauan
|
15b10b2374
|
Remove constraint for not deleting the current presentation
|
2017-09-29 09:43:49 -03:00 |
|
Oswaldo Acauan
|
3e24a5e2a4
|
Update chat styles
|
2017-09-29 09:13:49 -03:00 |
|
Oswaldo Acauan
|
bcc6e20af2
|
Update system messages styles
|
2017-09-28 16:42:10 -03:00 |
|
Oswaldo Acauan
|
909af38fc3
|
Update chat notification style
|
2017-09-28 16:18:04 -03:00 |
|
Oswaldo Acauan
|
0300b854d5
|
Update emoji icon status when selected
|
2017-09-28 15:58:25 -03:00 |
|
KDSBrowne
|
9cd6b31743
|
fix focus ring for round buttons
|
2017-09-28 11:51:17 -07:00 |
|
Oswaldo Acauan
|
5f78235133
|
Update button styles
|
2017-09-28 15:32:51 -03:00 |
|
Klaus
|
b947e27086
|
Fix makeCall from component, and user.isLocked from mapUser
|
2017-09-28 15:19:57 -03:00 |
|
KDSBrowne
|
10c75afe99
|
switch handler, modifier and collection prop to ejected
|
2017-09-27 14:20:22 -07:00 |
|
Oleksandr Zhurbenko
|
6e2beab03a
|
Fixed a bug with the multi-user cursors not being displayed if there is no presenter cursor
|
2017-09-26 14:52:08 -07:00 |
|
Oleksandr Zhurbenko
|
b3723c34d4
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-09-26 14:08:41 -07:00 |
|
Anton Georgiev
|
fe7130473d
|
Merge pull request #4418 from KDSBrowne/xx-02-mute-show-bug
[HTML5] - Mute button fix
|
2017-09-26 16:30:38 -04:00 |
|
Oswaldo Acauan
|
a3f74842b4
|
Bug fixes
|
2017-09-26 16:45:33 -03:00 |
|
gcampes
|
152527d1ab
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into audio-refactor
|
2017-09-26 14:25:11 -03:00 |
|
KDSBrowne
|
32187d446a
|
rename service import and remove constants
|
2017-09-25 18:18:08 -07:00 |
|
Oleksandr Zhurbenko
|
ce04cfb83b
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-09-25 16:48:03 -07:00 |
|
Oleksandr Zhurbenko
|
f80d0bc083
|
Linting and moved whiteboard resize events into HoC
Thus we won't clutter the code with unrelated events and can easily switch to a ResizeObserver when it is implemented by the browsers
|
2017-09-25 16:45:44 -07:00 |
|
Oswaldo Acauan
|
3a4745d590
|
Fix error while changing the current presentation
|
2017-09-25 17:49:54 -03:00 |
|
gcampes
|
62fe06516f
|
Change audio modal styles and structure. WIP
|
2017-09-25 17:28:36 -03:00 |
|
KDSBrowne
|
cad085a495
|
add kicked prop
|
2017-09-25 11:38:36 -07:00 |
|
KDSBrowne
|
9a145c64a8
|
fix set properties and client kicked condition
|
2017-09-25 11:32:09 -07:00 |
|
KDSBrowne
|
00ac3b1a54
|
move functions to service and rename callback
|
2017-09-25 08:39:56 -07:00 |
|
KDSBrowne
|
baa1f0955e
|
change function signature line length
|
2017-09-25 07:13:14 -07:00 |
|
Oleksandr Zhurbenko
|
8b48dc692e
|
Bug fix for the slide pushing toolbar case in multi-user in firefox
|
2017-09-23 18:40:42 -07:00 |
|
Oleksandr Zhurbenko
|
e0a7bfc9fa
|
Refactored whiteboard-toolbar
|
2017-09-22 23:27:55 -07:00 |
|
Oswaldo Acauan
|
cca1e58167
|
Move default presentation name to config file
|
2017-09-22 17:49:11 -03:00 |
|
Oswaldo Acauan
|
43c2102adf
|
Fix conversion status messages
|
2017-09-22 17:45:31 -03:00 |
|
Oswaldo Acauan
|
36699bedb1
|
Merge remote-tracking branch 'upstream/master' into presentation-manager-merge
|
2017-09-22 15:11:48 -03:00 |
|
Klaus
|
97d2f6d3e5
|
Rollback to the right locales
|
2017-09-22 14:51:47 -03:00 |
|
Klaus
|
ccf4b1ba21
|
Fix locales problems
|
2017-09-22 14:23:25 -03:00 |
|
Klaus
|
b3dd84505e
|
Change statuses and remove .scss suffix
|
2017-09-22 14:03:14 -03:00 |
|
gcampes
|
b17f2ebe41
|
fix proptypes for intl
|
2017-09-22 11:33:12 -03:00 |
|
Klaus
|
f6e0785e6f
|
Missing relative path style
|
2017-09-22 11:31:05 -03:00 |
|
Klaus
|
4d51e0c045
|
Fix unsplited styles and code duplicated
|
2017-09-22 11:24:24 -03:00 |
|
Oleksandr Zhurbenko
|
4073501a28
|
Made actions import more clear to read
|
2017-09-21 17:18:15 -07:00 |
|
Oleksandr Zhurbenko
|
4a4a3d5574
|
Moved hex_to_int and int_to_hex functions to imports/utils
|
2017-09-21 16:52:43 -07:00 |
|
Oleksandr Zhurbenko
|
e054358947
|
Created a whiteboard config and moved static values there
|
2017-09-21 16:44:32 -07:00 |
|
Oleksandr Zhurbenko
|
d19814dc55
|
Prevented html5 from throwing exceptions if the slide file doesn't exist
|
2017-09-21 14:02:50 -07:00 |
|
gcampes
|
56e9fedb45
|
removes console.log
|
2017-09-21 15:51:58 -03:00 |
|
gcampes
|
06400c7034
|
fix breakout logout
|
2017-09-21 15:50:21 -03:00 |
|
Klaus
|
29922c896a
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-refactor-userlist
|
2017-09-21 15:40:18 -03:00 |
|
KDSBrowne
|
83adf4200f
|
remove unneeded if condition
|
2017-09-21 08:03:42 -07:00 |
|
KDSBrowne
|
c6647dfc95
|
mute button wont render for listenOnly users
|
2017-09-20 17:42:35 -07:00 |
|
Oleksandr Zhurbenko
|
a46469557f
|
Minor corrections and improvements based on the #4345 reviews
|
2017-09-20 14:34:22 -07:00 |
|
KDSBrowne
|
119fa04be1
|
remove transitions and clean up css
|
2017-09-20 14:29:43 -07:00 |
|
Oleksandr Zhurbenko
|
2b10d5c1a7
|
Fixed based on the review of #4345
|
2017-09-20 14:05:17 -07:00 |
|
KDSBrowne
|
a756b90e72
|
fix audio modal back Btn icon color
|
2017-09-20 12:52:23 -07:00 |
|
KDSBrowne
|
d25ae89dfb
|
does not show userlist border when children selected with mouse
|
2017-09-20 12:40:16 -07:00 |
|
gcampes
|
ea637a1e49
|
first changes to audio components and services. WIP
|
2017-09-19 16:31:04 -03:00 |
|
KDSBrowne
|
d7335ade60
|
move focus styles to central location
|
2017-09-19 07:44:42 -07:00 |
|
Oleksandr Zhurbenko
|
f3a17e74a8
|
Removed unused properteties from the slide object
|
2017-09-18 17:18:20 -07:00 |
|
Oleksandr Zhurbenko
|
838382b6f9
|
Moved presentation overlays' rendering to a separate function
|
2017-09-18 16:54:52 -07:00 |
|
Oleksandr Zhurbenko
|
537175dad2
|
Moved part of the presentation display calculations to the server side
|
2017-09-18 15:20:44 -07:00 |
|
Oleksandr Zhurbenko
|
c9552247b2
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-09-18 12:08:14 -07:00 |
|
KDSBrowne
|
f20f432e74
|
add focus to chat links
|
2017-09-18 09:55:10 -07:00 |
|
KDSBrowne
|
e78e59e659
|
add focus style to device selectors
|
2017-09-18 09:43:21 -07:00 |
|
KDSBrowne
|
a470bfb58f
|
add border size variable and clean up css
|
2017-09-18 09:23:15 -07:00 |
|