Richard Alam
|
aefb9a29f6
|
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf
|
2017-09-22 14:14:58 -07:00 |
|
Richard Alam
|
455fcfafb3
|
Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf
|
2017-09-22 14:14:33 -07:00 |
|
Fred Dixon
|
936d313daa
|
Merge pull request #4422 from riadvice/2x-client-theme
[Flash 2.0] - Add quote attribution
|
2017-09-22 15:59:33 -04:00 |
|
Klauswk
|
22da4648b9
|
Update en.json
|
2017-09-22 14:55:05 -03:00 |
|
Ghazi Triki
|
57a40cdf52
|
Add attribution to quotes.
|
2017-09-22 18:54:32 +01:00 |
|
Klaus
|
97d2f6d3e5
|
Rollback to the right locales
|
2017-09-22 14:51:47 -03:00 |
|
Anton Georgiev
|
76ff1b2552
|
Merge pull request #4371 from oswaldoacauan/presentation-uploader-2x
[HTML5 2.0] Presentation Manager
|
2017-09-22 13:27:54 -04:00 |
|
Klaus
|
ccf4b1ba21
|
Fix locales problems
|
2017-09-22 14:23:25 -03:00 |
|
Ghazi Triki
|
fa24b10a34
|
Updated office document error message to be helpful for users.
|
2017-09-22 18:05:58 +01:00 |
|
Klaus
|
b3dd84505e
|
Change statuses and remove .scss suffix
|
2017-09-22 14:03:14 -03:00 |
|
Richard Alam
|
47c5f962d7
|
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf
|
2017-09-22 10:02:55 -07:00 |
|
Richard Alam
|
29facc2efa
|
Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf
|
2017-09-22 10:02:07 -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 |
|
Klaus
|
f6e0785e6f
|
Missing relative path style
|
2017-09-22 11:31:05 -03:00 |
|
Klaus
|
4d51e0c045
|
Fix unsplited styles and code duplicated
|
2017-09-22 11:24:24 -03:00 |
|
Ghazi Triki
|
9b997392f0
|
Added new logoutTImer feature.
|
2017-09-21 20:12:59 +01: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 |
|
Klaus
|
29922c896a
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-refactor-userlist
|
2017-09-21 15:40:18 -03:00 |
|
KDSBrowne
|
b35b16f642
|
rename functions to past tense
|
2017-09-21 10:55:07 -07:00 |
|
KDSBrowne
|
30da581d6d
|
rename user prop to match 2.x
|
2017-09-21 10:50:06 -07:00 |
|
KDSBrowne
|
b988dadf89
|
switch relative with absolute import path
|
2017-09-21 10:40:19 -07:00 |
|
KDSBrowne
|
93d7c9f4ce
|
change variable declaration
|
2017-09-21 10:21:25 -07:00 |
|
KDSBrowne
|
8418317e03
|
handle UserEjectedFromMeetingEvtMsg
|
2017-09-21 09:21:42 -07:00 |
|
KDSBrowne
|
83adf4200f
|
remove unneeded if condition
|
2017-09-21 08:03:42 -07:00 |
|
KDSBrowne
|
c6647dfc95
|
mute button wont render for listenOnly users
|
2017-09-20 17:42:35 -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 |
|
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 |
|
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 |
|
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 |
|
KDSBrowne
|
4388fc4b0f
|
remove requestStunTurn
|
2017-09-19 08:42:10 -07: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 |
|