gcampes
|
1dda597fca
|
Toast notifications on audio and overall changes
|
2017-10-18 17:40:01 -02:00 |
|
gcampes
|
d1bc675465
|
changes setdevices to bridge
|
2017-10-17 17:16:42 -02:00 |
|
gcampes
|
2ae020ba9a
|
Merge remote-tracking branch 'oswaldo/toast-notifications' into audio-refactor-notifications
|
2017-10-13 10:43:27 -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 |
|
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 |
|
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 |
|
Anton Georgiev
|
8edf6d52b7
|
Merge pull request #4507 from KDSBrowne/z03-fix-missing-enjson-strings
[HTML5] - Add missing en.json strings
|
2017-10-12 13:36:03 -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 |
|
Richard Alam
|
a8df8f3cb3
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into v2.0.x-release
|
2017-10-12 06:37:12 -07:00 |
|
Richard Alam
|
bc9f66d63b
|
Merge branch 'riadvice-2x-client-theme' into v2.0.x-release
|
2017-10-12 06:36:21 -07:00 |
|
Richard Alam
|
265dbb037b
|
Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme
|
2017-10-12 06:23:02 -07: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 |
|
Ghazi Triki
|
aa157c7e08
|
Imporve create shared notes window.
|
2017-10-11 19:19:58 -03: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 |
|
Ghazi Triki
|
94cbc5177f
|
Fix quote display when no quote is loaded from locales.
|
2017-10-11 17:23:26 -03:00 |
|
Ghazi Triki
|
83290fa384
|
Move shared notes setting button to the right.
|
2017-10-11 17:22:03 -03:00 |
|
Ghazi Triki
|
0353fa7985
|
Handle IO errors when saving files to desktop.
|
2017-10-11 17:10:51 -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 |
|
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 |
|