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
a26f622ba9
gets audio to work
2017-09-29 10:58:13 -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
KDSBrowne
b26b1973f7
add new line to end of file
2017-09-26 13:53:59 -07:00
KDSBrowne
ad1b2b930c
remove variable duplication
2017-09-26 13:45:38 -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
f385103935
add new line to end of file
2017-09-19 07:55:46 -07:00
KDSBrowne
beff9626bc
remove duplicate variable
2017-09-19 07:54:03 -07:00
KDSBrowne
44e2a948eb
clean up css
2017-09-19 07:51:18 -07: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
Oleksandr Zhurbenko
9e1c8a4fb7
Permissions fix
...
Can't afford WebStorm :-(
2017-09-17 19:01:48 -07:00
Oleksandr Zhurbenko
c7d737e9b8
Improvements based on the PR review
2017-09-17 18:58:37 -07:00
KDSBrowne
ae443a8430
add custom focus to select elements
2017-09-15 12:25:45 -07:00
KDSBrowne
b88179a9e7
remove outline from fullscreen modal
2017-09-15 11:29:56 -07:00
KDSBrowne
bc48e7352d
remove transition, switch color code to variable
2017-09-15 11:05:24 -07:00
KDSBrowne
69c2b195f5
remove css important rule
2017-09-15 09:00:11 -07:00
KDSBrowne
2815cf9ce1
add custom focus styles
2017-09-15 08:12:58 -07:00
KDSBrowne
72acea229b
remove single quotes from variable
2017-09-12 10:01:07 -07:00
Oleksandr Zhurbenko
43b3b89c6a
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-09-11 12:11:03 -07:00
Anton Georgiev
bf35fa7a4c
Merge pull request #4354 from KDSBrowne/x2.0.1-fix-lock-issue-userlist
...
[HTML5] - Fix Userlist Lock Notification
2017-09-11 12:07:17 -04:00
KDSBrowne
eeb878649a
remove single quotes from variable
2017-09-11 06:42:56 -07:00
KDSBrowne
ef6d3059a7
fix lint issue
2017-09-07 12:06:48 -07:00
Oswaldo Acauan
c0307e36a6
Presentation Uploader to 2.0
2017-09-07 15:18:14 -03:00
KDSBrowne
13e6357b19
fix line endings
2017-09-07 07:31:19 -07:00
KDSBrowne
5a6183dc34
fix undefined check
2017-09-06 12:57:24 -07:00
KDSBrowne
9193ae8849
handle UserLockedInMeetingEvtMsg
2017-09-06 12:53:07 -07:00
Oleksandr Zhurbenko
251bd22738
PR review fixes
2017-09-06 12:36:52 -07:00
KDSBrowne
31cf7aea42
check for specific meeting id
2017-09-06 11:32:29 -07:00
KDSBrowne
fd9a4cd98e
fix bug in undefined check
2017-09-06 11:13:24 -07:00
KDSBrowne
d34f138b56
check if lock settings are undefined
2017-09-06 10:50:48 -07:00
KDSBrowne
572bb0b8d3
remove ternary operation
2017-09-06 09:08:26 -07:00
Oleksandr Zhurbenko
9ee75331bf
Removed an unnecessary rule
2017-09-05 19:02:23 -07:00
Oleksandr Zhurbenko
65da71c12a
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-09-05 18:53:51 -07:00
Oleksandr Zhurbenko
3014b26439
PR review fixes
2017-09-05 18:36:15 -07:00
Oleksandr Zhurbenko
b12e0b84a9
Using previously saved draw settings for the initial wb toolbar values
2017-09-05 15:55:18 -07:00
Oleksandr Zhurbenko
3c750575cf
Fixed font-size normalization for the text-shape
2017-09-05 15:47:13 -07:00
Anton Georgiev
a68222dfff
Merge pull request #4181 from JaeeunCho/destroy_meeting_users
...
[HTML5 2.0] End meeting by moderator
2017-09-05 09:54:19 -04:00
Anton Georgiev
50c7974a30
Merge pull request #4323 from KDSBrowne/x2.0-replace-getElementById-instances
...
[HTML5] - Replace Instances of getElementById
2017-09-05 09:51:57 -04:00
JaeeunCho
7a01c61639
fixed isModerator()
2017-09-01 13:00:55 -07:00
JaeeunCho
99ea26c584
added isModerator at service.js
2017-09-01 12:37:14 -07:00
JaeeunCho
ede90b8a40
removed unused line at css
2017-09-01 11:39:17 -07:00
JaeeunCho
43f6fd9c03
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users
2017-09-01 11:22:45 -07:00
Anton Georgiev
d60e06e28f
Merge pull request #4221 from JaeeunCho/change_localeId_to_camelCase
...
[HTML5] changed string id to camelCase
2017-09-01 10:05:50 -04:00
Oleksandr Zhurbenko
2a91c6aa0b
Fixed a bug initial cursor/shape coordinates on page zooming
2017-08-31 18:42:00 -07:00
KDSBrowne
b20859d1c9
fix chat being locked for moderators
2017-08-31 14:49:13 -07:00
KDSBrowne
7a9cb7d04f
fix the disabling of chat when locked
2017-08-31 14:29:18 -07:00
KDSBrowne
94e44d6a23
remove unused prop
2017-08-31 13:50:20 -07:00
KDSBrowne
a404cc14d1
remove space typo
2017-08-31 13:47:06 -07:00
KDSBrowne
2f9d4bcc0e
move isMeetingLocked condition check to userlist service
2017-08-31 11:12:53 -07:00
Klaus
5bba87525e
Fix navigation error mention by kert
2017-08-31 14:03:40 -03:00
Oswaldo Acauan
6070a4ea25
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into presentation-uploader-2x
2017-08-31 09:49:59 -03:00
Oleksandr Zhurbenko
28f7f8ad11
Minor fixes and adjustments
2017-08-30 16:12:03 -07:00
Oleksandr Zhurbenko
e4c4f4584d
Prevented publishing messages on random clicks for common shapes, and enabled that for pencil
2017-08-30 13:45:47 -07:00
KDSBrowne
a01451f9fd
handle LockSettingsInMeetingChangedEvtMsg and fix userlistitem lock notification
2017-08-30 11:00:56 -07:00
Oleksandr Zhurbenko
f78283a17d
Fixes
...
Hide wb toolbar when there is no slide; fixed cursor's text clipping; fixed exceptions thrown on 'Clear All' by reactive-annotation container; fixed shapes' thickness scaling on zoom; fixed dimensions' data types sent to akka (it doesn't accept Doubles)
2017-08-29 18:43:55 -07:00
KDSBrowne
b2fcfef145
move if condition
2017-08-29 16:26:43 -07:00
Oleksandr Zhurbenko
e1cf0ad9d5
Rewrite of the cursor component
2017-08-29 13:58:48 -07:00
KDSBrowne
126f4589e1
move if conditions
2017-08-29 12:31:09 -07:00
KDSBrowne
20316be90f
add suggested changes
2017-08-29 12:25:01 -07:00
KDSBrowne
7271be05f8
remove getElementById usage in message-list-item component
2017-08-28 08:30:50 -07:00
KDSBrowne
24bdb2d000
remove getElementById usage in message component
2017-08-28 08:30:50 -07:00
Oleksandr Zhurbenko
5d2b215591
Added timers for the pencil and shape draw listeners and fixed a bug with clearing the Annotations collection
2017-08-27 01:12:27 -07:00
Oleksandr Zhurbenko
1a92a7f6a1
Changed annotations' rendering, refactored draw listeners, adjusted permissions for the publishAnnotation
2017-08-25 15:45:06 -07:00
Oleksandr Zhurbenko
f533b25d69
Improved whiteboard-toolbar and fixed linter warnings
2017-08-24 16:47:20 -07:00
Klaus
4cd5bd26bb
Fix WAI-ARIA and lint
2017-08-24 10:15:11 -03:00
Oleksandr Zhurbenko
f3481a7e4b
Turned on multi-user drawings
2017-08-23 21:27:41 -07:00
Oleksandr Zhurbenko
321b47abd1
Fixed pencil and text draw listeners for presenters
2017-08-23 20:35:34 -07:00
Klaus
d2b39be2d3
Move the userlist stuff to the right folder
2017-08-23 15:03:50 -03:00
Klaus
bbe4afe3f2
Change jeeung's code to match the rest of code
2017-08-23 14:19:01 -03:00
Klaus
ec458d1b55
Refactor user list
2017-08-23 13:29:21 -03:00
Oleksandr Zhurbenko
af558ff61d
Fixed cursor's rendering including smoothing; adjusted cursor's label
2017-08-22 13:20:12 -07:00
Klaus
43d1b0c8d5
Merge remote-tracking branch 'jeeung/implement_set_promote_demote' into html5-refactor-userlist
2017-08-22 15:39:34 -03:00
Klaus
585a079794
Refactor chat list
2017-08-22 10:32:58 -03:00
JaeeunCho
c51764c7f6
changed name to val
2017-08-21 13:04:38 -07:00
JaeeunCho
baa5d519f1
added text-ellipsis and max-width
2017-08-21 10:29:01 -07:00
Oleksandr Zhurbenko
6a04851469
Fixed all the eslint errors under components/presentation
2017-08-20 17:16:39 -07:00
Oleksandr Zhurbenko
aa68421462
Fixed most of lint errors under components/whiteboard
...
Except annotation group, which will be changed soon
2017-08-19 23:32:01 -07:00
Oleksandr Zhurbenko
d5f07a574c
Fixed publishShape message for 4 common shapes
...
Line, Rectangle, Triangle, Ellipse
2017-08-18 19:47:31 -07:00
JaeeunCho
73b6054b42
[HTML5] implemented promote/demote user
2017-08-18 11:23:05 -07:00
Klaus
4fa10ec656
Add proptypes and a few more refactors
2017-08-17 11:18:02 -03:00
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
Klaus
c87f3054b9
Remove user-actions
2017-08-16 17:25:53 -03:00
Klaus
c32a64c02d
a few refactor made
2017-08-16 11:56:31 -03: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
JaeeunCho
ab81ebfcfd
added new line at the end of service.js
2017-08-14 13:05:59 -07:00
JaeeunCho
11d181327c
created service.js moved makeCall to service.js
2017-08-14 13:03:37 -07:00
Klaus
dc62d15ad0
Change variable name
2017-08-14 16:19:35 -03:00
JaeeunCho
237d1b6ac3
divided code into new container.jsx
2017-08-11 13:32:33 -07: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
JaeeunCho
b20ea78e2a
fixed conflict
2017-08-10 14:34:21 -07:00
JaeeunCho
8607eff5d6
changed fullScreen to fullscreen
2017-08-10 12:09:16 -07:00
JaeeunCho
3f773684bc
[HTML5] changed string id to camelCase
2017-08-10 10:34:34 -07:00
JaeeunCho
405ead47c2
added new line at styles.scss
2017-08-08 15:29:22 -07:00
JaeeunCho
33f0104b5a
changed logout confirmation
2017-08-08 15:27:34 -07:00
Oleksandr Zhurbenko
f90a1d446f
Made whiteboard-toolbar display when multi-user mode is on
2017-08-08 13:55:38 -07:00
JaeeunCho
8590d2f414
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users
2017-08-08 12:31:56 -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
78e88c8189
Fix unread counter
2017-08-04 15:20:54 -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
JaeeunCho
e663458d01
added div for description
2017-08-01 09:17:03 -07:00
JaeeunCho
08818948ac
changed logout-confirmation and en.json
2017-08-01 09:09:06 -07:00
JaeeunCho
e4f94f1d91
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users
2017-08-01 08:55:02 -07:00
JaeeunCho
04636ca25b
[HTML5] added endMeeting by moderator
2017-08-01 08:53:05 -07: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
Anton Georgiev
dbcf6dbd2c
screenshare displays except at refresh
2017-07-26 09:18:15 -04:00
Oleksandr Zhurbenko
6ea4d39da9
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-07-25 15:08:29 -07: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
b1bb4a6866
Flat poll
2017-07-25 09:26:45 -03:00
Oleksandr Zhurbenko
5aed767436
Moved SwitchSlide method to 2.0
2017-07-24 14:04:49 -07: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
b7d6427e63
rename deskshare to screenshare and adjust condition for viewing
2017-07-24 15:29:34 -04:00
Klaus
97b38fb0e6
Presentation reflects akkaApps
2017-07-24 15:46:53 -03: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
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
Matthew Marangoni
f521ef0402
Merge remote-tracking branch 'upstream/master' into call-manager
2017-07-19 11:55:45 -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
Oswaldo Acauan
507bb61fb2
Change user-list width
2017-07-18 10:55:19 -03:00
Oswaldo Acauan
dbb6b5cd12
New user-list colors
2017-07-18 10:12:26 -03:00
Oleksandr Zhurbenko
a03ff03a84
Fixed shape's thickness
2017-07-17 16:41:07 -07:00
Oleksandr Zhurbenko
23263c997b
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-07-17 16:01:05 -07: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
Klaus
2343ef3f1f
Add missing merge file
2017-07-17 13:38:18 -03:00
Klaus
3af281d648
Merge remote-tracking branch 'upstream/master' into merge-master-mconf
2017-07-17 13:33:45 -03:00
Oleksandr Zhurbenko
1508ed566c
Resolved some of the issues related to the 2.0 switch
2017-07-14 16:20:16 -07:00
