Commit Graph

18429 Commits

Author SHA1 Message Date
KDSBrowne
32187d446a rename service import and remove constants 2017-09-25 18:18:08 -07:00
Oleksandr Zhurbenko
76808b3e7d Fixed a bug with the current slide being unset 2017-09-25 17:00:08 -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
Richard Alam
4804d69a62 - reject user on enter api if guest has been denied 2017-09-25 14:29:02 -07:00
Richard Alam
e062e42cd0 - implement redirect of client to guest waiting 2017-09-25 14:12:54 -07:00
Oswaldo Acauan
3a4745d590 Fix error while changing the current presentation 2017-09-25 17:49:54 -03: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
Anton Georgiev
6d4fa587c8 work on add and remove presentation pods 2017-09-25 14:58:11 -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
KDSBrowne
00ac3b1a54 move functions to service and rename callback 2017-09-25 08:39:56 -07:00
Ghazi Triki
0728ba8ae3 Minor text updates for LoadingBar and QuotesView. 2017-09-25 15:29:48 +01:00
KDSBrowne
baa1f0955e change function signature line length 2017-09-25 07:13:14 -07:00
Richard Alam
df255c154b - init guest status when joining 2017-09-22 14:53:37 -07:00
Richard Alam
4717a53182 - start implementing guest policy 2017-09-22 14:24:08 -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
Oswaldo Acauan
cca1e58167 Move default presentation name to config file 2017-09-22 17:49:11 -03:00
Oswaldo Acauan
43c2102adf Fix conversion status messages 2017-09-22 17:45:31 -03:00
Oswaldo Acauan
dd83d213fa Fix missing conversion handlers 2017-09-22 17:43:07 -03: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
Oswaldo Acauan
36699bedb1 Merge remote-tracking branch 'upstream/master' into presentation-manager-merge 2017-09-22 15:11:48 -03: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
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
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
Richard Alam
5c2e12f04f - display chat history 2017-09-21 14:13:42 -07:00
Anton Georgiev
9283c342b7 add a default presentation pod on present module load 2017-09-21 15:30:39 -04: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
83adf4200f remove unneeded if condition 2017-09-21 08:03:42 -07:00