Richard Alam
|
f6a993763c
|
- remove users from guests waiting list
|
2017-09-29 10:32:05 -07:00 |
|
Ghazi Triki
|
f15da651c8
|
Correctly display users breakout rooms in users list.
|
2017-09-29 18:24:17 +01:00 |
|
Fred Dixon
|
67aec4e814
|
Testing builds after the switch to v2.0.x-release
|
2017-09-29 13:10:05 -04:00 |
|
Richard Alam
|
ffb58bf086
|
Merge pull request #4443 from ritzalam/merge-2x-mconf-to-master
Merge 2x-mconf branch into master
|
2017-09-29 12:55:22 -04:00 |
|
Richard Alam
|
7837631b88
|
- approve guest access
|
2017-09-29 09:38:20 -07:00 |
|
KDSBrowne
|
b2d78b4f8a
|
remove unused callback function
|
2017-09-29 09:21:04 -07:00 |
|
Richard Alam
|
a2d403e9fd
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merge-2x-mconf-to-master
|
2017-09-29 08:41:30 -07:00 |
|
Anton Georgiev
|
35ed73c9ae
|
Merge pull request #4442 from bigbluebutton/revert-4371-presentation-uploader-2x
Revert "[HTML5 2.0] Presentation Manager"
|
2017-09-29 11:38:20 -04:00 |
|
Anton Georgiev
|
dbd00f3445
|
Revert "[HTML5 2.0] Presentation Manager"
|
2017-09-29 11:35:05 -04:00 |
|
Oswaldo Acauan
|
c186840c3c
|
Fix current presentation being unset
|
2017-09-29 11:13:54 -03:00 |
|
Oswaldo Acauan
|
0e10fa2aa6
|
Fix typo
|
2017-09-29 11:10:35 -03:00 |
|
Oswaldo Acauan
|
43685f84d3
|
Fix intl propType and linter
|
2017-09-29 11:03:08 -03:00 |
|
Oswaldo Acauan
|
bb94ed6b25
|
Remove unused defaultProps
|
2017-09-29 10:51:41 -03:00 |
|
Oswaldo Acauan
|
4ac554af56
|
Fix typo
|
2017-09-29 10:51:17 -03:00 |
|
Oswaldo Acauan
|
19e3075dec
|
Add missing body check
|
2017-09-29 10:50:46 -03:00 |
|
Oswaldo Acauan
|
a5135f28e6
|
Renamte presentationChange handler
|
2017-09-29 10:50:05 -03:00 |
|
Oswaldo Acauan
|
c8042ce65b
|
Rename handlers from change to set to match akka
|
2017-09-29 10:42:17 -03:00 |
|
Oswaldo Acauan
|
54efe44345
|
Rename share method to set to match akka
|
2017-09-29 10:29:55 -03:00 |
|
Oswaldo Acauan
|
2a7fd5ba4d
|
Rename share method to set to match akka
|
2017-09-29 10:01:01 -03:00 |
|
Oswaldo Acauan
|
979514f7f1
|
Fix dropzone not being shown after a file drop
|
2017-09-29 09:50:20 -03:00 |
|
Oswaldo Acauan
|
d4af5bb028
|
Remove constraint for not deleting the current presentation
|
2017-09-29 09:49:42 -03:00 |
|
Oswaldo Acauan
|
7f5d5b8064
|
Change defaultFileName check to match config
|
2017-09-29 09:44:36 -03:00 |
|
Oswaldo Acauan
|
15b10b2374
|
Remove constraint for not deleting the current presentation
|
2017-09-29 09:43:49 -03:00 |
|
Oswaldo Acauan
|
bc6283e722
|
Remove constraint for not deleting the current presentation
|
2017-09-29 09:41:45 -03:00 |
|
Oswaldo Acauan
|
27b89361c0
|
Add missing check
|
2017-09-29 09:40:40 -03:00 |
|
Oswaldo Acauan
|
e699c342b6
|
Add missing suported mimes
|
2017-09-29 09:31:38 -03:00 |
|
Richard Alam
|
6e6bdd908c
|
- handle guest approval
|
2017-09-28 17:57:06 -07:00 |
|
Richard Alam
|
032562eab8
|
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-guest-policy
|
2017-09-28 16:58:03 -07:00 |
|
Richard Alam
|
e849e1b5ee
|
- approve guest user
|
2017-09-28 16:56:33 -07:00 |
|
Fred Dixon
|
45c972cb2f
|
Merge pull request #4441 from kepstin/bbb-20-rec-fixes
Don't crash playback if text is not available for a slide.
|
2017-09-28 15:01:49 -04:00 |
|
Calvin Walton
|
3307fab99c
|
Don't crash playback if text is not available for a slide.
This happens when the slide is a plain image, for example.
Fixes #4425
|
2017-09-28 14:34:19 -04:00 |
|
Klaus
|
b947e27086
|
Fix makeCall from component, and user.isLocked from mapUser
|
2017-09-28 15:19:57 -03:00 |
|
Richard Alam
|
5546b6b2ea
|
Merge pull request #4440 from ritzalam/pool-office-manager
- manage a pool of libre office instances so we can process multiple…
|
2017-09-28 13:05:54 -04:00 |
|
Richard Alam
|
c1a98bd3a5
|
- manage a pool of libre office instances so we can process multiple docs at the same time
|
2017-09-28 10:00:47 -07:00 |
|
Anton Georgiev
|
543ef3830a
|
Merge pull request #4439 from antobinary/present-fail-log
[Flash Client 2.0] Add log for invalid or failed presentation conversion
|
2017-09-28 11:21:20 -04:00 |
|
Anton Georgiev
|
b4b183ce7f
|
add log for inavlid or failed presentation conversion
|
2017-09-28 10:52:10 -04:00 |
|
Richard Alam
|
9d73600930
|
- send guest approval message from client to server
|
2017-09-27 13:30:45 -07:00 |
|
Richard Alam
|
fe44a79298
|
- send guest waiting message to client
|
2017-09-27 12:48:30 -07:00 |
|
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 |
|
KDSBrowne
|
3633b460d4
|
clean up code with suggestion
|
2017-09-27 08:03:31 -07:00 |
|
KDSBrowne
|
3e7aab2bdd
|
add http:// to logoutURL if its not there
|
2017-09-27 06:56:40 -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 |
|
Anton Georgiev
|
0f22b3b0b6
|
add and remove pres pod client side code
|
2017-09-26 17:22:36 -04: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
|
4c3ee57c1d
|
avoid run error when buttons are unll if presentation is null
|
2017-09-26 16:43:57 -04: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 |
|