Richard Alam
4717a53182
- start implementing guest policy
2017-09-22 14:24:08 -07:00
Richard Alam
f765e3f9f7
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-group-chat
2017-09-22 08:39:32 -07:00
Richard Alam
0744910fec
cleanup
2017-09-22 08:39:16 -07:00
Anton Georgiev
a356ef907c
Merge pull request #4420 from Gcampes/fix-breakout-logout
...
[HTML5] Fix breakout logout
2017-09-22 10:58:48 -04:00
gcampes
b17f2ebe41
fix proptypes for intl
2017-09-22 11:33:12 -03:00
Richard Alam
5c2e12f04f
- display chat history
2017-09-21 14:13:42 -07:00
gcampes
56e9fedb45
removes console.log
2017-09-21 15:51:58 -03:00
gcampes
06400c7034
fix breakout logout
2017-09-21 15:50:21 -03:00
Richard Alam
d118b13e24
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-group-chat
2017-09-20 13:46:22 -07:00
Richard Alam
9de9a5f624
- handle group chat message
2017-09-20 13:45:47 -07:00
Richard Alam
e8f3205683
Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf
2017-09-20 12:50:19 -07:00
Richard Alam
5ee84ae4ba
Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme
2017-09-20 12:43:37 -07:00
Richard Alam
e651785a4e
- handle group chat created msg on client
2017-09-20 11:59:33 -07:00
Anton Georgiev
90db7326b8
Merge pull request #4415 from KDSBrowne/x2.0.9-clear-chat-bug
...
[HTML5] - Fix clear chat feature
2017-09-20 14:13:05 -04:00
Richard Alam
ff23e66220
- implement create group chat handler
2017-09-20 09:04:00 -07:00
Anton Georgiev
3682eb0105
Merge pull request #4417 from antobinary/add-bowser-js
...
[HTML5 Client] Include bowser.js in html5 client for browser detection in webrtc
2017-09-20 10:28:53 -04:00
Anton Georgiev
7372d708ad
include bowser.js in html5 client for browser detection in webrtc
2017-09-20 09:59:11 -04:00
Anton Georgiev
e22da926bb
Merge pull request #4414 from KDSBrowne/x2.0.8-stun-turn-delete
...
[HTML5] - Remove requestStunTurn
2017-09-19 15:53:08 -04:00
Anton Georgiev
bf5bbb1699
Merge pull request #4345 from OZhurbenko/presenter-functionality-2x
...
HTML5 - Initial Presenter/Multi-user whiteboard support
2017-09-19 15:47:23 -04:00
KDSBrowne
2e1fb712a1
use userId instead of username
2017-09-19 12:01:02 -07:00
KDSBrowne
bd8c57eb45
remove log messages
2017-09-19 11:57:08 -07:00
KDSBrowne
6b6d431a5b
switch variable positions in object
2017-09-19 11:55:32 -07:00
Ghazi Triki
b934a3bffa
Added a new layout named "Presentation + Users"
2017-09-19 19:36:16 +01:00
KDSBrowne
9b3bb04a90
fix clear chat feature
2017-09-19 10:39:13 -07:00
Ghazi Triki
1d3fd41d5b
Update chat save format.
2017-09-19 18:30:26 +01:00
Anton Georgiev
feba68d1a9
Merge pull request #4408 from antobinary/logging-options
...
[Flash Client 2.0] Add client log on layout change
2017-09-19 13:22:29 -04:00
Richard Alam
990cf17d80
Merge branch 'antobinary-upload-token' into implement-group-chat
2017-09-19 10:12:07 -07:00
Richard Alam
5800f3b752
Merge branch 'upload-token' of https://github.com/antobinary/bigbluebutton into antobinary-upload-token
2017-09-19 10:11:09 -07:00
Richard Alam
c8de303c5c
- add message
2017-09-19 10:11:02 -07:00
Ghazi Triki
54823e8ca6
Add a new option to enable/disable quote display.
2017-09-19 18:00:37 +01:00
Ghazi Triki
97c06e2e5c
Update loading text.
2017-09-19 17:32:05 +01:00
Ghazi Triki
b40f335fe7
Select only quote in loading screen.
2017-09-19 17:07:14 +01:00
Anton Georgiev
3a9eb01bf2
missed calling the handlePresentationUploadTokenReqMsg method in merge
2017-09-19 12:06:49 -04:00
KDSBrowne
4388fc4b0f
remove requestStunTurn
2017-09-19 08:42:10 -07:00
Anton Georgiev
32398bc40e
Merge branch 'implement-group-chat' of github.com:ritzalam/bigbluebutton into pods_vol1
2017-09-19 11:41:52 -04:00
Ghazi Triki
31815b5ee0
Improved loading screen by adding quotes.
2017-09-19 15:19:56 +01:00
Oleksandr Zhurbenko
f3a17e74a8
Removed unused properteties from the slide object
2017-09-18 17:18:20 -07:00
Oleksandr Zhurbenko
838382b6f9
Moved presentation overlays' rendering to a separate function
2017-09-18 16:54:52 -07:00
Oleksandr Zhurbenko
ff4e7bffd0
Fixed a bug with the helper's import
2017-09-18 16:52:20 -07:00
Oleksandr Zhurbenko
537175dad2
Moved part of the presentation display calculations to the server side
2017-09-18 15:20:44 -07:00
Oleksandr Zhurbenko
d57f60fe09
Adjusted publish calls to #4385
2017-09-18 12:18:37 -07:00
Oleksandr Zhurbenko
c9552247b2
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-09-18 12:08:14 -07:00
Anton Georgiev
20fe6c0d46
cleanup
2017-09-18 14:38:03 -04:00
Anton Georgiev
871498dd0d
Split POST upload request into two stages at nginx
...
Subrequest goes to different endpoint on bbb-web to ensure
that the content length (passed in header) is taken under
consideration prior to uploading file
2017-09-18 14:25:00 -04:00
Anton Georgiev
d92ceee702
add default nginx config for bbb-web
2017-09-18 14:19:27 -04:00
Ghazi Triki
bd8cea8f1a
Make main tool bar fixed to the top of the application.
2017-09-18 18:27:00 +01:00
Anton Georgiev
17b4beb545
Merge pull request #4385 from KDSBrowne/x2.0.7-messages
...
[HTML5] - header functions update
2017-09-18 12:00:31 -04:00
Anton Georgiev
4a148ebfce
Merge pull request #4383 from KDSBrowne/x2.0.8-fix-undefined-chat-prop
...
[HTML5] - Fix Chat bug
2017-09-18 11:57:40 -04:00
Anton Georgiev
02fd6aafa4
add client log on layout change
2017-09-18 11:45:11 -04:00
Richard Alam
4a3afdfdc7
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-group-chat
2017-09-18 07:46:20 -07:00
