Richard Alam
4ad3b30fff
Merge pull request #4511 from kepstin/bbb-20-rec-fixes
...
Handle out of order inserts at the start of a caption stream.
2017-10-12 15:20:01 -04:00
Richard Alam
6cebf50725
Merge branch 'capilkey-fix-whiteboard-click-through' into v2.0.x-release
2017-10-12 12:18:57 -07:00
Richard Alam
a374b61245
Merge branch 'fix-whiteboard-click-through' of https://github.com/capilkey/bigbluebutton into capilkey-fix-whiteboard-click-through
2017-10-12 12:11:00 -07: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
Richard Alam
efc8055041
Merge pull request #4512 from ritzalam/synch-with-2.0.x-release
...
Synch with 2.0.x release
2017-10-12 14:57:48 -04:00
Richard Alam
86a6881d93
Merge branch 'client-pdf-export' of https://github.com/riadvice/bigbluebutton into synch-with-2.0.x-release
2017-10-12 11:55:52 -07: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
Richard Alam
53f1225c32
Merge branch 'v2.0.x-release' into synch-with-2.0.x-release
2017-10-12 11:32:54 -07:00
Ghazi Triki
99e55b000a
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into client-pdf-export
...
# Conflicts:
# bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
# bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
2017-10-12 15:21:22 -03:00
Calvin Walton
b2f8c80202
Handle out of order inserts at the start of a caption stream.
...
If you're inserting at position 0 (and there was no previous deleted text
from that position), you can't use the timestamp from the previous character
position, since there's no previous character. Use the timestamp of the
following character instead.
2017-10-12 14:16:34 -04:00
Richard Alam
532195dc21
Merge branch 'riadvice-2x-ui-improve' into v2.0.x-release
2017-10-12 10:07:30 -07:00
Richard Alam
047b5a5a11
Merge branch '2x-ui-improve' of https://github.com/riadvice/bigbluebutton into riadvice-2x-ui-improve
2017-10-12 10:02:50 -07:00
Tainan Felipe
e74c44dd9d
fix errors linter
2017-10-12 14:02:46 -03:00
Richard Alam
1383a52e7f
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into v2.0.x-release
2017-10-12 09:57:25 -07:00
Richard Alam
626faeb110
Merge branch 'riadvice-native-locale-name' into v2.0.x-release
2017-10-12 09:56:11 -07: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
Richard Alam
0d7fd28513
Merge branch 'native-locale-name' of https://github.com/riadvice/bigbluebutton into riadvice-native-locale-name
2017-10-12 09:44:44 -07:00
Ghazi Triki
2f5c6091bb
Less spacing between user renderers buttons to avoid showing the horizontal scroll bar while displaying on small screens.
2017-10-12 13:36:18 -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
Ghazi Triki
2c7d910d83
Display native locale name in LanguageSelector menu.
2017-10-12 13:27:55 -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
Richard Alam
1e63904b37
Merge pull request #4500 from ritzalam/upgrade-master-to-latest-red5
...
Upgrade master to latest red5
2017-10-12 09:44:58 -04: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
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
Oleksandr Zhurbenko
47d9b53cc2
Merged 2.0 and 1.1 breakouts, chat, and captions
2017-10-11 14:25:18 -07:00
