gcampes
|
c600a78fea
|
Merge remote-tracking branch 'oswaldo/toast-notifications' into audio-refactor
|
2017-10-19 09:45:06 -02:00 |
|
Oswaldo Acauan
|
27ba271f56
|
Fix condition for duplicated notification
|
2017-10-19 09:44:09 -02:00 |
|
gcampes
|
3bd709c629
|
Merge remote-tracking branch 'oswaldo/toast-notifications' into audio-refactor
|
2017-10-19 09:39:50 -02:00 |
|
Oswaldo Acauan
|
ebfed7795e
|
Add notification when recording start/stop
|
2017-10-19 08:45:07 -02:00 |
|
Oswaldo Acauan
|
cbc3ea9e36
|
Add handlers for recording messages
|
2017-10-19 08:44:41 -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 |
|
Oswaldo Acauan
|
317335d359
|
Revert caret for the react-tostify package
|
2017-10-18 17:38:53 -02:00 |
|
Joao Siebel
|
da9e2ef3a4
|
Fix function name in updateVoiceUser
|
2017-10-18 10:30:33 -02:00 |
|
gcampes
|
d1bc675465
|
changes setdevices to bridge
|
2017-10-17 17:16:42 -02:00 |
|
Oswaldo Acauan
|
c801ad8996
|
Fix the version of react-toastify util we update to react 16
|
2017-10-13 15:24:58 -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 |
|
Oswaldo Acauan
|
0dd371087b
|
Fix logClient method name
|
2017-10-13 11:49:48 -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 |
|
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 |
|