Commit Graph

18214 Commits

Author SHA1 Message Date
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
Klaus
29922c896a Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-refactor-userlist 2017-09-21 15:40:18 -03: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
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
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
455915cdb0 Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-09-18 07:29:42 -07:00
Ghazi Triki
9251114bed Show between 3 and 6 files in uploaded presentations list. 2017-09-18 15:11:36 +01:00
Ghazi Triki
a702ba076d Wider media column. 2017-09-18 14:25:16 +01:00
Ghazi Triki
1d2fab5a84 Dot not display microphone button above webcam when the user is in listenOnly mode. 2017-09-18 08:57:44 +01:00
Ghazi Triki
88722cfef5 Clean up flex imports. 2017-09-18 08:51:08 +01:00
Ghazi Triki
6400c5f2f4 Fixed audio windows labels. 2017-09-18 07:36:33 +01:00
Oleksandr Zhurbenko
9e1c8a4fb7 Permissions fix
Can't afford WebStorm :-(
2017-09-17 19:01:48 -07:00
Oleksandr Zhurbenko
c7d737e9b8 Improvements based on the PR review 2017-09-17 18:58:37 -07:00
Ghazi Triki
8aea9bc85b Better visibility management for presentation buttons and fix poll choices box to get full width. 2017-09-15 22:26:48 +01:00
Fred Dixon
23b5a2de65 Merge pull request #4406 from joshua-arts/fix-getRecordings-prettyprint
Convert getRecordings XML to a String.
2017-09-15 12:30:48 -04:00
Josh
7a3a5dbadc convert to string 2017-09-15 12:27:46 -04:00
Fred Dixon
143d23ed8f Merge pull request #4403 from joshua-arts/fix-getRecordings-prettyprint
No longer pretty print when generating getRecordings XML.
2017-09-15 11:57:35 -04:00
Fred Dixon
1030844aa5 Merge pull request #4404 from riadvice/2x-client-theme
Set rtlEnabled to false by default
2017-09-15 11:57:14 -04:00
Ghazi Triki
1b5133a959 Set rtlEnabled to false by default and clean up unused config.xml properties. 2017-09-15 16:52:21 +01:00
Josh
1b08b26113 fix conflicts 2017-09-15 11:48:31 -04:00
Josh
ace8eac1cf no longer pretty print getRecordings response 2017-09-15 11:40:26 -04:00
Fred Dixon
ff6d2ca5bc Merge pull request #4402 from riadvice/2x-client-theme
[Flash 2.0] - Fix window title truncation issue
2017-09-15 09:56:20 -04:00
Ghazi Triki
1b2d228647 Update spark labels to have fixed width in pixels making word wrapping work correctly. 2017-09-15 14:36:13 +01:00