Richard Alam
|
84cfda3459
|
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-guest-policy
|
2017-09-27 11:32:13 -07:00 |
|
Richard Alam
|
8e7670c81d
|
- handle guest policy
|
2017-09-27 11:16:14 -07:00 |
|
Richard Alam
|
9f880655a6
|
Merge pull request #4437 from ritzalam/use-pres-checker
- point to jar dependencies
|
2017-09-26 17:34:04 -04:00 |
|
Richard Alam
|
02e2989ba2
|
- point to jar dependencies
|
2017-09-26 14:32:42 -07:00 |
|
Richard Alam
|
6d4201bac4
|
Merge pull request #4436 from ritzalam/use-pres-checker
- lower timeout timer for validation
|
2017-09-26 17:09:26 -04:00 |
|
Richard Alam
|
9d9df0eee0
|
- lower timeout timer for validation
- change location of preschecker
|
2017-09-26 14:07:51 -07:00 |
|
Anton Georgiev
|
0b6a7082ff
|
Merge pull request #4431 from OZhurbenko/slide-change-fix
HTML5 - fix for the bug with the current Slide being unset
|
2017-09-26 16:39:05 -04:00 |
|
Oleksandr Zhurbenko
|
b02cbb3208
|
Removed redundand brackets
|
2017-09-26 13:36:47 -07:00 |
|
Anton Georgiev
|
e37bf63285
|
Merge pull request #4434 from perroned/fix-demopage-typo
Fixes typo on api demo page
|
2017-09-26 16:30:54 -04:00 |
|
Anton Georgiev
|
fe7130473d
|
Merge pull request #4418 from KDSBrowne/xx-02-mute-show-bug
[HTML5] - Mute button fix
|
2017-09-26 16:30:38 -04:00 |
|
Richard Alam
|
94a1c95643
|
Merge pull request #4435 from ritzalam/use-pres-checker
Use pres checker
|
2017-09-26 16:18:13 -04:00 |
|
Richard Alam
|
67eb305552
|
- log pres checker command so we can try running on cmd line if it fails
|
2017-09-26 13:13:10 -07:00 |
|
Richard Alam
|
a124b2d0e8
|
- call presentation checker from bbb-web
|
2017-09-26 12:23:39 -07:00 |
|
perroned
|
f094e6b283
|
Fixes typo on api demo page
|
2017-09-26 14:02:49 -04:00 |
|
Richard Alam
|
1ff0ce9a1a
|
Merge pull request #4433 from ritzalam/pres-checker
- add standalone presentation checker
|
2017-09-26 13:30:10 -04:00 |
|
Richard Alam
|
0a7a90a67a
|
- add standalone presentation checker
|
2017-09-26 10:29:06 -07:00 |
|
Fred Dixon
|
ead8f766e7
|
Fixed spelling mistake
|
2017-09-25 22:25:19 -04:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|