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 |
|
Anton Georgiev
|
8e6e450195
|
Merge pull request #4514 from OZhurbenko/merge-2.0-1.1-api
[HTML5] - Follow up on 2.0 -> 1.1 api merge
|
2017-10-12 21:17:47 -03: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
|
03be5d9e59
|
changes join listen only
|
2017-10-12 18:39:32 -03:00 |
|
gcampes
|
f89e189a88
|
fixes listenonly issue
|
2017-10-12 16:22:10 -03:00 |
|
Oleksandr Zhurbenko
|
430ddc0d3b
|
Removing unnecessary 2x from the collections, publishers, subscriptions and logs
|
2017-10-12 12:07:02 -07: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 |
|
Tainan Felipe
|
e74c44dd9d
|
fix errors linter
|
2017-10-12 14:02:46 -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 |
|
KDSBrowne
|
31b9a17e2c
|
add new line
|
2017-10-12 09:17:20 -07:00 |
|
KDSBrowne
|
5d6a273a57
|
add missing en.json strings
|
2017-10-12 09:14:05 -07:00 |
|
gcampes
|
5ad95faffc
|
changes verto bridge. WIP
|
2017-10-12 12:04:34 -03:00 |
|
gcampes
|
6b44504e5d
|
Adds timeout to transfer, fix css, remove logs
|
2017-10-12 11:49:50 -03:00 |
|
Anton Georgiev
|
af9f1e4dd3
|
Merge pull request #4506 from KDSBrowne/z01-update-locale-files
[HTML5] - add translation files from Transifex
|
2017-10-12 10:17:28 -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
|
1ec0c11fe4
|
Permissions fix
|
2017-10-11 19:01:07 -07:00 |
|
Oleksandr Zhurbenko
|
015ca3d719
|
Changed imports and removed 'initializeCursor.js' since it's not needed
|
2017-10-11 19:00:28 -07:00 |
|
Oleksandr Zhurbenko
|
70b3a14aec
|
Moved meetingDestruction to where it is supposed to be
|
2017-10-11 18:15:13 -07:00 |
|
Oleksandr Zhurbenko
|
2e61493a0c
|
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into merge-2.0-1.1-api
|
2017-10-11 18:12:09 -07:00 |
|
Oleksandr Zhurbenko
|
337f53e72b
|
Moved files up to api/
|
2017-10-11 18:09:35 -07:00 |
|
Oleksandr Zhurbenko
|
854ca6b409
|
Moved voice-users, whiteboard-multi-user, auddio and bbb
|
2017-10-11 18:07:27 -07:00 |
|
Oleksandr Zhurbenko
|
37fb59ffcc
|
Merged 2.0 and 1.1 users api
|
2017-10-11 18:02:23 -07:00 |
|
Oleksandr Zhurbenko
|
b8a4dbb278
|
Merged 2.0 and 1.1 slides api
|
2017-10-11 17:59:35 -07:00 |
|
Oleksandr Zhurbenko
|
ea029e552e
|
Adjusted naming
|
2017-10-11 17:56:34 -07:00 |
|
Oleksandr Zhurbenko
|
ad071d4edb
|
Merged 2.0 and 1.1 annotations -> shapes api
|
2017-10-11 17:52:57 -07:00 |
|
Oleksandr Zhurbenko
|
75315d5b44
|
Changed the modifier's name
|
2017-10-11 17:41:50 -07:00 |
|
Oleksandr Zhurbenko
|
0e58027486
|
Merged 2.0 and 1.1 presentations api
|
2017-10-11 17:40:51 -07:00 |
|
Oleksandr Zhurbenko
|
d2e1ab842e
|
Merged 2.0 and 1.1 polls api
|
2017-10-11 17:33:57 -07:00 |
|
Oleksandr Zhurbenko
|
82603d8ad5
|
Permissions fix
|
2017-10-11 15:18:48 -07:00 |
|
Oleksandr Zhurbenko
|
eb75c6d9fb
|
Merged 2.0 and 1.1 meetings api
|
2017-10-11 15:17:42 -07:00 |
|
Oleksandr Zhurbenko
|
48d4736c71
|
Renamed deskshare to screenshare
|
2017-10-11 14:53:02 -07:00 |
|
Oleksandr Zhurbenko
|
bfa6541f96
|
Merged 2.0 and 1.1 screenshare apis
|
2017-10-11 14:52:19 -07:00 |
|
Oleksandr Zhurbenko
|
3f8e24c12e
|
Merged 2.0 and 1.1 cursor apis
|
2017-10-11 14:34:23 -07:00 |
|
gcampes
|
79e7bc1909
|
adds missing code to bridge
|
2017-10-11 18:30:38 -03:00 |
|
Oleksandr Zhurbenko
|
47d9b53cc2
|
Merged 2.0 and 1.1 breakouts, chat, and captions
|
2017-10-11 14:25:18 -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
|
a850d1c9c1
|
Merge pull request #4494 from oswaldoacauan/redis-queue-rewrite
[HTML5] Redis class refactor
|
2017-10-11 17:40:28 -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 |
|
KDSBrowne
|
5d80b29ca5
|
add traslations from Trasifex
|
2017-10-11 12:06:33 -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 |
|
KDSBrowne
|
4a82fdf6c6
|
remove important flags and add color constant
|
2017-10-11 11:06:28 -07: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 |
|
Anton Georgiev
|
3af2969311
|
Merge pull request #4499 from antobinary/fix-emoji
[HTML5 client] Add missing states in emoji button icon change
|
2017-10-11 14:31:07 -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 |
|
Oswaldo Acauan
|
7935cbff01
|
Fix file permissions
|
2017-10-11 12:35:43 -03:00 |
|
Oswaldo Acauan
|
10fff502f7
|
Add comment about redis.js
|
2017-10-11 12:34:56 -03:00 |
|
Oswaldo Acauan
|
c08f6a9c4f
|
Fix file permissions
|
2017-10-11 12:22:08 -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 |
|
Anton Georgiev
|
3f1fd9e459
|
Merge pull request #4496 from MaximKhlobystov/underscore-locales-fix
[HTML5 Client] Fix for locales containing `_`
|
2017-10-11 10:54:08 -03:00 |
|
Anton Georgiev
|
3b8c410a3c
|
rearrange normalized emojis to match order of emoji definition
|
2017-10-11 10:09:47 -03:00 |
|
Anton Georgiev
|
50970b6cb3
|
fixes to change-emoji-button-on-emoji-change
|
2017-10-11 10:06:23 -03:00 |
|
KDSBrowne
|
a2cd4222d2
|
Merge branch 'v2.0.x-release' into z01-style-updates
|
2017-10-11 05:39:05 -07:00 |
|
gcampes
|
f8c50b8ef7
|
wire up audio errors to notifications. WIP
|
2017-10-11 09:05:57 -03:00 |
|
Anton Georgiev
|
351a0e43cb
|
Merge pull request #4470 from KDSBrowne/xx-07-allow-html5-modorator
[HTML5] -Allow HTML5 Moderator
|
2017-10-11 09:04:54 -03:00 |
|
Anton Georgiev
|
6c1526fec2
|
Merge pull request #4462 from KDSBrowne/xx-06-toggle-element-color-change
[HTML5] - Change toggle-switch on/off state colors
|
2017-10-11 08:58:57 -03:00 |
|
Oleksandr Zhurbenko
|
bbe1f99527
|
Improvements
|
2017-10-10 16:20:52 -07:00 |
|
Tainan Felipe
|
50cc876cf7
|
fix errors linter
|
2017-10-10 19:08:51 -03:00 |
|
Oleksandr Zhurbenko
|
8b5a53a59a
|
Moved pencil_chunk_size to the config
... And adjusted the way we fetch annotation statuses from the config
|
2017-10-10 14:50:11 -07: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 |
|
Oswaldo Acauan
|
3e5dacdaf1
|
Change meetingQueue delete
|
2017-10-10 15:30:45 -03:00 |
|
gcampes
|
02cdcb2562
|
changes to styles and texts in audio flow
|
2017-10-10 15:03:29 -03:00 |
|
Oswaldo Acauan
|
d8ed7e23ee
|
Remove debug message
|
2017-10-10 14:50:06 -03:00 |
|
Oswaldo Acauan
|
80a318309c
|
Implement multi queues and async messages on Redis class
|
2017-10-10 14:43:42 -03:00 |
|
Anton Georgiev
|
66f8be63d2
|
Merge pull request #4475 from oswaldoacauan/fix-token-security
[HTML5] Add a check for the passed credentials agains the token in Acl
|
2017-10-10 12:48:41 -04:00 |
|
KDSBrowne
|
d9ae121130
|
remove wrapping body in an object
|
2017-10-10 08:05:16 -07:00 |
|
Anton Georgiev
|
f50fb6aea8
|
modify format of TURN server config for webrtc
|
2017-10-10 11:12:35 -03:00 |
|
Tainan Felipe
|
5393051d9d
|
fix errors linter
|
2017-10-10 10:06:34 -03:00 |
|
KDSBrowne
|
ac4181cc09
|
change focused state border thickness to 2px
|
2017-10-10 05:47:34 -07:00 |
|
Oleksandr Zhurbenko
|
1ab85be722
|
Permissions
|
2017-10-09 18:55:53 -07:00 |
|
Oleksandr Zhurbenko
|
4d8233fe10
|
Fix for the pencil Mongo additions
|
2017-10-09 18:30:29 -07:00 |
|
gcampes
|
fae131732b
|
changes audiocontext on ios
|
2017-10-09 18:23:05 -03:00 |
|
gcampes
|
317c3e5ee9
|
changes to bridge and audio components. WIP
|
2017-10-09 17:48:10 -03:00 |
|
Oswaldo Acauan
|
96ea918919
|
Fix file permissions
|
2017-10-09 17:20:27 -03:00 |
|
Oswaldo Acauan
|
73d4607288
|
Skip checkToken in client calls
|
2017-10-09 15:53:45 -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
|
7d664c8be7
|
Add a check for the passed credentials agains the token in Acl
|
2017-10-09 09:49:07 -03:00 |
|
Anton Georgiev
|
a9e9ac31e8
|
Merge pull request #4471 from MaximKhlobystov/default-locale-setting
[HTML5] Fix for the default locale in the Settings modal's selector (a.k.a. "Bulgarian bug").
|
2017-10-06 15:18:27 -04:00 |
|
KDSBrowne
|
584f7e4bc8
|
add checks to handler
|
2017-10-06 11:12:33 -07:00 |
|
Oswaldo Acauan
|
d049c982a0
|
Fix user-list scroll styles
|
2017-10-06 15:11:19 -03:00 |
|
Maxim Khlobystov
|
d1f6d7c4e0
|
Replaced double quotes with single ones in the YAML file.
|
2017-10-06 18:05:30 +00:00 |
|
KDSBrowne
|
d89f0e511f
|
Merge branch 'v2.0.x-release' into xx-07-allow-html5-modorator
|
2017-10-06 11:02:17 -07:00 |
|
KDSBrowne
|
9da39339cd
|
remove unused checks
|
2017-10-06 10:56:56 -07: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 |
|
KDSBrowne
|
d70bfdb337
|
remove code duplication
|
2017-10-06 10:52:14 -07:00 |
|
Oswaldo Acauan
|
38c8ff4abc
|
Update emoji menu to use emoji constants
|
2017-10-06 13:49:46 -03:00 |
|
Maxim Khlobystov
|
5f79db2554
|
Fixed the issue with the Bulgarian locale always displaying as a default one in the Settings modal.
|
2017-10-06 16:29:52 +00:00 |
|
KDSBrowne
|
36ebec64c5
|
change modifier name
|
2017-10-06 09:16:55 -07:00 |
|
KDSBrowne
|
fc4b0dbcb1
|
add changeRole handler call to changeRole modifier
|
2017-10-06 09:10:23 -07:00 |
|
KDSBrowne
|
5c1ff8efbc
|
fix promoted users not being able to execute moderator actions
|
2017-10-06 08:18:27 -07: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 |
|
KDSBrowne
|
b20ab84abd
|
make changeRole.js return publishUserMessage
|
2017-10-06 06:31:56 -07:00 |
|
KDSBrowne
|
58ab2f974d
|
add missing locale string
|
2017-10-06 06:29:16 -07:00 |
|
KDSBrowne
|
4191ce56ed
|
set allowHTML5Moderator to true
|
2017-10-06 06:27:45 -07: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 |
|
KDSBrowne
|
4ac9f0de9a
|
change toggle-switch colors
|
2017-10-05 12:21:11 -07: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 |
|
KDSBrowne
|
d689e7d166
|
fix isVoiceUser prop in mappedUser service
|
2017-10-04 11:45:58 -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
|
f635dbf2ae
|
remove import and function call
|
2017-10-04 08:45:05 -07:00 |
|
KDSBrowne
|
d347864b19
|
update removeUser modifier props
|
2017-10-04 08:22:56 -07:00 |
|
KDSBrowne
|
7225590c05
|
fix userEjected modifier and change if condition
|
2017-10-04 07:57:16 -07:00 |
|
KDSBrowne
|
e241d6bf68
|
remove unused voice-user method
|
2017-10-04 07:39:13 -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 |
|
Anton Georgiev
|
7932ebd938
|
Merge pull request #4413 from KDSBrowne/x2.0.6-custom-button-focus
[HTML5] - Custom Element Focus Styles
|
2017-10-03 16:21:25 -04:00 |
|
KDSBrowne
|
83d4474b51
|
remove if statment and unused imports
|
2017-10-03 13:03:18 -07:00 |
|
KDSBrowne
|
078e8b579a
|
remove Logger messages and switch allowHTML5Moderator to false
|
2017-10-03 12:38:59 -07:00 |
|
Oswaldo Acauan
|
ef5eefc786
|
Revert wrong isLocked mapping
|
2017-10-03 16:26:32 -03:00 |
|
Oswaldo Acauan
|
32632151d5
|
Fix bug when user wasnt in voiceConf
|
2017-10-03 16:22:26 -03:00 |
|
KDSBrowne
|
af4676ea38
|
pass userId to publishUserMessage
|
2017-10-03 12:20:03 -07:00 |
|
KDSBrowne
|
2d62b79165
|
switch to correct event name
|
2017-10-03 12:12:19 -07: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
|
3eed1ec1c0
|
remove voice user check in userEjected.js
|
2017-10-03 08:45:36 -07:00 |
|
KDSBrowne
|
fdb38bb89c
|
remove console logs
|
2017-10-03 08:28:49 -07:00 |
|
KDSBrowne
|
9bad8d8d5d
|
add kickVoiceUser and fix presenter assign bug
|
2017-10-03 08:25:56 -07:00 |
|
KDSBrowne
|
67a621c6c5
|
add focus-border-offset css variable
|
2017-10-02 13:39:04 -07:00 |
|
KDSBrowne
|
0b50594b91
|
remove cal funtion
|
2017-10-02 13:36:37 -07:00 |
|
KDSBrowne
|
97aca5ee91
|
re apply userlist focus styles
|
2017-10-02 12:49:26 -07:00 |
|