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 |
|
Ghazi Triki
|
cf4d438c64
|
Improved user experience in FileExportWindow.
|
2017-10-11 16:56:23 -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 |
|
Ghazi Triki
|
a694b95aec
|
Update shared notes exported file name.
|
2017-10-11 14:49:25 -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 |
|
Ghazi Triki
|
dc96e5b485
|
Fix chat tab close button style.
|
2017-10-11 14:13:25 -03: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 |
|
Richard Alam
|
2f0dd40d14
|
- fix jar version
|
2017-10-11 07:36:32 -07:00 |
|
Ghazi Triki
|
3c1a61751d
|
Make shared notes format button selected when the format box is visible.
|
2017-10-11 11:20:41 -03:00 |
|
Ghazi Triki
|
fe032258fd
|
Reposition firefox broswer helper for micrphone.
|
2017-10-11 10:54:59 -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 |
|