BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,231 Commits 13 Branches 260 Tags 1.1 GiB
ce04cfb83b
Commit Graph

18231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleksandr Zhurbenko
ce04cfb83b Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-25 16:48:03 -07:00
Oleksandr Zhurbenko
f80d0bc083 Linting and moved whiteboard resize events into HoC 
Thus we won't clutter the code with unrelated events and can easily switch to a ResizeObserver when it is implemented by the browsers
 2017-09-25 16:45:44 -07:00
Fred Dixon
02e8d40cc5 Merge pull request #4430 from riadvice/2x-client-theme 
Replace AdvancedLabel base class by MX Text instead of Sparl Label.
 2017-09-25 18:23:59 -04:00
Ghazi Triki
a124ba64af Replace AdvancedLabel base class by MX Text instead of Sparl Label. 2017-09-25 21:28:55 +01:00
Anton Georgiev
91f912ce4b Merge pull request #4416 from OZhurbenko/mongo-indexing 
Added indexes for the html5 Mongo collections
 2017-09-25 15:57:07 -04:00
Richard Alam
ba2b9b0bc5 Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-09-25 11:46:31 -07:00
Richard Alam
fb0a9568cd Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-09-25 11:40:41 -07:00
Ghazi Triki
e3fd1b4019 Updated file upload hint message. 2017-09-25 19:38:57 +01:00
Ghazi Triki
d57b3f42d9 Revert to the initial tunelling error for desktop sharing. 2017-09-25 19:16:13 +01:00
Ghazi Triki
507d8662ee Check screen share tunelling and update error message. 2017-09-25 19:08:28 +01:00
Anton Georgiev
2f2114c590 Merge pull request #4428 from antobinary/screenshare-logs 
[Flash Client 2.0] Log unnatural end of screenshare
 2017-09-25 13:24:12 -04:00
Anton Georgiev
89938dd1d4 log unnatural end of screenshare 2017-09-25 13:16:35 -04:00
Ghazi Triki
0728ba8ae3 Minor text updates for LoadingBar and QuotesView. 2017-09-25 15:29:48 +01:00
Oleksandr Zhurbenko
8b48dc692e Bug fix for the slide pushing toolbar case in multi-user in firefox 2017-09-23 18:40:42 -07:00
Oleksandr Zhurbenko
e0a7bfc9fa Refactored whiteboard-toolbar 2017-09-22 23:27:55 -07:00
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
Ghazi Triki
57a40cdf52 Add attribution to quotes. 2017-09-22 18:54:32 +01:00
Ghazi Triki
fa24b10a34 Updated office document error message to be helpful for users. 2017-09-22 18:05:58 +01: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
Oleksandr Zhurbenko
4073501a28 Made actions import more clear to read 2017-09-21 17:18:15 -07:00
Oleksandr Zhurbenko
4a4a3d5574 Moved hex_to_int and int_to_hex functions to imports/utils 2017-09-21 16:52:43 -07:00
Oleksandr Zhurbenko
e054358947 Created a whiteboard config and moved static values there 2017-09-21 16:44:32 -07:00
Oleksandr Zhurbenko
d19814dc55 Prevented html5 from throwing exceptions if the slide file doesn't exist 2017-09-21 14:02:50 -07: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
Oleksandr Zhurbenko
a46469557f Minor corrections and improvements based on the #4345 reviews 2017-09-20 14:34:22 -07:00
Oleksandr Zhurbenko
2b10d5c1a7 Fixed based on the review of #4345 2017-09-20 14:05:17 -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